From 295147d2eaf5f0f8c05d26802cce1c1ce3dafdb1 Mon Sep 17 00:00:00 2001
From: Daniel Lo Nigro <daniel@dan.cx>
Date: Sun, 2 Jul 2017 16:31:59 -0700
Subject: [PATCH] Split middleware into separate NuGet package
 (React.AspNet.Middleware).

Closes #388
---
 build.proj                                    |  1 +
 .../AspNetFileSystem.cs                       |  0
 .../AssemblyRegistration.cs                   |  0
 .../BabelFileMiddleware.cs                    |  0
 .../BabelFileOptions.cs                       |  0
 .../BabelFileSystem.cs                        |  0
 .../HttpContextLifetimeProvider.cs            |  0
 .../MemoryFileCacheCore.cs                    |  0
 .../React.AspNet.Middleware.csproj            | 48 +++++++++++++++++++
 .../ReactBuilderExtensions.cs                 |  0
 .../ReactServiceCollectionExtensions.cs       |  0
 src/React.AspNet/React.AspNet.csproj          | 16 +------
 src/React.Owin/React.Owin.csproj              |  2 +-
 .../React.Sample.Mvc6.csproj                  |  2 +-
 src/React.sln                                 |  9 +++-
 15 files changed, 61 insertions(+), 17 deletions(-)
 rename src/{React.AspNet => React.AspNet.Middleware}/AspNetFileSystem.cs (100%)
 rename src/{React.AspNet => React.AspNet.Middleware}/AssemblyRegistration.cs (100%)
 rename src/{React.AspNet => React.AspNet.Middleware}/BabelFileMiddleware.cs (100%)
 rename src/{React.AspNet => React.AspNet.Middleware}/BabelFileOptions.cs (100%)
 rename src/{React.AspNet => React.AspNet.Middleware}/BabelFileSystem.cs (100%)
 rename src/{React.AspNet => React.AspNet.Middleware}/HttpContextLifetimeProvider.cs (100%)
 rename src/{React.AspNet => React.AspNet.Middleware}/MemoryFileCacheCore.cs (100%)
 create mode 100644 src/React.AspNet.Middleware/React.AspNet.Middleware.csproj
 rename src/{React.AspNet => React.AspNet.Middleware}/ReactBuilderExtensions.cs (100%)
 rename src/{React.AspNet => React.AspNet.Middleware}/ReactServiceCollectionExtensions.cs (100%)

diff --git a/build.proj b/build.proj
index b642b5b73..4de1430b7 100644
--- a/build.proj
+++ b/build.proj
@@ -23,6 +23,7 @@ of patent rights can be found in the PATENTS file in the same directory.
 	<ItemGroup>
 		<PackageAssemblies Include="Cassette.React" />
 		<PackageAssemblies Include="React.AspNet" />
+		<PackageAssemblies Include="React.AspNet.Middleware" />
 		<PackageAssemblies Include="React.Core" />
 		<PackageAssemblies Include="React.MSBuild" />
 		<PackageAssemblies Include="React.Owin" />
diff --git a/src/React.AspNet/AspNetFileSystem.cs b/src/React.AspNet.Middleware/AspNetFileSystem.cs
similarity index 100%
rename from src/React.AspNet/AspNetFileSystem.cs
rename to src/React.AspNet.Middleware/AspNetFileSystem.cs
diff --git a/src/React.AspNet/AssemblyRegistration.cs b/src/React.AspNet.Middleware/AssemblyRegistration.cs
similarity index 100%
rename from src/React.AspNet/AssemblyRegistration.cs
rename to src/React.AspNet.Middleware/AssemblyRegistration.cs
diff --git a/src/React.AspNet/BabelFileMiddleware.cs b/src/React.AspNet.Middleware/BabelFileMiddleware.cs
similarity index 100%
rename from src/React.AspNet/BabelFileMiddleware.cs
rename to src/React.AspNet.Middleware/BabelFileMiddleware.cs
diff --git a/src/React.AspNet/BabelFileOptions.cs b/src/React.AspNet.Middleware/BabelFileOptions.cs
similarity index 100%
rename from src/React.AspNet/BabelFileOptions.cs
rename to src/React.AspNet.Middleware/BabelFileOptions.cs
diff --git a/src/React.AspNet/BabelFileSystem.cs b/src/React.AspNet.Middleware/BabelFileSystem.cs
similarity index 100%
rename from src/React.AspNet/BabelFileSystem.cs
rename to src/React.AspNet.Middleware/BabelFileSystem.cs
diff --git a/src/React.AspNet/HttpContextLifetimeProvider.cs b/src/React.AspNet.Middleware/HttpContextLifetimeProvider.cs
similarity index 100%
rename from src/React.AspNet/HttpContextLifetimeProvider.cs
rename to src/React.AspNet.Middleware/HttpContextLifetimeProvider.cs
diff --git a/src/React.AspNet/MemoryFileCacheCore.cs b/src/React.AspNet.Middleware/MemoryFileCacheCore.cs
similarity index 100%
rename from src/React.AspNet/MemoryFileCacheCore.cs
rename to src/React.AspNet.Middleware/MemoryFileCacheCore.cs
diff --git a/src/React.AspNet.Middleware/React.AspNet.Middleware.csproj b/src/React.AspNet.Middleware/React.AspNet.Middleware.csproj
new file mode 100644
index 000000000..dc922c71a
--- /dev/null
+++ b/src/React.AspNet.Middleware/React.AspNet.Middleware.csproj
@@ -0,0 +1,48 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>ASP.NET Core middleware to transpile JavaScript via Babel. Please refer to project site (http://reactjs.net/) for full installation instructions, usage examples and sample code</Description>
+    <Copyright>Copyright 2014-Present Facebook, Inc</Copyright>
+    <AssemblyTitle>ReactJS.NET - Babel middleware for ASP.NET Core</AssemblyTitle>
+    <Authors>Daniel Lo Nigro</Authors>
+    <TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyName>React.AspNet.Middleware</AssemblyName>
+    <AssemblyOriginatorKeyFile>../key.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    <PackageId>React.AspNet.Middleware</PackageId>
+    <PackageTags>asp.net;mvc;asp;javascript;js;react;facebook;reactjs;vnext;asp.net 5;asp.net core</PackageTags>
+    <PackageIconUrl>http://reactjs.net/img/logo_64.png</PackageIconUrl>
+    <PackageProjectUrl>http://reactjs.net/</PackageProjectUrl>
+    <PackageLicenseUrl>https://github.com/reactjs/React.NET#licence</PackageLicenseUrl>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <DefineConstants>$(DefineConstants);ASPNETCORE</DefineConstants>
+    <RootNamespace>React.AspNet</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\SharedAssemblyInfo.cs" />
+    <Compile Include="..\SharedAssemblyVersionInfo.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\React.Core\React.Core.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="1.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.1.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="1.1.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="1.1.1" />
+  </ItemGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/React.AspNet/ReactBuilderExtensions.cs b/src/React.AspNet.Middleware/ReactBuilderExtensions.cs
similarity index 100%
rename from src/React.AspNet/ReactBuilderExtensions.cs
rename to src/React.AspNet.Middleware/ReactBuilderExtensions.cs
diff --git a/src/React.AspNet/ReactServiceCollectionExtensions.cs b/src/React.AspNet.Middleware/ReactServiceCollectionExtensions.cs
similarity index 100%
rename from src/React.AspNet/ReactServiceCollectionExtensions.cs
rename to src/React.AspNet.Middleware/ReactServiceCollectionExtensions.cs
diff --git a/src/React.AspNet/React.AspNet.csproj b/src/React.AspNet/React.AspNet.csproj
index 75bbc1569..94f28f4e0 100644
--- a/src/React.AspNet/React.AspNet.csproj
+++ b/src/React.AspNet/React.AspNet.csproj
@@ -12,7 +12,7 @@
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <PackageId>React.AspNet</PackageId>
-    <PackageTags>asp.net;mvc;asp;javascript;js;react;facebook;reactjs;vnext;asp.net 5</PackageTags>
+    <PackageTags>asp.net;mvc;asp;javascript;js;react;facebook;reactjs;vnext;asp.net 5;asp.net core</PackageTags>
     <PackageIconUrl>http://reactjs.net/img/logo_64.png</PackageIconUrl>
     <PackageProjectUrl>http://reactjs.net/</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/reactjs/React.NET#licence</PackageLicenseUrl>
@@ -26,28 +26,16 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\React.AspNet.Middleware\React.AspNet.Middleware.csproj" />
     <ProjectReference Include="..\React.Core\React.Core.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="1.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="1.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="1.1.2" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.1.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
-    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="1.1.1" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/React.Owin/React.Owin.csproj b/src/React.Owin/React.Owin.csproj
index d8ad35963..909ae2ddc 100644
--- a/src/React.Owin/React.Owin.csproj
+++ b/src/React.Owin/React.Owin.csproj
@@ -21,7 +21,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\SharedAssemblyInfo.cs;..\React.AspNet\BabelFileOptions.cs;..\React.AspNet\BabelFileSystem.cs" />
+    <Compile Include="..\SharedAssemblyInfo.cs;..\React.AspNet.Middleware\BabelFileOptions.cs;..\React.AspNet.Middleware\BabelFileSystem.cs" />
     <Compile Include="..\SharedAssemblyVersionInfo.cs" />
   </ItemGroup>
 
diff --git a/src/React.Sample.Mvc6/React.Sample.Mvc6.csproj b/src/React.Sample.Mvc6/React.Sample.Mvc6.csproj
index 49d1d1e14..6040b5f1b 100644
--- a/src/React.Sample.Mvc6/React.Sample.Mvc6.csproj
+++ b/src/React.Sample.Mvc6/React.Sample.Mvc6.csproj
@@ -28,7 +28,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.1" />
     <PackageReference Include="Microsoft.NETCore.Platforms" Version="1.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
diff --git a/src/React.sln b/src/React.sln
index 6533baa78..e34a4eeb5 100644
--- a/src/React.sln
+++ b/src/React.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26228.4
+VisualStudioVersion = 15.0.26430.4
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{F567B25C-E869-4C93-9C96-077761250F87}"
 EndProject
@@ -63,6 +63,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.AspNet", "React.AspNe
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.Sample.Mvc6", "React.Sample.Mvc6\React.Sample.Mvc6.csproj", "{6E2C1144-703C-4FF5-893D-B9C1A2C55C3B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "React.AspNet.Middleware", "React.AspNet.Middleware\React.AspNet.Middleware.csproj", "{7E1C3999-1982-476D-9307-12B30737B41E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -129,6 +131,10 @@ Global
 		{6E2C1144-703C-4FF5-893D-B9C1A2C55C3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6E2C1144-703C-4FF5-893D-B9C1A2C55C3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6E2C1144-703C-4FF5-893D-B9C1A2C55C3B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7E1C3999-1982-476D-9307-12B30737B41E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E1C3999-1982-476D-9307-12B30737B41E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7E1C3999-1982-476D-9307-12B30737B41E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7E1C3999-1982-476D-9307-12B30737B41E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -149,5 +155,6 @@ Global
 		{6AA0D75E-5797-4690-BEFC-098A60C511A3} = {F567B25C-E869-4C93-9C96-077761250F87}
 		{631FCC55-0219-46DC-838A-C5A3E878943A} = {681C45FB-103C-48BC-B992-20C5B6B78F92}
 		{6E2C1144-703C-4FF5-893D-B9C1A2C55C3B} = {A51CE5B6-294F-4D39-B32B-BF08DAF9B40B}
+		{7E1C3999-1982-476D-9307-12B30737B41E} = {681C45FB-103C-48BC-B992-20C5B6B78F92}
 	EndGlobalSection
 EndGlobal