Skip to content

Commit ee3760b

Browse files
rikrakrikrak
committed
Updated the MVC3 projects to target .Net 4.5
1 parent b92891e commit ee3760b

File tree

7 files changed

+48
-49
lines changed

7 files changed

+48
-49
lines changed

‎samples/FluentAssertions.Mvc3.Samples/FluentAssertions.Mvc3.Samples.csproj

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
1414
<RootNamespace>FluentAssertions.Mvc3.Samples</RootNamespace>
1515
<AssemblyName>FluentAssertions.Mvc3.Samples</AssemblyName>
16-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1717
<MvcBuildViews>false</MvcBuildViews>
1818
<UseIISExpress>false</UseIISExpress>
1919
<FileUpgradeFlags>
@@ -30,6 +30,7 @@
3030
<MvcProjectUpgradeChecked>true</MvcProjectUpgradeChecked>
3131
<TargetFrameworkProfile />
3232
<UseGlobalApplicationHostFile />
33+
<Use64BitIISExpress />
3334
</PropertyGroup>
3435
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3536
<DebugSymbols>true</DebugSymbols>
@@ -51,24 +52,20 @@
5152
<Prefer32Bit>false</Prefer32Bit>
5253
</PropertyGroup>
5354
<ItemGroup>
54-
<Reference Include="EntityFramework">
55+
<Reference Include="EntityFramework, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
5556
<HintPath>..\..\packages\EntityFramework.4.1.10331.0\lib\EntityFramework.dll</HintPath>
5657
</Reference>
5758
<Reference Include="FluentAssertions, Version=3.3.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
58-
<SpecificVersion>False</SpecificVersion>
59-
<HintPath>..\..\packages\FluentAssertions.3.3.0\lib\net40\FluentAssertions.dll</HintPath>
59+
<HintPath>..\..\packages\FluentAssertions.3.3.0\lib\net45\FluentAssertions.dll</HintPath>
6060
</Reference>
6161
<Reference Include="FluentAssertions.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
62-
<SpecificVersion>False</SpecificVersion>
63-
<HintPath>..\..\packages\FluentAssertions.3.3.0\lib\net40\FluentAssertions.Core.dll</HintPath>
62+
<HintPath>..\..\packages\FluentAssertions.3.3.0\lib\net45\FluentAssertions.Core.dll</HintPath>
6463
</Reference>
65-
<Reference Include="Microsoft.Web.Infrastructure">
64+
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6665
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
67-
<Private>True</Private>
6866
</Reference>
6967
<Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
70-
<HintPath>..\..\packages\NUnit.3.2.1\lib\net40\nunit.framework.dll</HintPath>
71-
<Private>True</Private>
68+
<HintPath>..\..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
7269
</Reference>
7370
<Reference Include="System.Data.DataSetExtensions" />
7471
<Reference Include="System.Data.Entity" />
@@ -83,30 +80,24 @@
8380
<Reference Include="System.Web" />
8481
<Reference Include="System.Web.Abstractions" />
8582
<Reference Include="System.Web.Extensions" />
86-
<Reference Include="System.Web.Helpers">
83+
<Reference Include="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8784
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.Helpers.dll</HintPath>
88-
<Private>True</Private>
8985
</Reference>
90-
<Reference Include="System.Web.Mvc">
86+
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9187
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.3.0.20105.1\lib\net40\System.Web.Mvc.dll</HintPath>
92-
<Private>True</Private>
9388
</Reference>
94-
<Reference Include="System.Web.Razor">
89+
<Reference Include="System.Web.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9590
<HintPath>..\..\packages\Microsoft.AspNet.Razor.1.0.20105.408\lib\net40\System.Web.Razor.dll</HintPath>
96-
<Private>True</Private>
9791
</Reference>
9892
<Reference Include="System.Web.Routing" />
99-
<Reference Include="System.Web.WebPages">
93+
<Reference Include="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
10094
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.dll</HintPath>
101-
<Private>True</Private>
10295
</Reference>
103-
<Reference Include="System.Web.WebPages.Deployment">
96+
<Reference Include="System.Web.WebPages.Deployment, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
10497
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
105-
<Private>True</Private>
10698
</Reference>
107-
<Reference Include="System.Web.WebPages.Razor">
99+
<Reference Include="System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
108100
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
109-
<Private>True</Private>
110101
</Reference>
111102
<Reference Include="System.Xml" />
112103
<Reference Include="System.Configuration" />

‎samples/FluentAssertions.Mvc3.Samples/Web.config

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,16 @@
99
<add key="ClientValidationEnabled" value="true"/>
1010
<add key="UnobtrusiveJavaScriptEnabled" value="true"/>
1111
</appSettings>
12+
<!--
13+
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
14+
15+
The following attributes can be set on the <httpRuntime> tag.
16+
<system.Web>
17+
<httpRuntime targetFramework="4.5" />
18+
</system.Web>
19+
-->
1220
<system.web>
13-
<compilation debug="true" targetFramework="4.0">
21+
<compilation debug="true" targetFramework="4.5">
1422
<assemblies>
1523
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
1624
<add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

‎samples/FluentAssertions.Mvc3.Samples/packages.config

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="EntityFramework" version="4.1.10331.0" />
4-
<package id="FluentAssertions" version="3.3.0" targetFramework="net40" />
3+
<package id="EntityFramework" version="4.1.10331.0" targetFramework="net45" />
4+
<package id="FluentAssertions" version="3.3.0" targetFramework="net45" />
55
<package id="jQuery" version="1.5.1" />
66
<package id="jQuery.UI.Combined" version="1.8.11" />
77
<package id="jQuery.Validation" version="1.8.0" />
88
<package id="jQuery.vsdoc" version="1.5.1" />
9-
<package id="Microsoft.AspNet.Mvc" version="3.0.20105.1" targetFramework="net40" allowedVersions="(,4)" />
10-
<package id="Microsoft.AspNet.Razor" version="1.0.20105.408" targetFramework="net40" allowedVersions="(,2)" />
11-
<package id="Microsoft.AspNet.WebPages" version="1.0.20105.408" targetFramework="net40" allowedVersions="(,2)" />
12-
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
9+
<package id="Microsoft.AspNet.Mvc" version="3.0.20105.1" targetFramework="net45" allowedVersions="(,4)" />
10+
<package id="Microsoft.AspNet.Razor" version="1.0.20105.408" targetFramework="net45" allowedVersions="(,2)" />
11+
<package id="Microsoft.AspNet.WebPages" version="1.0.20105.408" targetFramework="net45" allowedVersions="(,2)" />
12+
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
1313
<package id="Modernizr" version="1.7" />
14-
<package id="NUnit" version="3.2.1" targetFramework="net40" />
14+
<package id="NUnit" version="3.2.1" targetFramework="net45" />
1515
</packages>

‎src/FluentAssertions.Mvc3/FluentAssertions.Mvc3.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<SignAssembly>false</SignAssembly>
55
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
66
<RestorePackages>true</RestorePackages>
7-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
7+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
88
<TargetFrameworkProfile />
99
</PropertyGroup>
1010
<PropertyGroup>
@@ -49,11 +49,11 @@
4949
<ItemGroup>
5050
<Reference Include="FluentAssertions, Version=3.3.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
5151
<SpecificVersion>False</SpecificVersion>
52-
<HintPath>..\..\packages\FluentAssertions.3.3.0\lib\net40\FluentAssertions.dll</HintPath>
52+
<HintPath>..\..\packages\FluentAssertions.3.3.0\lib\net45\FluentAssertions.dll</HintPath>
5353
</Reference>
5454
<Reference Include="FluentAssertions.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
5555
<SpecificVersion>False</SpecificVersion>
56-
<HintPath>..\..\packages\FluentAssertions.3.3.0\lib\net40\FluentAssertions.Core.dll</HintPath>
56+
<HintPath>..\..\packages\FluentAssertions.3.3.0\lib\net45\FluentAssertions.Core.dll</HintPath>
5757
</Reference>
5858
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5959
<Private>True</Private>

‎src/FluentAssertions.Mvc3/packages.config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="FluentAssertions" version="3.3.0" targetFramework="net40" />
4-
<package id="Microsoft.AspNet.Mvc" version="3.0.20105.1" targetFramework="net40" allowedVersions="(,4)" />
5-
<package id="Microsoft.AspNet.Razor" version="1.0.20105.408" targetFramework="net40" allowedVersions="(,2)" />
6-
<package id="Microsoft.AspNet.WebPages" version="1.0.20105.408" targetFramework="net40" allowedVersions="(,2)" />
7-
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
3+
<package id="FluentAssertions" version="3.3.0" targetFramework="net45" />
4+
<package id="Microsoft.AspNet.Mvc" version="3.0.20105.1" targetFramework="net45" allowedVersions="(,4)" />
5+
<package id="Microsoft.AspNet.Razor" version="1.0.20105.408" targetFramework="net45" allowedVersions="(,2)" />
6+
<package id="Microsoft.AspNet.WebPages" version="1.0.20105.408" targetFramework="net45" allowedVersions="(,2)" />
7+
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
88
</packages>

‎tests/FluentAssertions.Mvc3.Tests/FluentAssertions.Mvc3.Tests.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<AssemblyName>FluentAssertions.Mvc3.Tests</AssemblyName>
1313
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1414
<RestorePackages>true</RestorePackages>
15-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
15+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1616
<TargetFrameworkProfile />
1717
</PropertyGroup>
1818
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -38,19 +38,19 @@
3838
</PropertyGroup>
3939
<ItemGroup>
4040
<Reference Include="FluentAssertions, Version=3.3.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
41+
<HintPath>..\..\packages\FluentAssertions.3.3.0\lib\net45\FluentAssertions.dll</HintPath>
4142
<SpecificVersion>False</SpecificVersion>
42-
<HintPath>..\..\packages\FluentAssertions.3.3.0\lib\net40\FluentAssertions.dll</HintPath>
4343
</Reference>
4444
<Reference Include="FluentAssertions.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
45+
<HintPath>..\..\packages\FluentAssertions.3.3.0\lib\net45\FluentAssertions.Core.dll</HintPath>
4546
<SpecificVersion>False</SpecificVersion>
46-
<HintPath>..\..\packages\FluentAssertions.3.3.0\lib\net40\FluentAssertions.Core.dll</HintPath>
4747
</Reference>
4848
<Reference Include="Microsoft.Web.Infrastructure">
4949
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
5050
<Private>True</Private>
5151
</Reference>
5252
<Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
53-
<HintPath>..\..\packages\NUnit.3.2.1\lib\net40\nunit.framework.dll</HintPath>
53+
<HintPath>..\..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
5454
<Private>True</Private>
5555
</Reference>
5656
<Reference Include="System" />
@@ -94,7 +94,7 @@
9494
</ProjectReference>
9595
</ItemGroup>
9696
<ItemGroup>
97-
<None Include="packages.config">
97+
<None Include="packages.config" >
9898
<SubType>Designer</SubType>
9999
</None>
100100
</ItemGroup>

‎tests/FluentAssertions.Mvc3.Tests/packages.config

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="FluentAssertions" version="3.3.0" targetFramework="net40" />
4-
<package id="Microsoft.AspNet.Mvc" version="3.0.20105.1" targetFramework="net40" allowedVersions="(,4)" />
5-
<package id="Microsoft.AspNet.Razor" version="1.0.20105.408" targetFramework="net40" allowedVersions="(,2)" />
6-
<package id="Microsoft.AspNet.WebPages" version="1.0.20105.408" targetFramework="net40" allowedVersions="(,2)" />
7-
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
8-
<package id="NUnit" version="3.2.1" targetFramework="net40" />
3+
<package id="FluentAssertions" version="3.3.0" targetFramework="net45" />
4+
<package id="Microsoft.AspNet.Mvc" version="3.0.20105.1" targetFramework="net45" allowedVersions="(,4)" />
5+
<package id="Microsoft.AspNet.Razor" version="1.0.20105.408" targetFramework="net45" allowedVersions="(,2)" />
6+
<package id="Microsoft.AspNet.WebPages" version="1.0.20105.408" targetFramework="net45" allowedVersions="(,2)" />
7+
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
8+
<package id="NUnit" version="3.2.1" targetFramework="net45" />
99
</packages>

0 commit comments

Comments
 (0)