Downgrade tutorial to .NETCore 2.2, since 3.0 is not released (reactjs#912)

dustinsoftware · web-flow · commit 287a51966870 · 2019-09-21T23:03:56.000-07:00
diff --git a/tutorial-code/Startup.cs b/tutorial-code/Startup.cs
@@ -18,7 +18,7 @@ namespace ReactDemo
 {
 	public class Startup
 	{
-		public Startup(IWebHostEnvironment env)
+		public Startup(IHostingEnvironment env)
 		{
 			var builder = new ConfigurationBuilder()
 				.SetBasePath(env.ContentRootPath)
@@ -43,9 +43,20 @@ public void ConfigureServices(IServiceCollection services)
 		}
 
 		// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-		public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
+		public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
 		{
-			app.UseDeveloperExceptionPage();
+			loggerFactory.AddConsole(Configuration.GetSection("Logging"));
+			loggerFactory.AddDebug();
+
+			if (env.IsDevelopment())
+			{
+				app.UseDeveloperExceptionPage();
+				app.UseBrowserLink();
+			}
+			else
+			{
+				app.UseExceptionHandler("/Home/Error");
+			}
 
 			// Initialise ReactJS.NET. Must be before static files.
 			app.UseReact(config =>
@@ -74,11 +85,11 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
 
 			app.UseStaticFiles();
 
-			app.UseRouting();
-
-			app.UseEndpoints(endpoints =>
+			app.UseMvc(routes =>
 			{
-				endpoints.MapControllerRoute("default", "{controller=Home}/{action=Index}/{id?}");
+				routes.MapRoute(
+					name: "default",
+					template: "{controller=Home}/{action=Index}/{id?}");
 			});
 		}
 	}
diff --git a/tutorial-code/tutorial-code.csproj b/tutorial-code/tutorial-code.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
-		<TargetFramework>netcoreapp3.0</TargetFramework>
+		<TargetFramework>netcoreapp2.2</TargetFramework>
 		<PreserveCompilationContext>true</PreserveCompilationContext>
 		<AssemblyName>tutorial-code</AssemblyName>
 		<OutputType>Exe</OutputType>
@@ -20,7 +20,11 @@
     <PackageReference Include="JavascriptEngineSwitcher.Extensions.MsDependencyInjection" Version="3.1.0" />
 		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3" />
 		<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
-		<PackageReference Include="React.AspNet" Version="5.0.0" />
+		<PackageReference Include="React.AspNet" Version="5.1.0" />
+		<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
+    <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
 	</ItemGroup>
 	<ItemGroup>
 		<Content Update="Views\Home\Index.cshtml">
diff --git a/tutorial-code/web.config b/tutorial-code/web.config
@@ -1,17 +1,14 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <configuration>
+
   <!--
     Configure your application settings in appsettings.json. Learn more at http://go.microsoft.com/fwlink/?LinkId=786380
   -->
+
   <system.webServer>
     <handlers>
-      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
+      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified"/>
     </handlers>
-    <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" hostingModel="InProcess">
-      <environmentVariables>
-        <environmentVariable name="COMPLUS_ForceENC" value="1" />
-        <environmentVariable name="ASPNETCORE_ENVIRONMENT" value="Development" />
-      </environmentVariables>
-    </aspNetCore>
+    <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false"/>
   </system.webServer>
-</configuration>
+</configuration>

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ namespace ReactDemo`
`18`	`18`	`{`
`19`	`19`	`public class Startup`
`20`	`20`	`{`
`21`		`- public Startup(IWebHostEnvironment env)`
	`21`	`+ public Startup(IHostingEnvironment env)`
`22`	`22`	`{`
`23`	`23`	`var builder = new ConfigurationBuilder()`
`24`	`24`	`.SetBasePath(env.ContentRootPath)`
`@@ -43,9 +43,20 @@ public void ConfigureServices(IServiceCollection services)`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.`
`46`		`- public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)`
	`46`	`+ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)`
`47`	`47`	`{`
`48`		`- app.UseDeveloperExceptionPage();`
	`48`	`+ loggerFactory.AddConsole(Configuration.GetSection("Logging"));`
	`49`	`+ loggerFactory.AddDebug();`
	`50`	`+`
	`51`	`+ if (env.IsDevelopment())`
	`52`	`+ {`
	`53`	`+ app.UseDeveloperExceptionPage();`
	`54`	`+ app.UseBrowserLink();`
	`55`	`+ }`
	`56`	`+ else`
	`57`	`+ {`
	`58`	`+ app.UseExceptionHandler("/Home/Error");`
	`59`	`+ }`
`49`	`60`
`50`	`61`	`// Initialise ReactJS.NET. Must be before static files.`
`51`	`62`	`app.UseReact(config =>`
`@@ -74,11 +85,11 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF`
`74`	`85`
`75`	`86`	`app.UseStaticFiles();`
`76`	`87`
`77`		`- app.UseRouting();`
`78`		`-`
`79`		`- app.UseEndpoints(endpoints =>`
	`88`	`+ app.UseMvc(routes =>`
`80`	`89`	`{`
`81`		`- endpoints.MapControllerRoute("default", "{controller=Home}/{action=Index}/{id?}");`
	`90`	`+ routes.MapRoute(`
	`91`	`+ name: "default",`
	`92`	`+ template: "{controller=Home}/{action=Index}/{id?}");`
`82`	`93`	`});`
`83`	`94`	`}`
`84`	`95`	`}`