Skip to content

Commit efa72e1

Browse files
avichaigavichaig
committed
initial mod13
retargeting, nuget update and fixing tags
1 parent 8c3b21b commit efa72e1

File tree

24 files changed

+408
-72
lines changed

24 files changed

+408
-72
lines changed

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

Lines changed: 30 additions & 5 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.5</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1717
<UseIISExpress>true</UseIISExpress>
1818
<FileUpgradeFlags>
1919
</FileUpgradeFlags>
@@ -25,6 +25,8 @@
2525
<IISExpressWindowsAuthentication />
2626
<IISExpressUseClassicPipelineMode />
2727
<TargetFrameworkProfile />
28+
<Use64BitIISExpress />
29+
<UseGlobalApplicationHostFile />
2830
</PropertyGroup>
2931
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3032
<DebugSymbols>true</DebugSymbols>
@@ -47,6 +49,9 @@
4749
</PropertyGroup>
4850
<ItemGroup>
4951
<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>
5055
<Reference Include="System.ComponentModel.DataAnnotations" />
5156
<Reference Include="System.Data.DataSetExtensions" />
5257
<Reference Include="System.Web.DynamicData" />
@@ -55,9 +60,26 @@
5560
<Reference Include="System" />
5661
<Reference Include="System.Data" />
5762
<Reference Include="System.Web.Extensions" />
58-
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
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>
5966
<Reference Include="System.Drawing" />
6067
<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>
6183
<Reference Include="System.Xml" />
6284
<Reference Include="System.Configuration" />
6385
<Reference Include="System.Web.Services" />
@@ -143,6 +165,9 @@
143165
<ItemGroup>
144166
<Content Include="Live\socket.ashx" />
145167
</ItemGroup>
168+
<ItemGroup>
169+
<None Include="packages.config" />
170+
</ItemGroup>
146171
<PropertyGroup>
147172
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
148173
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -175,4 +200,4 @@
175200
<Target Name="AfterBuild">
176201
</Target>
177202
-->
178-
</Project>
203+
</Project>

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

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0"?>
22
<configuration>
33
<appSettings>
4-
<add key="aspnet:UseTaskFriendlySynchronizationContext" value="true" />
4+
<add key="aspnet:UseTaskFriendlySynchronizationContext" value="true"/>
55
</appSettings>
6+
<!--
7+
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
8+
9+
The following attributes can be set on the <httpRuntime> tag.
10+
<system.Web>
11+
<httpRuntime targetFramework="4.5.2" />
12+
</system.Web>
13+
-->
614
<system.web>
7-
<compilation debug="true" targetFramework="4.5">
15+
<compilation debug="true" targetFramework="4.5.2">
816
<assemblies>
917
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
1018
<add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
@@ -21,4 +29,20 @@
2129
<mimeMap fileExtension=".manifest" mimeType="text/cache-manifest"/>
2230
</staticContent>
2331
</system.webServer>
32+
<runtime>
33+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
34+
<dependentAssembly>
35+
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
36+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
37+
</dependentAssembly>
38+
<dependentAssembly>
39+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
40+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
41+
</dependentAssembly>
42+
<dependentAssembly>
43+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
44+
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
45+
</dependentAssembly>
46+
</assemblyBinding>
47+
</runtime>
2448
</configuration>

‎Allfiles/Mod13/Labfiles/Solution/Exercise 1/ContosoConf/location.htm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html>
1+
<!DOCTYPE html>
22
<html lang="en">
33
<head>
44
<meta charset="utf-8"/>
@@ -57,16 +57,16 @@ <h1>Interactive conference venue map</h1>
5757
<svg viewBox="-1 -1 302 102" width="100%" height="230">
5858
<!-- Room A -->
5959
<g id="room-a" class="room">
60-
<rect fill="#fff" x="0" y="0" width="100" height="100"/>
60+
<rect fill="#fff" x="0" y="0" width="100" height="100"></rect>
6161
<text x="13" y="55" font-weight="bold" font-size="20">ROOM A</text>
6262
</g>
6363
<!-- Room B -->
6464
<g id="room-b" class="room">
65-
<rect fill="#fff" x="200" y="0" width="100" height="100"/>
65+
<rect fill="#fff" x="200" y="0" width="100" height="100"></rect>
6666
<text x="213" y="55" font-weight="bold" font-size="20">ROOM B</text>
6767
</g>
6868
<!-- The outline of the building -->
69-
<polyline fill="none" stroke="#000" points="135,95 140,100 0,100 0,0 100,0 100,80 130,80 130,70 110,70 110,30 190,30 190,70 170,70 170,80 200,80 200,0 300,0 300,100 160,100 165,95"/>
69+
<polyline fill="none" stroke="#000" points="135,95 140,100 0,100 0,0 100,0 100,80 130,80 130,70 110,70 110,30 190,30 190,70 170,70 170,80 200,80 200,0 300,0 300,100 160,100 165,95"></polyline>
7070
<text x="150" y="55" font-size="12" style="text-anchor: middle">Registration</text>
7171
</svg>
7272

‎Allfiles/Mod13/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/Mod13/Labfiles/Solution/Exercise 2/ContosoConf/ContosoConf.csproj‎

Lines changed: 30 additions & 5 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.5</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1717
<UseIISExpress>true</UseIISExpress>
1818
<FileUpgradeFlags>
1919
</FileUpgradeFlags>
@@ -25,6 +25,8 @@
2525
<IISExpressWindowsAuthentication />
2626
<IISExpressUseClassicPipelineMode />
2727
<TargetFrameworkProfile />
28+
<Use64BitIISExpress />
29+
<UseGlobalApplicationHostFile />
2830
</PropertyGroup>
2931
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3032
<DebugSymbols>true</DebugSymbols>
@@ -47,6 +49,9 @@
4749
</PropertyGroup>
4850
<ItemGroup>
4951
<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>
5055
<Reference Include="System.ComponentModel.DataAnnotations" />
5156
<Reference Include="System.Data.DataSetExtensions" />
5257
<Reference Include="System.Web.DynamicData" />
@@ -55,9 +60,26 @@
5560
<Reference Include="System" />
5661
<Reference Include="System.Data" />
5762
<Reference Include="System.Web.Extensions" />
58-
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
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>
5966
<Reference Include="System.Drawing" />
6067
<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>
6183
<Reference Include="System.Xml" />
6284
<Reference Include="System.Configuration" />
6385
<Reference Include="System.Web.Services" />
@@ -143,6 +165,9 @@
143165
<ItemGroup>
144166
<Content Include="Live\socket.ashx" />
145167
</ItemGroup>
168+
<ItemGroup>
169+
<None Include="packages.config" />
170+
</ItemGroup>
146171
<PropertyGroup>
147172
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
148173
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -175,4 +200,4 @@
175200
<Target Name="AfterBuild">
176201
</Target>
177202
-->
178-
</Project>
203+
</Project>

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

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0"?>
22
<configuration>
33
<appSettings>
4-
<add key="aspnet:UseTaskFriendlySynchronizationContext" value="true" />
4+
<add key="aspnet:UseTaskFriendlySynchronizationContext" value="true"/>
55
</appSettings>
6+
<!--
7+
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
8+
9+
The following attributes can be set on the <httpRuntime> tag.
10+
<system.Web>
11+
<httpRuntime targetFramework="4.5.2" />
12+
</system.Web>
13+
-->
614
<system.web>
7-
<compilation debug="true" targetFramework="4.5">
15+
<compilation debug="true" targetFramework="4.5.2">
816
<assemblies>
917
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
1018
<add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
@@ -21,4 +29,20 @@
2129
<mimeMap fileExtension=".manifest" mimeType="text/cache-manifest"/>
2230
</staticContent>
2331
</system.webServer>
32+
<runtime>
33+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
34+
<dependentAssembly>
35+
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
36+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
37+
</dependentAssembly>
38+
<dependentAssembly>
39+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
40+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
41+
</dependentAssembly>
42+
<dependentAssembly>
43+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
44+
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
45+
</dependentAssembly>
46+
</assemblyBinding>
47+
</runtime>
2448
</configuration>

‎Allfiles/Mod13/Labfiles/Solution/Exercise 2/ContosoConf/location.htm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html>
1+
<!DOCTYPE html>
22
<html lang="en">
33
<head>
44
<meta charset="utf-8"/>
@@ -57,16 +57,16 @@ <h1>Interactive conference venue map</h1>
5757
<svg viewBox="-1 -1 302 102" width="100%" height="230">
5858
<!-- Room A -->
5959
<g id="room-a" class="room">
60-
<rect fill="#fff" x="0" y="0" width="100" height="100"/>
60+
<rect fill="#fff" x="0" y="0" width="100" height="100"></rect>
6161
<text x="13" y="55" font-weight="bold" font-size="20">ROOM A</text>
6262
</g>
6363
<!-- Room B -->
6464
<g id="room-b" class="room">
65-
<rect fill="#fff" x="200" y="0" width="100" height="100"/>
65+
<rect fill="#fff" x="200" y="0" width="100" height="100"></rect>
6666
<text x="213" y="55" font-weight="bold" font-size="20">ROOM B</text>
6767
</g>
6868
<!-- The outline of the building -->
69-
<polyline fill="none" stroke="#000" points="135,95 140,100 0,100 0,0 100,0 100,80 130,80 130,70 110,70 110,30 190,30 190,70 170,70 170,80 200,80 200,0 300,0 300,100 160,100 165,95"/>
69+
<polyline fill="none" stroke="#000" points="135,95 140,100 0,100 0,0 100,0 100,80 130,80 130,70 110,70 110,30 190,30 190,70 170,70 170,80 200,80 200,0 300,0 300,100 160,100 165,95"></polyline>
7070
<text x="150" y="55" font-size="12" style="text-anchor: middle">Registration</text>
7171
</svg>
7272

‎Allfiles/Mod13/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)