Making React.AspNet compatible with ASP.NET Core RC2 (#271)

Author: ShikiGami

appveyor.yml

@@ -2,8 +2,6 @@ version: '{build}'
 os: Visual Studio 2015
 install:
 - set PATH=%ProgramFiles(x86)%\MSBuild\14.0\Bin;%PATH%
-- dnvm update-self
-- dnvm install 1.0.0-rc1-update1
 build:
   project: build.proj
   verbosity: normal

build.proj

@@ -29,10 +29,10 @@ of patent rights can be found in the PATENTS file in the same directory.
 		<PackageAssemblies Include="Cassette.React" />
 		<PackageAssemblies Include="React.MSBuild" />
 		<PackageAssemblies Include="React.Owin" />
-		<PackageAssembliesAspNet5 Include="React.AspNet" />
-		<AspNet5ProjectJson Include="src/React.AspNet/project.json" />
-		<AspNet5ProjectJson Include="src/React.Sample.Mvc6/project.json" />
-		<AspNet5ProjectJson Include="src/wrap/**/project.json" />
+		<PackageAssembliesAspNetCore Include="React.AspNet" />
+		<AspNetCoreProjectJson Include="src/wrap/**/project.json" />
+		<AspNetCoreProjectJson Include="src/React.AspNet/project.json" />
+		<AspNetCoreProjectJson Include="src/React.Sample.Mvc6/project.json" />
 	</ItemGroup>
 
 	<Import Project="src/React.tasks.proj" />
@@ -42,10 +42,10 @@ of patent rights can be found in the PATENTS file in the same directory.
 			WorkingDirectory="$(MSBuildProjectDirectory)"
 			Command="tools\NuGet\nuget.exe restore $(SolutionFile)"
 		/>
-		<!-- NuGet packages for ASP.NET 5 projects -->
+		<!-- NuGet packages for ASP.NET Core projects -->
 		<Exec
 			WorkingDirectory="$(MSBuildProjectDirectory)"
-			Command="dnu restore --quiet --parallel src\React.AspNet src\React.Sample.Mvc6"
+			Command="dotnet restore --quiet src\React.AspNet src\React.Sample.Mvc6"
 		/>
 		<!-- npm packages -->
 		<Exec
@@ -81,7 +81,7 @@ of patent rights can be found in the PATENTS file in the same directory.
 			AssemblyInformationalVersion="$(Major).$(Minor).$(FullBuild)"
 		/>
 		<!-- 
-			Set version for ASP.NET 5 projects. In theory K_BUILD_VERSION should work but it doesn't seem 
+			Set version for ASP.NET Core projects. In theory K_BUILD_VERSION should work but it doesn't seem 
 			to be functional yet :(. We work around this by physically writing the build number to the 
 			project.json files. For development builds we write the full version number (including 
 			build date) and reset it later so the dev build number isn't commited to the repo.
@@ -91,18 +91,18 @@ of patent rights can be found in the PATENTS file in the same directory.
 			Value="$(Build)"
 		/-->
 		<UpdateAspNetProjectVersion
-			Files="@(AspNet5ProjectJson)"
+			Files="@(AspNetCoreProjectJson)"
 			Version="$(Major).$(Minor).$(FullBuild)"
 		/>
 	</Target>
 
 	<Target Name="Clean" BeforeTargets="Build">
 		<!-- 
-			ASP.NET 5 projects don't delete generated .nupkg files when cleaned or rebuilt, so we need to
+			ASP.NET Core projects don't delete generated .nupkg files when cleaned or rebuilt, so we need to
 			do it here. See https://github.com/aspnet/XRE/issues/1301 
 		-->
 		<DeleteTree Directories="src/artifacts" />
-		<DeleteTree Directories="bin/%(PackageAssembliesAspNet5.Identity)/Release" />
+		<DeleteTree Directories="bin/%(PackageAssembliesAspNetCore.Identity)/Release" />
 	</Target>
 
 	<Target Name="Build" DependsOnTargets="RestorePackages;UpdateVersion">
@@ -111,10 +111,10 @@ of patent rights can be found in the PATENTS file in the same directory.
 		<Exec WorkingDirectory="src/React.Sample.Webpack" Command="node_modules/.bin/webpack" />
 	</Target>
 
-	<Target Name="ResetAspNetVersion" AfterTargets="Build">
-		<!-- Resets the version number in ASP.NET project.json files so we don't commit -dev- version numbers -->
+	<Target Name="ResetAspNetVersion" AfterTargets="AspNetPackages">
+		<!-- Resets the version number in ASP.NET Core project.json files so we don't commit -dev- version numbers -->
 		<UpdateAspNetProjectVersion
-			Files="@(AspNet5ProjectJson)"
+			Files="@(AspNetCoreProjectJson)"
 			Version="$(Major).$(Minor).$(Build)-*"
 		/>
 	</Target>
@@ -148,13 +148,12 @@ of patent rights can be found in the PATENTS file in the same directory.
 			Command="tools\NuGet\nuget.exe pack src/%(PackageAssemblies.Identity)/%(PackageAssemblies.Identity).csproj -IncludeReferencedProjects -Symbols -Prop Configuration=Release -OutputDirectory output"
 		/>
 	</Target>
-
-	<Target Name="CopyAspNetPackages" AfterTargets="Package">
-		<!-- Copy over ASP.NET 5 packages -->
-		<ItemGroup>
-			<AspNet5Packages Include="bin/%(PackageAssembliesAspNet5.Identity)/Release/*.nupkg" />
-		</ItemGroup>
-		<Copy SourceFiles="@(AspNet5Packages)" DestinationFolder="$(PackageOutputDir)" />
+  
+	<Target Name="AspNetPackages" AfterTargets="Package">
+		<Exec
+			WorkingDirectory="$(MSBuildProjectDirectory)"
+			Command="dotnet pack --output $(PackageOutputDir) --build-base-path bin/ --configuration Release --no-build src/%(PackageAssembliesAspNetCore.Identity)/project.json"
+		/>
 	</Target>
 
 	<Target Name="Push">

src/React.AspNet/AspNetFileSystem.cs

@@ -8,7 +8,7 @@
  */
 
 using System.IO;
-using Microsoft.AspNet.Hosting;
+using Microsoft.AspNetCore.Hosting;
 
 namespace React.AspNet
 {

src/React.AspNet/BabelFileMiddleware.cs

@@ -10,11 +10,12 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.StaticFiles;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 
 namespace React.AspNet
 {
@@ -76,19 +77,19 @@ private StaticFileMiddleware CreateFileMiddleware(IBabel babel)
 			return new StaticFileMiddleware(
 				_next,
 				_hostingEnv,
-				new StaticFileOptions
+				Options.Create(new StaticFileOptions
 				{
 					ContentTypeProvider = _options.StaticFileOptions.ContentTypeProvider,
 					DefaultContentType = _options.StaticFileOptions.DefaultContentType,
 					OnPrepareResponse = _options.StaticFileOptions.OnPrepareResponse,
 					RequestPath = _options.StaticFileOptions.RequestPath,
 					ServeUnknownFileTypes = _options.StaticFileOptions.ServeUnknownFileTypes,
 					FileProvider = new BabelFileSystem(
-						babel, 
+						babel,
 						_options.StaticFileOptions.FileProvider ?? _hostingEnv.WebRootFileProvider,
 						_options.Extensions
 					)
-				},
+				}),
 				_loggerFactory
 			);
 		}

src/React.AspNet/BabelFileOptions.cs

@@ -11,7 +11,7 @@
 #if OWIN
 using Microsoft.Owin.StaticFiles;
 #else
-using Microsoft.AspNet.StaticFiles;
+using Microsoft.AspNetCore.Builder;
 #endif
 
 #if OWIN

src/React.AspNet/BabelFileSystem.cs

@@ -16,10 +16,10 @@
 using Microsoft.Owin.FileSystems;
 using IOwinFileSystem = Microsoft.Owin.FileSystems.IFileSystem;
 #else
-using Microsoft.AspNet.FileProviders;
+using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Primitives;
-using IOwinFileSystem = Microsoft.AspNet.FileProviders.IFileProvider;
-using PhysicalFileSystem = Microsoft.AspNet.FileProviders.PhysicalFileProvider;
+using IOwinFileSystem = Microsoft.Extensions.FileProviders.IFileProvider;
+using PhysicalFileSystem = Microsoft.Extensions.FileProviders.PhysicalFileProvider;
 #endif
 
 #if OWIN

src/React.AspNet/HtmlHelperExtensions.cs

@@ -15,8 +15,8 @@
 using System.Web.Mvc;
 using IHtmlHelper = System.Web.Mvc.HtmlHelper;
 #else
-using Microsoft.AspNet.Mvc.Rendering;
-using IHtmlString = Microsoft.AspNet.Html.Abstractions.IHtmlContent;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using IHtmlString = Microsoft.AspNetCore.Html.IHtmlContent;
 #endif
 
 #if LEGACYASPNET

src/React.AspNet/HttpContextLifetimeProvider.cs

@@ -10,7 +10,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Linq;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
 using React.Exceptions;
 using React.TinyIoC;
 using Microsoft.Extensions.DependencyInjection;
@@ -43,28 +43,14 @@ public HttpContextLifetimeProvider(IServiceProvider appServiceProvider)
 		/// </summary>
 		private readonly string _keyName = PREFIX + Guid.NewGuid();
 
-		/// <summary>
-		/// Gets the <see cref="HttpContext" /> of the current request.
-		/// </summary>
-		private HttpContext HttpContext => 
-			_appServiceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext;
-
 		/// <summary>
 		/// Gets the current per-request registrations for the current request.
 		/// </summary>
 		private PerRequestRegistrations Registrations
 		{
 			get
 			{
-				var requestServices = HttpContext.RequestServices;
-				if (requestServices == null)
-				{
-					throw new ReactNotInitialisedException(
-						"ASP.NET request services have not been initialised correctly. Please " +
-						"ensure you are calling app.UseRequestServices() before app.UseReact()."
-					);
-				}
-				var registrations = requestServices.GetService<PerRequestRegistrations>();
+				var registrations = _appServiceProvider.GetService<PerRequestRegistrations>();
 				if (registrations == null)
 				{
 					throw new ReactNotInitialisedException(

src/React.AspNet/React.AspNet.xproj

@@ -4,33 +4,16 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>a7acdb56-5e43-40a6-92c9-2c52228e6074</ProjectGuid>
     <RootNamespace>React.AspNet</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\bin\$(MSBuildProjectName)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>React.AspNet</AssemblyName>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\bin\</OutputPath>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
-    <TypeScriptCompileBlocked>True</TypeScriptCompileBlocked>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
   </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\React.Core\React.Core.csproj" />
-  </ItemGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties />
-    </VisualStudio>
-  </ProjectExtensions>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" />
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" />
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>

src/React.AspNet/ReactBuilderExtensions.cs

@@ -8,8 +8,8 @@
  */
 
 using System;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Hosting;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.PlatformAbstractions;
 using React.Exceptions;
 using React.TinyIoC;
@@ -37,10 +37,6 @@ public static IApplicationBuilder UseReact(
 		{
 			EnsureServicesRegistered(app);
 
-			// Register IApplicationEnvironment in our dependency injection container
-			// Ideally this would be in AddReact(IServiceCollection) but we can't 
-			// access IApplicationEnvironment there.
-			React.AssemblyRegistration.Container.Register(app.ApplicationServices.GetRequiredService<IApplicationEnvironment>());
 			React.AssemblyRegistration.Container.Register(app.ApplicationServices.GetRequiredService<IHostingEnvironment>());
 
 			Initializer.Initialize(registerOptions => AsPerRequestSingleton(app.ApplicationServices, registerOptions));