Skip to content

Commit 5a66ac5

Browse files
committed
Update React.Sample.Mvc4 to ASP.NET 4.5
1 parent b9aab30 commit 5a66ac5

File tree

3 files changed

+30
-24
lines changed

3 files changed

+30
-24
lines changed

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

+7-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
1414
<RootNamespace>React.Sample.Mvc4</RootNamespace>
1515
<AssemblyName>React.Sample.Mvc4</AssemblyName>
16-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1717
<MvcBuildViews>false</MvcBuildViews>
1818
<UseIISExpress>true</UseIISExpress>
1919
<IISExpressSSLPort />
@@ -27,6 +27,8 @@
2727
<UpgradeBackupLocation>
2828
</UpgradeBackupLocation>
2929
<OldToolsVersion>12.0</OldToolsVersion>
30+
<TargetFrameworkProfile />
31+
<UseGlobalApplicationHostFile />
3032
</PropertyGroup>
3133
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3234
<DebugSymbols>true</DebugSymbols>
@@ -37,6 +39,7 @@
3739
<ErrorReport>prompt</ErrorReport>
3840
<WarningLevel>4</WarningLevel>
3941
<NoWarn>1607</NoWarn>
42+
<Prefer32Bit>false</Prefer32Bit>
4043
</PropertyGroup>
4144
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4245
<DebugType>pdbonly</DebugType>
@@ -46,6 +49,7 @@
4649
<ErrorReport>prompt</ErrorReport>
4750
<WarningLevel>4</WarningLevel>
4851
<NoWarn>1607</NoWarn>
52+
<Prefer32Bit>false</Prefer32Bit>
4953
</PropertyGroup>
5054
<ItemGroup>
5155
<Reference Include="Antlr3.Runtime">
@@ -73,7 +77,7 @@
7377
</Reference>
7478
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
7579
<SpecificVersion>False</SpecificVersion>
76-
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
80+
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
7781
</Reference>
7882
<Reference Include="System" />
7983
<Reference Include="System.Data" />
@@ -82,14 +86,11 @@
8286
<Reference Include="System.Web.Entity" />
8387
<Reference Include="System.Web.ApplicationServices" />
8488
<Reference Include="System.ComponentModel.DataAnnotations" />
85-
<Reference Include="System.Core" />
86-
<Reference Include="System.Data.DataSetExtensions" />
89+
<Reference Include="System.Web.Extensions" />
8790
<Reference Include="System.Web.Optimization">
8891
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
8992
</Reference>
90-
<Reference Include="System.Xml.Linq" />
9193
<Reference Include="System.Web" />
92-
<Reference Include="System.Web.Extensions" />
9394
<Reference Include="System.Web.Abstractions" />
9495
<Reference Include="System.Web.Routing" />
9596
<Reference Include="System.Xml" />

src/React.Sample.Mvc4/Web.config

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0"?>
22
<!--
33
For more information on how to configure your ASP.NET application, please visit
44
http://go.microsoft.com/fwlink/?LinkId=169433
@@ -17,12 +17,17 @@
1717
<add key="ClientValidationEnabled" value="true" />
1818
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
1919
</appSettings>
20+
<!--
21+
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
2022
23+
The following attributes can be set on the <httpRuntime> tag.
24+
<system.Web>
25+
<httpRuntime targetFramework="4.5" />
26+
</system.Web>
27+
-->
2128
<system.web>
22-
23-
<compilation debug="true" targetFramework="4.0" />
24-
25-
<pages>
29+
<compilation debug="true" targetFramework="4.5"/>
30+
<pages controlRenderingCompatibilityVersion="4.0">
2631
<namespaces>
2732
<add namespace="System.Web.Helpers" />
2833
<add namespace="System.Web.Mvc" />

src/React.Sample.Mvc4/packages.config

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Antlr" version="3.4.1.9004" targetFramework="net40" />
4-
<package id="JavaScriptEngineSwitcher.Core" version="1.2.4" targetFramework="net40" />
5-
<package id="JavaScriptEngineSwitcher.Msie" version="1.2.4" targetFramework="net40" />
6-
<package id="JavaScriptEngineSwitcher.V8" version="1.2.4" targetFramework="net40" />
7-
<package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net40" />
8-
<package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net40" />
9-
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net40" />
10-
<package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net40" />
11-
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
12-
<package id="MsieJavaScriptEngine" version="1.5.1" targetFramework="net40" />
13-
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net40" />
14-
<package id="WebActivatorEx" version="2.0.5" targetFramework="net40" />
15-
<package id="WebGrease" version="1.5.2" targetFramework="net40" />
3+
<package id="Antlr" version="3.4.1.9004" targetFramework="net4" />
4+
<package id="JavaScriptEngineSwitcher.Core" version="1.2.4" targetFramework="net4" />
5+
<package id="JavaScriptEngineSwitcher.Msie" version="1.2.4" targetFramework="net4" />
6+
<package id="JavaScriptEngineSwitcher.V8" version="1.2.4" targetFramework="net4" />
7+
<package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net4" />
8+
<package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net4" />
9+
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net4" />
10+
<package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net4" />
11+
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net4" />
12+
<package id="MsieJavaScriptEngine" version="1.5.1" targetFramework="net4" />
13+
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
14+
<package id="WebActivatorEx" version="2.0.5" targetFramework="net4" />
15+
<package id="WebGrease" version="1.5.2" targetFramework="net4" />
1616
</packages>

0 commit comments

Comments
 (0)