Skip to content

Commit 9821cb6

Browse files
avichaigavichaig
committed
init mod04
retargeting and nuget update
1 parent 8c3b21b commit 9821cb6

File tree

12 files changed

+340
-104
lines changed

12 files changed

+340
-104
lines changed

‎Allfiles/Mod04/Labfiles/Solution/Exercise 1/ContosoConf/ContosoConf.csproj‎

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,7 +13,7 @@
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
1414
<RootNamespace>ContosoConf</RootNamespace>
1515
<AssemblyName>ContosoConf</AssemblyName>
16-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1717
<UseIISExpress>true</UseIISExpress>
1818
<FileUpgradeFlags>
1919
</FileUpgradeFlags>
@@ -24,6 +24,9 @@
2424
<IISExpressAnonymousAuthentication />
2525
<IISExpressWindowsAuthentication />
2626
<IISExpressUseClassicPipelineMode />
27+
<TargetFrameworkProfile />
28+
<Use64BitIISExpress />
29+
<UseGlobalApplicationHostFile />
2730
</PropertyGroup>
2831
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2932
<DebugSymbols>true</DebugSymbols>
@@ -33,6 +36,7 @@
3336
<DefineConstants>DEBUG;TRACE</DefineConstants>
3437
<ErrorReport>prompt</ErrorReport>
3538
<WarningLevel>4</WarningLevel>
39+
<Prefer32Bit>false</Prefer32Bit>
3640
</PropertyGroup>
3741
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3842
<DebugType>pdbonly</DebugType>
@@ -41,26 +45,46 @@
4145
<DefineConstants>TRACE</DefineConstants>
4246
<ErrorReport>prompt</ErrorReport>
4347
<WarningLevel>4</WarningLevel>
48+
<Prefer32Bit>false</Prefer32Bit>
4449
</PropertyGroup>
4550
<ItemGroup>
4651
<Reference Include="Microsoft.CSharp" />
52+
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
53+
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
54+
</Reference>
4755
<Reference Include="System.ComponentModel.DataAnnotations" />
56+
<Reference Include="System.Data.DataSetExtensions" />
4857
<Reference Include="System.Web.DynamicData" />
4958
<Reference Include="System.Web.Entity" />
5059
<Reference Include="System.Web.ApplicationServices" />
5160
<Reference Include="System" />
5261
<Reference Include="System.Data" />
53-
<Reference Include="System.Core" />
54-
<Reference Include="System.Data.DataSetExtensions" />
5562
<Reference Include="System.Web.Extensions" />
56-
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
57-
<Reference Include="System.Xml.Linq" />
63+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
65+
</Reference>
5866
<Reference Include="System.Drawing" />
5967
<Reference Include="System.Web" />
68+
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
69+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
70+
</Reference>
71+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
72+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
73+
</Reference>
74+
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
76+
</Reference>
77+
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
78+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
79+
</Reference>
80+
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
81+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
82+
</Reference>
6083
<Reference Include="System.Xml" />
6184
<Reference Include="System.Configuration" />
6285
<Reference Include="System.Web.Services" />
6386
<Reference Include="System.EnterpriseServices" />
87+
<Reference Include="System.Xml.Linq" />
6488
</ItemGroup>
6589
<ItemGroup>
6690
<Content Include="about.htm" />
@@ -104,6 +128,9 @@
104128
<ItemGroup>
105129
<Content Include="Views\Web.config" />
106130
</ItemGroup>
131+
<ItemGroup>
132+
<None Include="packages.config" />
133+
</ItemGroup>
107134
<PropertyGroup>
108135
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
109136
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -136,4 +163,4 @@
136163
<Target Name="AfterBuild">
137164
</Target>
138165
-->
139-
</Project>
166+
</Project>

‎Allfiles/Mod04/Labfiles/Solution/Exercise 1/ContosoConf/Web.config‎

Lines changed: 43 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,45 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0"?>
22
<configuration>
3-
<system.web>
4-
<compilation debug="true" targetFramework="4.0">
5-
<assemblies>
6-
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
7-
<add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
8-
<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
9-
<add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
10-
<add assembly="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
11-
</assemblies>
12-
</compilation>
13-
</system.web>
14-
<system.webServer>
15-
<staticContent>
16-
<remove fileExtension=".manifest"/>
17-
<mimeMap fileExtension=".manifest" mimeType="text/cache-manifest"/>
18-
</staticContent>
19-
</system.webServer>
3+
<!--
4+
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
5+
6+
The following attributes can be set on the <httpRuntime> tag.
7+
<system.Web>
8+
<httpRuntime targetFramework="4.5.2" />
9+
</system.Web>
10+
-->
11+
<system.web>
12+
<compilation debug="true" targetFramework="4.5.2">
13+
<assemblies>
14+
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
15+
<add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
16+
<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
17+
<add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
18+
<add assembly="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
19+
</assemblies>
20+
</compilation>
21+
<pages controlRenderingCompatibilityVersion="4.0"/>
22+
</system.web>
23+
<system.webServer>
24+
<staticContent>
25+
<remove fileExtension=".manifest"/>
26+
<mimeMap fileExtension=".manifest" mimeType="text/cache-manifest"/>
27+
</staticContent>
28+
</system.webServer>
29+
<runtime>
30+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
31+
<dependentAssembly>
32+
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
33+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
34+
</dependentAssembly>
35+
<dependentAssembly>
36+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
37+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
38+
</dependentAssembly>
39+
<dependentAssembly>
40+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
41+
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
42+
</dependentAssembly>
43+
</assemblyBinding>
44+
</runtime>
2045
</configuration>

‎Allfiles/Mod04/Labfiles/Solution/Exercise 1/ContosoConf/packages.config‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net452" />
4+
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net452" />
5+
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net452" />
6+
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
7+
</packages>

‎Allfiles/Mod04/Labfiles/Solution/Exercise 2/ContosoConf/ContosoConf.csproj‎

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,7 +13,7 @@
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
1414
<RootNamespace>ContosoConf</RootNamespace>
1515
<AssemblyName>ContosoConf</AssemblyName>
16-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1717
<UseIISExpress>true</UseIISExpress>
1818
<FileUpgradeFlags>
1919
</FileUpgradeFlags>
@@ -24,6 +24,9 @@
2424
<IISExpressAnonymousAuthentication />
2525
<IISExpressWindowsAuthentication />
2626
<IISExpressUseClassicPipelineMode />
27+
<TargetFrameworkProfile />
28+
<Use64BitIISExpress />
29+
<UseGlobalApplicationHostFile />
2730
</PropertyGroup>
2831
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2932
<DebugSymbols>true</DebugSymbols>
@@ -33,6 +36,7 @@
3336
<DefineConstants>DEBUG;TRACE</DefineConstants>
3437
<ErrorReport>prompt</ErrorReport>
3538
<WarningLevel>4</WarningLevel>
39+
<Prefer32Bit>false</Prefer32Bit>
3640
</PropertyGroup>
3741
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3842
<DebugType>pdbonly</DebugType>
@@ -41,26 +45,46 @@
4145
<DefineConstants>TRACE</DefineConstants>
4246
<ErrorReport>prompt</ErrorReport>
4347
<WarningLevel>4</WarningLevel>
48+
<Prefer32Bit>false</Prefer32Bit>
4449
</PropertyGroup>
4550
<ItemGroup>
4651
<Reference Include="Microsoft.CSharp" />
52+
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
53+
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
54+
</Reference>
4755
<Reference Include="System.ComponentModel.DataAnnotations" />
56+
<Reference Include="System.Data.DataSetExtensions" />
4857
<Reference Include="System.Web.DynamicData" />
4958
<Reference Include="System.Web.Entity" />
5059
<Reference Include="System.Web.ApplicationServices" />
5160
<Reference Include="System" />
5261
<Reference Include="System.Data" />
53-
<Reference Include="System.Core" />
54-
<Reference Include="System.Data.DataSetExtensions" />
5562
<Reference Include="System.Web.Extensions" />
56-
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
57-
<Reference Include="System.Xml.Linq" />
63+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
65+
</Reference>
5866
<Reference Include="System.Drawing" />
5967
<Reference Include="System.Web" />
68+
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
69+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
70+
</Reference>
71+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
72+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
73+
</Reference>
74+
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
76+
</Reference>
77+
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
78+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
79+
</Reference>
80+
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
81+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
82+
</Reference>
6083
<Reference Include="System.Xml" />
6184
<Reference Include="System.Configuration" />
6285
<Reference Include="System.Web.Services" />
6386
<Reference Include="System.EnterpriseServices" />
87+
<Reference Include="System.Xml.Linq" />
6488
</ItemGroup>
6589
<ItemGroup>
6690
<Content Include="about.htm" />
@@ -104,6 +128,9 @@
104128
<ItemGroup>
105129
<Content Include="Views\Web.config" />
106130
</ItemGroup>
131+
<ItemGroup>
132+
<None Include="packages.config" />
133+
</ItemGroup>
107134
<PropertyGroup>
108135
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
109136
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -136,4 +163,4 @@
136163
<Target Name="AfterBuild">
137164
</Target>
138165
-->
139-
</Project>
166+
</Project>

‎Allfiles/Mod04/Labfiles/Solution/Exercise 2/ContosoConf/Web.config‎

Lines changed: 43 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,45 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0"?>
22
<configuration>
3-
<system.web>
4-
<compilation debug="true" targetFramework="4.0">
5-
<assemblies>
6-
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
7-
<add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
8-
<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
9-
<add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
10-
<add assembly="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
11-
</assemblies>
12-
</compilation>
13-
</system.web>
14-
<system.webServer>
15-
<staticContent>
16-
<remove fileExtension=".manifest"/>
17-
<mimeMap fileExtension=".manifest" mimeType="text/cache-manifest"/>
18-
</staticContent>
19-
</system.webServer>
3+
<!--
4+
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
5+
6+
The following attributes can be set on the <httpRuntime> tag.
7+
<system.Web>
8+
<httpRuntime targetFramework="4.5.2" />
9+
</system.Web>
10+
-->
11+
<system.web>
12+
<compilation debug="true" targetFramework="4.5.2">
13+
<assemblies>
14+
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
15+
<add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
16+
<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
17+
<add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
18+
<add assembly="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
19+
</assemblies>
20+
</compilation>
21+
<pages controlRenderingCompatibilityVersion="4.0"/>
22+
</system.web>
23+
<system.webServer>
24+
<staticContent>
25+
<remove fileExtension=".manifest"/>
26+
<mimeMap fileExtension=".manifest" mimeType="text/cache-manifest"/>
27+
</staticContent>
28+
</system.webServer>
29+
<runtime>
30+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
31+
<dependentAssembly>
32+
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
33+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
34+
</dependentAssembly>
35+
<dependentAssembly>
36+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
37+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
38+
</dependentAssembly>
39+
<dependentAssembly>
40+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
41+
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
42+
</dependentAssembly>
43+
</assemblyBinding>
44+
</runtime>
2045
</configuration>

‎Allfiles/Mod04/Labfiles/Solution/Exercise 2/ContosoConf/packages.config‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net452" />
4+
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net452" />
5+
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net452" />
6+
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
7+
</packages>

0 commit comments

Comments
 (0)