Skip to content

Commit df60497

Browse files
robdmoorerobdmoore
committed
Merge pull request #3 from mwillebrands/master
Upgraded to MVC 5.2.3
2 parents 1bfffdd + 493e384 commit df60497

File tree

8 files changed

+40
-37
lines changed

8 files changed

+40
-37
lines changed

‎AspNet.Mvc.Grid.Example/AspNet.Mvc.Grid.Example.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,27 +55,27 @@
5555
<Reference Include="System.Data.DataSetExtensions" />
5656
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5757
<SpecificVersion>False</SpecificVersion>
58-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.Helpers.dll</HintPath>
58+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
5959
</Reference>
60-
<Reference Include="System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60+
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6161
<SpecificVersion>False</SpecificVersion>
62-
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.0\lib\net45\System.Web.Mvc.dll</HintPath>
62+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
6363
</Reference>
6464
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6565
<SpecificVersion>False</SpecificVersion>
66-
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.0\lib\net45\System.Web.Razor.dll</HintPath>
66+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
6767
</Reference>
6868
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6969
<SpecificVersion>False</SpecificVersion>
70-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.dll</HintPath>
70+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
7171
</Reference>
7272
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7373
<SpecificVersion>False</SpecificVersion>
74-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
74+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
7575
</Reference>
7676
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7777
<SpecificVersion>False</SpecificVersion>
78-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
78+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
7979
</Reference>
8080
<Reference Include="System.Xml.Linq" />
8181
<Reference Include="System.Web" />

‎AspNet.Mvc.Grid.Example/Web.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</dependentAssembly>
3131
<dependentAssembly>
3232
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
33-
<bindingRedirect oldVersion="1.0.0.0-5.2.0.0" newVersion="5.2.0.0" />
33+
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
3434
</dependentAssembly>
3535
</assemblyBinding>
3636
</runtime>

‎AspNet.Mvc.Grid.Example/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<package id="bootstrap" version="3.0.0" targetFramework="net45" />
55
<package id="jQuery" version="1.10.2" targetFramework="net45" />
66
<package id="jQuery.Validation" version="1.11.1" targetFramework="net45" />
7-
<package id="Microsoft.AspNet.Mvc" version="5.2.0" targetFramework="net45" />
8-
<package id="Microsoft.AspNet.Razor" version="3.2.0" targetFramework="net45" />
7+
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
8+
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
99
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net45" />
10-
<package id="Microsoft.AspNet.WebPages" version="3.2.0" targetFramework="net45" />
10+
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
1111
<package id="Microsoft.jQuery.Unobtrusive.Validation" version="3.1.2" targetFramework="net45" />
1212
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
1313
<package id="Modernizr" version="2.6.2" targetFramework="net45" />

‎AspNet.Mvc.Grid.Tests/AspNet.Mvc.Grid.Tests.csproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,27 +46,27 @@
4646
<Reference Include="System.Web" />
4747
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4848
<SpecificVersion>False</SpecificVersion>
49-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.Helpers.dll</HintPath>
49+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
5050
</Reference>
51-
<Reference Include="System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52-
<SpecificVersion>False</SpecificVersion>
53-
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.0\lib\net45\System.Web.Mvc.dll</HintPath>
51+
<Reference Include="System.Web.Mvc">
52+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
53+
<Private>True</Private>
5454
</Reference>
5555
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5656
<SpecificVersion>False</SpecificVersion>
57-
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.0\lib\net45\System.Web.Razor.dll</HintPath>
57+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
5858
</Reference>
59-
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60-
<SpecificVersion>False</SpecificVersion>
61-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.dll</HintPath>
59+
<Reference Include="System.Web.WebPages">
60+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
61+
<Private>True</Private>
6262
</Reference>
6363
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6464
<SpecificVersion>False</SpecificVersion>
65-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
65+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
6666
</Reference>
67-
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68-
<SpecificVersion>False</SpecificVersion>
69-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
67+
<Reference Include="System.Web.WebPages.Razor">
68+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
69+
<Private>True</Private>
7070
</Reference>
7171
<Reference Include="System.Xml.Linq" />
7272
<Reference Include="System.Data.DataSetExtensions" />

‎AspNet.Mvc.Grid.Tests/packages.config‎

Lines changed: 3 additions & 3 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="Microsoft.AspNet.Mvc" version="5.2.0" targetFramework="net45" />
4-
<package id="Microsoft.AspNet.Razor" version="3.2.0" targetFramework="net45" />
5-
<package id="Microsoft.AspNet.WebPages" version="3.2.0" targetFramework="net45" />
3+
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
4+
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
5+
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
66
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
77
<package id="NUnit" version="2.6.3" targetFramework="net45" />
88
<package id="RhinoMocks" version="3.6.1" targetFramework="net45" />

‎AspNet.Mvc.Grid/AspNet.Mvc.Grid.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,27 +39,27 @@
3939
<Reference Include="System.Web" />
4040
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4141
<SpecificVersion>False</SpecificVersion>
42-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.Helpers.dll</HintPath>
42+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
4343
</Reference>
44-
<Reference Include="System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
44+
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4545
<SpecificVersion>False</SpecificVersion>
46-
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.0\lib\net45\System.Web.Mvc.dll</HintPath>
46+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
4747
</Reference>
4848
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4949
<SpecificVersion>False</SpecificVersion>
50-
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.0\lib\net45\System.Web.Razor.dll</HintPath>
50+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
5151
</Reference>
5252
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5353
<SpecificVersion>False</SpecificVersion>
54-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.dll</HintPath>
54+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
5555
</Reference>
5656
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5757
<SpecificVersion>False</SpecificVersion>
58-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
58+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
5959
</Reference>
6060
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6161
<SpecificVersion>False</SpecificVersion>
62-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
62+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
6363
</Reference>
6464
<Reference Include="System.Xml.Linq" />
6565
<Reference Include="System.Data.DataSetExtensions" />

‎AspNet.Mvc.Grid/AspNet.Mvc.Grid.nuspec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
AspNet.Mvc.Grid
66
</id>
77
<version>
8-
1.0.0
8+
1.0.1
99
</version>
1010
<authors>
1111
Outercurve Foundation, MR Collective
@@ -25,6 +25,9 @@
2525
<language>
2626
en-US
2727
</language>
28+
<dependencies>
29+
<dependency id="Microsoft.AspNet.Mvc" version="5.2.3" />
30+
</dependencies>
2831
</metadata>
2932
<files>
3033
<file src="bin\Release\AspNet.Mvc.Grid.dll" target="lib\NET45" />

‎AspNet.Mvc.Grid/packages.config‎

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

0 commit comments

Comments
 (0)