Skip to content

Commit 39df5f6

Browse files
kevinkuszykkevinkuszyk
committed
Switched MVC dependencies to use Nuget packages.
1 parent 8d59d9d commit 39df5f6

File tree

12 files changed

+200
-15
lines changed

12 files changed

+200
-15
lines changed

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

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,15 @@
5353
<SpecificVersion>False</SpecificVersion>
5454
<HintPath>..\..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll</HintPath>
5555
</Reference>
56+
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
57+
<Private>True</Private>
58+
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
59+
</Reference>
5660
<Reference Include="nunit.framework, Version=2.6.0.12051, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
5761
<SpecificVersion>False</SpecificVersion>
5862
<HintPath>..\..\lib\NUnit.2.6.0.12054\lib\nunit.framework.dll</HintPath>
5963
</Reference>
6064
<Reference Include="System.Data.Entity" />
61-
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
62-
<Reference Include="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
63-
<Reference Include="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
6465
<Reference Include="Microsoft.CSharp" />
6566
<Reference Include="System" />
6667
<Reference Include="System.Data" />
@@ -71,6 +72,30 @@
7172
<Reference Include="System.ComponentModel.DataAnnotations" />
7273
<Reference Include="System.Core" />
7374
<Reference Include="System.Data.DataSetExtensions" />
75+
<Reference Include="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
76+
<Private>True</Private>
77+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.Helpers.dll</HintPath>
78+
</Reference>
79+
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80+
<Private>True</Private>
81+
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.3.0.20105.1\lib\net40\System.Web.Mvc.dll</HintPath>
82+
</Reference>
83+
<Reference Include="System.Web.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
84+
<Private>True</Private>
85+
<HintPath>..\..\packages\Microsoft.AspNet.Razor.1.0.20105.408\lib\net40\System.Web.Razor.dll</HintPath>
86+
</Reference>
87+
<Reference Include="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
88+
<Private>True</Private>
89+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.dll</HintPath>
90+
</Reference>
91+
<Reference Include="System.Web.WebPages.Deployment, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
92+
<Private>True</Private>
93+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
94+
</Reference>
95+
<Reference Include="System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
96+
<Private>True</Private>
97+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
98+
</Reference>
7499
<Reference Include="System.Xml.Linq" />
75100
<Reference Include="System.Web" />
76101
<Reference Include="System.Web.Extensions" />

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,9 @@
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" />
913
<package id="Modernizr" version="1.7" />
1014
</packages>

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

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,35 @@
4848
<SpecificVersion>False</SpecificVersion>
4949
<HintPath>..\..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll</HintPath>
5050
</Reference>
51+
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52+
<Private>True</Private>
53+
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
54+
</Reference>
5155
<Reference Include="System" />
52-
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
53-
<Private>False</Private>
56+
<Reference Include="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
57+
<Private>True</Private>
58+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.Helpers.dll</HintPath>
59+
</Reference>
60+
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
61+
<Private>True</Private>
62+
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.3.0.20105.1\lib\net40\System.Web.Mvc.dll</HintPath>
63+
</Reference>
64+
<Reference Include="System.Web.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
65+
<Private>True</Private>
66+
<HintPath>..\..\packages\Microsoft.AspNet.Razor.1.0.20105.408\lib\net40\System.Web.Razor.dll</HintPath>
5467
</Reference>
5568
<Reference Include="System.Web.Routing" />
69+
<Reference Include="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70+
<Private>True</Private>
71+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.dll</HintPath>
72+
</Reference>
73+
<Reference Include="System.Web.WebPages.Deployment, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74+
<Private>True</Private>
75+
</Reference>
76+
<Reference Include="System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
77+
<Private>True</Private>
78+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
79+
</Reference>
5680
<Reference Include="System.Xml.Linq" />
5781
<Reference Include="System.Xml" />
5882
<Reference Include="System.Web" />
@@ -90,7 +114,9 @@
90114
</EmbeddedResource>
91115
</ItemGroup>
92116
<ItemGroup>
93-
<None Include="packages.config" />
117+
<None Include="packages.config">
118+
<SubType>Designer</SubType>
119+
</None>
94120
</ItemGroup>
95121
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
96122
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />

‎src/FluentAssertions.Mvc3/packages.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="FluentAssertions" version="2.1.0.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" />
48
</packages>

‎src/FluentAssertions.Mvc4/FluentAssertions.Mvc4.csproj

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,37 @@
3636
<SpecificVersion>False</SpecificVersion>
3737
<HintPath>..\..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll</HintPath>
3838
</Reference>
39+
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
40+
<Private>True</Private>
41+
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
42+
</Reference>
3943
<Reference Include="System" />
4044
<Reference Include="System.Core" />
4145
<Reference Include="System.Web" />
42-
<Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
46+
<Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
47+
<Private>True</Private>
48+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll</HintPath>
49+
</Reference>
50+
<Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51+
<Private>True</Private>
52+
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll</HintPath>
53+
</Reference>
54+
<Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
55+
<Private>True</Private>
56+
<HintPath>..\..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll</HintPath>
57+
</Reference>
58+
<Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59+
<Private>True</Private>
60+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll</HintPath>
61+
</Reference>
62+
<Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63+
<Private>True</Private>
64+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
65+
</Reference>
66+
<Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67+
<Private>True</Private>
68+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
69+
</Reference>
4370
<Reference Include="System.Xml.Linq" />
4471
<Reference Include="Microsoft.CSharp" />
4572
<Reference Include="System.Xml" />

‎src/FluentAssertions.Mvc4/packages.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="FluentAssertions" version="2.1.0.0" targetFramework="net40" />
4+
<package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net40" />
5+
<package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net40" />
6+
<package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net40" />
7+
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
48
</packages>

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

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,37 @@
3737
<SpecificVersion>False</SpecificVersion>
3838
<HintPath>..\..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll</HintPath>
3939
</Reference>
40+
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
41+
<Private>True</Private>
42+
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
43+
</Reference>
4044
<Reference Include="System" />
4145
<Reference Include="System.Web" />
42-
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
43-
<Private>False</Private>
46+
<Reference Include="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
47+
<Private>True</Private>
48+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.Helpers.dll</HintPath>
49+
</Reference>
50+
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51+
<Private>True</Private>
52+
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.3.0.20105.1\lib\net40\System.Web.Mvc.dll</HintPath>
53+
</Reference>
54+
<Reference Include="System.Web.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
55+
<Private>True</Private>
56+
<HintPath>..\..\packages\Microsoft.AspNet.Razor.1.0.20105.408\lib\net40\System.Web.Razor.dll</HintPath>
4457
</Reference>
4558
<Reference Include="System.Web.Routing" />
59+
<Reference Include="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60+
<Private>True</Private>
61+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.dll</HintPath>
62+
</Reference>
63+
<Reference Include="System.Web.WebPages.Deployment, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64+
<Private>True</Private>
65+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
66+
</Reference>
67+
<Reference Include="System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68+
<Private>True</Private>
69+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
70+
</Reference>
4671
<Reference Include="System.Xml.Linq" />
4772
<Reference Include="System.Xml" />
4873
<Reference Include="nunit.framework">

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="FluentAssertions" version="2.1.0.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" />
48
</packages>

‎tests/FluentAssertions.Mvc4.Tests/FluentAssertions.Mvc4.Tests.csproj

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,41 @@
3737
<SpecificVersion>False</SpecificVersion>
3838
<HintPath>..\..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll</HintPath>
3939
</Reference>
40+
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
41+
<Private>True</Private>
42+
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
43+
</Reference>
4044
<Reference Include="nunit.framework, Version=2.6.0.12051, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
4145
<SpecificVersion>False</SpecificVersion>
4246
<HintPath>..\..\lib\NUnit.2.6.0.12054\lib\nunit.framework.dll</HintPath>
4347
</Reference>
4448
<Reference Include="System" />
4549
<Reference Include="System.Core" />
4650
<Reference Include="System.Web" />
47-
<Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
51+
<Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52+
<Private>True</Private>
53+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll</HintPath>
54+
</Reference>
55+
<Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56+
<Private>True</Private>
57+
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll</HintPath>
58+
</Reference>
59+
<Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60+
<Private>True</Private>
61+
<HintPath>..\..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll</HintPath>
62+
</Reference>
63+
<Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64+
<Private>True</Private>
65+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll</HintPath>
66+
</Reference>
67+
<Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68+
<Private>True</Private>
69+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
70+
</Reference>
71+
<Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
72+
<Private>True</Private>
73+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
74+
</Reference>
4875
<Reference Include="System.Xml.Linq" />
4976
<Reference Include="Microsoft.CSharp" />
5077
<Reference Include="System.Xml" />

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="FluentAssertions" version="2.1.0.0" targetFramework="net40" />
4+
<package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net40" />
5+
<package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net40" />
6+
<package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net40" />
7+
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
48
</packages>

0 commit comments

Comments
 (0)