Skip to content

Commit 219e24b

Browse files
rcouch00dustinsoftware
authored andcommitted
update System.Web.Mvc to v4.0.0.1 (minor) (#720)
update Microsoft.AspNet.Mvc to 4.0.40804.0 (minor)
1 parent 1f3e45b commit 219e24b

File tree

3 files changed

+19
-8
lines changed

3 files changed

+19
-8
lines changed

src/React.Sample.Mvc4/React.Sample.Mvc4.csproj

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\JavaScriptEngineSwitcher.V8.Native.win-x86.3.0.0\build\JavaScriptEngineSwitcher.V8.Native.win-x86.props" Condition="Exists('..\packages\JavaScriptEngineSwitcher.V8.Native.win-x86.3.0.0\build\JavaScriptEngineSwitcher.V8.Native.win-x86.props')" />
34
<Import Project="..\packages\JavaScriptEngineSwitcher.V8.Native.win-x64.3.0.0\build\JavaScriptEngineSwitcher.V8.Native.win-x64.props" Condition="Exists('..\packages\JavaScriptEngineSwitcher.V8.Native.win-x64.3.0.0\build\JavaScriptEngineSwitcher.V8.Native.win-x64.props')" />
45
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
56
<PropertyGroup>
@@ -31,6 +32,7 @@
3132
<UseGlobalApplicationHostFile />
3233
<NuGetPackageImportStamp>
3334
</NuGetPackageImportStamp>
35+
<Use64BitIISExpress />
3436
</PropertyGroup>
3537
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3638
<DebugSymbols>true</DebugSymbols>
@@ -83,6 +85,9 @@
8385
<Reference Include="System.Web.ApplicationServices" />
8486
<Reference Include="System.ComponentModel.DataAnnotations" />
8587
<Reference Include="System.Web.Extensions" />
88+
<Reference Include="System.Web.Mvc, Version=4.0.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
89+
<HintPath>..\packages\Microsoft.AspNet.Mvc.4.0.40804.0\lib\net40\System.Web.Mvc.dll</HintPath>
90+
</Reference>
8691
<Reference Include="System.Web.Optimization">
8792
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
8893
</Reference>
@@ -104,10 +109,6 @@
104109
<Private>True</Private>
105110
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll</HintPath>
106111
</Reference>
107-
<Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
108-
<Private>True</Private>
109-
<HintPath>..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll</HintPath>
110-
</Reference>
111112
<Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
112113
<Private>True</Private>
113114
<HintPath>..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll</HintPath>
@@ -153,7 +154,9 @@
153154
<Compile Include="App_Start\RouteConfig.cs" />
154155
<Content Include="Content\Sample.css" />
155156
<Content Include="Global.asax" />
156-
<Content Include="Web.config" />
157+
<Content Include="Web.config">
158+
<SubType>Designer</SubType>
159+
</Content>
157160
<Content Include="Web.Debug.config">
158161
<DependentUpon>Web.config</DependentUpon>
159162
</Content>
@@ -163,7 +166,9 @@
163166
<Content Include="Views\Web.config" />
164167
</ItemGroup>
165168
<ItemGroup>
166-
<Content Include="packages.config" />
169+
<Content Include="packages.config">
170+
<SubType>Designer</SubType>
171+
</Content>
167172
</ItemGroup>
168173
<ItemGroup>
169174
<Content Include="Views\Home\Index.cshtml" />
@@ -226,11 +231,12 @@
226231
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
227232
</PropertyGroup>
228233
<Error Condition="!Exists('..\packages\JavaScriptEngineSwitcher.V8.Native.win-x64.3.0.0\build\JavaScriptEngineSwitcher.V8.Native.win-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\JavaScriptEngineSwitcher.V8.Native.win-x64.3.0.0\build\JavaScriptEngineSwitcher.V8.Native.win-x64.props'))" />
234+
<Error Condition="!Exists('..\packages\JavaScriptEngineSwitcher.V8.Native.win-x86.3.0.0\build\JavaScriptEngineSwitcher.V8.Native.win-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\JavaScriptEngineSwitcher.V8.Native.win-x86.3.0.0\build\JavaScriptEngineSwitcher.V8.Native.win-x86.props'))" />
229235
</Target>
230236
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
231237
Other similar extension points exist, see Microsoft.Common.targets.
232238
<Target Name="BeforeBuild">
233239
</Target>
234240
<Target Name="AfterBuild">
235241
</Target> -->
236-
</Project>
242+
</Project>

src/React.Sample.Mvc4/Web.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@
8484
<assemblyIdentity name="JavaScriptEngineSwitcher.V8" publicKeyToken="c608b2a8cc9e4472" culture="neutral" />
8585
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
8686
</dependentAssembly>
87+
<dependentAssembly>
88+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
89+
<bindingRedirect oldVersion="4.0.0.0-4.0.0.1" newVersion="4.0.0.1" />
90+
</dependentAssembly>
8791
</assemblyBinding>
8892
</runtime>
8993

src/React.Sample.Mvc4/packages.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<package id="JavaScriptEngineSwitcher.Core" version="3.0.0" targetFramework="net45" />
66
<package id="JavaScriptEngineSwitcher.V8" version="3.0.0" targetFramework="net45" />
77
<package id="JavaScriptEngineSwitcher.V8.Native.win-x64" version="3.0.0" targetFramework="net45" />
8-
<package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net4" />
8+
<package id="JavaScriptEngineSwitcher.V8.Native.win-x86" version="3.0.0" targetFramework="net45" />
9+
<package id="Microsoft.AspNet.Mvc" version="4.0.40804.0" targetFramework="net45" />
910
<package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net4" />
1011
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net4" />
1112
<package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net4" />

0 commit comments

Comments
 (0)