Skip to content

Commit 98ce62e

Browse files
Daniel15Daniel15
authored
Upgrade React.Router to ASP.NET Core 2.0 (#461)
* Upgrade React.Router to ASP.NET Core 2.0 * Fix indentation
1 parent 26e545b commit 98ce62e

File tree

9 files changed

+69
-29
lines changed

9 files changed

+69
-29
lines changed

‎build.proj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ of patent rights can be found in the PATENTS file in the same directory.
2828
<PackageAssemblies Include="React.MSBuild" />
2929
<PackageAssemblies Include="React.Owin" />
3030
<PackageAssemblies Include="React.Router" />
31+
<PackageAssemblies Include="React.Router.Mvc4" />
3132
<PackageAssemblies Include="React.Web" />
3233
<PackageAssemblies Include="React.Web.Mvc4" />
3334
<PackageAssemblies Include="System.Web.Optimization.React" />

‎src/React.Router.Mvc4/React.Router.Mvc4.csproj‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<Description>React Router support for ReactJS.NET.</Description>
5+
<Copyright>Copyright 2014-Present Facebook, Inc</Copyright>
6+
<AssemblyTitle>ReactJS.NET Router</AssemblyTitle>
7+
<Authors>Daniel Lo Nigro, Gunnar Már Óttarsson</Authors>
8+
<TargetFrameworks>net451</TargetFrameworks>
9+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
10+
<AssemblyName>React.Router.Mvc4</AssemblyName>
11+
<DefineConstants>$(DefineConstants);LEGACYASPNET</DefineConstants>
12+
<AssemblyOriginatorKeyFile>../key.snk</AssemblyOriginatorKeyFile>
13+
<SignAssembly>true</SignAssembly>
14+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
15+
<PackageId>React.Router.Mvc4</PackageId>
16+
<PackageTags>asp.net;mvc;asp;javascript;js;react;facebook;reactjs;babel;router;react router</PackageTags>
17+
<PackageIconUrl>http://reactjs.net/img/logo_64.png</PackageIconUrl>
18+
<PackageProjectUrl>http://reactjs.net/</PackageProjectUrl>
19+
<PackageLicenseUrl>https://github.com/reactjs/React.NET#licence</PackageLicenseUrl>
20+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
21+
</PropertyGroup>
22+
23+
<ItemGroup>
24+
<Compile Include="..\React.Router\*.cs" />
25+
<Compile Include="..\SharedAssemblyInfo.cs" />
26+
<Compile Include="..\SharedAssemblyVersionInfo.cs" />
27+
<Content Include="Content\**\*">
28+
<Pack>true</Pack>
29+
<PackagePath>content\</PackagePath>
30+
</Content>
31+
</ItemGroup>
32+
33+
<ItemGroup>
34+
<Reference Include="System.Web" />
35+
<Reference Include="Microsoft.CSharp" />
36+
<PackageReference Include="Microsoft.AspNet.Mvc" Version="4.0.20710" />
37+
</ItemGroup>
38+
39+
<ItemGroup>
40+
<ProjectReference Include="..\React.Core\React.Core.csproj" />
41+
</ItemGroup>
42+
43+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
44+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
45+
</PropertyGroup>
46+
47+
</Project>

‎src/React.Router/HtmlHelperExtensions.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
* Copyright (c) 2014-Present, Facebook, Inc.
33
* All rights reserved.
44
*
@@ -8,12 +8,9 @@
88
*/
99

1010
using System;
11-
using React.Exceptions;
12-
using React.TinyIoC;
1311

14-
#if NET451
12+
#if LEGACYASPNET
1513
using System.Web;
16-
using System.Web.Mvc;
1714
using HttpResponse = System.Web.HttpResponseBase;
1815
using IHtmlHelper = System.Web.Mvc.HtmlHelper;
1916
#else

‎src/React.Router/React.Router.csproj‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Copyright>Copyright 2014-Present Facebook, Inc</Copyright>
66
<AssemblyTitle>ReactJS.NET Router</AssemblyTitle>
77
<Authors>Daniel Lo Nigro, Gunnar Már Óttarsson</Authors>
8-
<TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
8+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<AssemblyName>React.Router</AssemblyName>
1111
<AssemblyOriginatorKeyFile>../key.snk</AssemblyOriginatorKeyFile>
@@ -19,10 +19,6 @@
1919
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
2020
</PropertyGroup>
2121

22-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net451|AnyCPU'">
23-
<DefineConstants>TRACE;DEBUG;ASPNETCORE;NET451</DefineConstants>
24-
</PropertyGroup>
25-
2622
<ItemGroup>
2723
<Compile Include="..\SharedAssemblyInfo.cs" />
2824
<Compile Include="..\SharedAssemblyVersionInfo.cs" />
@@ -32,15 +28,9 @@
3228
</Content>
3329
</ItemGroup>
3430

35-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
36-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="1.0.3" />
37-
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="1.0.3" />
38-
</ItemGroup>
39-
40-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
41-
<Reference Include="System.Web" />
42-
<Reference Include="Microsoft.CSharp" />
43-
<PackageReference Include="Microsoft.AspNet.Mvc" Version="4.0.20710" />
31+
<ItemGroup>
32+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.0.0" />
33+
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.0.0" />
4434
</ItemGroup>
4535

4636
<ItemGroup>

‎src/React.Router/ReactRouterComponent.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
* Copyright (c) 2014-Present, Facebook, Inc.
33
* All rights reserved.
44
*
@@ -7,9 +7,7 @@
77
* of patent rights can be found in the PATENTS file in the same directory.
88
*/
99

10-
using JavaScriptEngineSwitcher.Core;
1110
using Newtonsoft.Json;
12-
using React.Exceptions;
1311

1412
namespace React.Router
1513
{

‎src/React.Router/ReactRouterException.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
* Copyright (c) 2014-Present, Facebook, Inc.
33
* All rights reserved.
44
*
@@ -15,7 +15,7 @@ namespace React.Router
1515
/// <summary>
1616
/// React Router Exception
1717
/// </summary>
18-
#if NET451
18+
#if LEGACYASPNET
1919
[Serializable]
2020
#endif
2121
public class ReactRouterException : Exception
@@ -38,7 +38,7 @@ public ReactRouterException(string message, Exception innerException)
3838
: base(message, innerException) { }
3939

4040

41-
#if NET451
41+
#if LEGACYASPNET
4242
/// <summary>
4343
/// Used by deserialization
4444
/// </summary>

‎src/React.Router/SetServerResponse.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
* Copyright (c) 2014-Present, Facebook, Inc.
33
* All rights reserved.
44
*
@@ -7,7 +7,7 @@
77
* of patent rights can be found in the PATENTS file in the same directory.
88
*/
99

10-
#if NET451
10+
#if LEGACYASPNET
1111
using HttpResponse = System.Web.HttpResponseBase;
1212
#else
1313
using HttpResponse = Microsoft.AspNetCore.Http.HttpResponse;
@@ -45,7 +45,7 @@ public static void ModifyResponse(RoutingContext context, HttpResponse Response)
4545
{
4646
if (statusCode == 301)
4747
{
48-
#if NET451
48+
#if LEGACYASPNET
4949
Response.RedirectPermanent(context.url);
5050
#else
5151
Response.Redirect(context.url, true);

‎src/React.sln‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.AspNet.Middleware", "
6868
EndProject
6969
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.Sample.CoreMvc", "React.Sample.CoreMvc\React.Sample.CoreMvc.csproj", "{305918EF-AD05-4743-9B3A-DB1CE84D467E}"
7070
EndProject
71+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.Router.Mvc4", "React.Router.Mvc4\React.Router.Mvc4.csproj", "{2170D912-86E9-4CE3-8DA4-E1DE8D958E63}"
72+
EndProject
7173
Global
7274
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7375
Debug|Any CPU = Debug|Any CPU
@@ -142,6 +144,10 @@ Global
142144
{305918EF-AD05-4743-9B3A-DB1CE84D467E}.Debug|Any CPU.Build.0 = Debug|Any CPU
143145
{305918EF-AD05-4743-9B3A-DB1CE84D467E}.Release|Any CPU.ActiveCfg = Release|Any CPU
144146
{305918EF-AD05-4743-9B3A-DB1CE84D467E}.Release|Any CPU.Build.0 = Release|Any CPU
147+
{2170D912-86E9-4CE3-8DA4-E1DE8D958E63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
148+
{2170D912-86E9-4CE3-8DA4-E1DE8D958E63}.Debug|Any CPU.Build.0 = Debug|Any CPU
149+
{2170D912-86E9-4CE3-8DA4-E1DE8D958E63}.Release|Any CPU.ActiveCfg = Release|Any CPU
150+
{2170D912-86E9-4CE3-8DA4-E1DE8D958E63}.Release|Any CPU.Build.0 = Release|Any CPU
145151
EndGlobalSection
146152
GlobalSection(SolutionProperties) = preSolution
147153
HideSolutionNode = FALSE
@@ -164,6 +170,7 @@ Global
164170
{D076273B-C5EA-47C7-923D-523E4C5EE30D} = {681C45FB-103C-48BC-B992-20C5B6B78F92}
165171
{7E1C3999-1982-476D-9307-12B30737B41E} = {681C45FB-103C-48BC-B992-20C5B6B78F92}
166172
{305918EF-AD05-4743-9B3A-DB1CE84D467E} = {A51CE5B6-294F-4D39-B32B-BF08DAF9B40B}
173+
{2170D912-86E9-4CE3-8DA4-E1DE8D958E63} = {681C45FB-103C-48BC-B992-20C5B6B78F92}
167174
EndGlobalSection
168175
GlobalSection(ExtensibilityGlobals) = postSolution
169176
SolutionGuid = {DCF4A41E-C60D-4086-98A9-6F8508D7E8D0}

‎tests/React.Tests/React.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<ItemGroup>
1919
<ProjectReference Include="..\..\src\React.Core\React.Core.csproj" />
2020
<ProjectReference Include="..\..\src\React.Owin\React.Owin.csproj" />
21-
<ProjectReference Include="..\..\src\React.Router\React.Router.csproj" />
21+
<ProjectReference Include="..\..\src\React.Router.Mvc4\React.Router.Mvc4.csproj" />
2222
<ProjectReference Include="..\..\src\React.Web.Mvc4\React.Web.Mvc4.csproj" />
2323
</ItemGroup>
2424

0 commit comments

Comments
 (0)