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.
+
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 @@
+
+
+
+ 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
+ Copyright 2014-Present Facebook, Inc
+ ReactJS.NET - Babel middleware for ASP.NET Core
+ Daniel Lo Nigro
+ net451;netstandard1.6
+ true
+ React.AspNet.Middleware
+ ../key.snk
+ true
+ true
+ React.AspNet.Middleware
+ asp.net;mvc;asp;javascript;js;react;facebook;reactjs;vnext;asp.net 5;asp.net core
+ http://reactjs.net/img/logo_64.png
+ http://reactjs.net/
+ https://github.com/reactjs/React.NET#licence
+ false
+ $(DefineConstants);ASPNETCORE
+ React.AspNet
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
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 @@
true
true
React.AspNet
- asp.net;mvc;asp;javascript;js;react;facebook;reactjs;vnext;asp.net 5
+ asp.net;mvc;asp;javascript;js;react;facebook;reactjs;vnext;asp.net 5;asp.net core
http://reactjs.net/img/logo_64.png
http://reactjs.net/
https://github.com/reactjs/React.NET#licence
@@ -26,28 +26,16 @@
+
-
-
-
-
-
-
-
-
-
true
-
-
-
-
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 @@
-
+
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 @@
-
+
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