Ported WebStartup sample (#326)

ivaylokenov · ivaylokenov · commit b75bac9b2552 · 2019-08-28T17:19:42.000+03:00
diff --git a/samples/NoStartup/NoStartup.Components/NoStartup.Components.csproj b/samples/NoStartup/NoStartup.Components/NoStartup.Components.csproj
@@ -4,11 +4,6 @@
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <AssemblyName>NoStartup.Components</AssemblyName>
-    <PackageId>NoStartup.Components</PackageId>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/NoStartup/NoStartup.Services/NoStartup.Services.csproj b/samples/NoStartup/NoStartup.Services/NoStartup.Services.csproj
@@ -4,11 +4,6 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <AssemblyName>NoStartup.Services</AssemblyName>
-    <PackageId>NoStartup.Services</PackageId>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
   </PropertyGroup>
 
 </Project>
diff --git a/samples/NoStartup/NoStartup.Test/NoStartup.Test.csproj b/samples/NoStartup/NoStartup.Test/NoStartup.Test.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/WebStartup/WebStartup.Test/WebStartup.Test.csproj b/samples/WebStartup/WebStartup.Test/WebStartup.Test.csproj
@@ -1,13 +1,12 @@
-﻿<Project Sdk="Microsoft.NET.Sdk.Web">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0-*" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>
diff --git a/samples/WebStartup/WebStartup.Web/Startup.cs b/samples/WebStartup/WebStartup.Web/Startup.cs
@@ -6,6 +6,7 @@
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.Extensions.Hosting;
 
     public class Startup
     {
@@ -24,11 +25,11 @@ public void ConfigureServices(IServiceCollection services)
                 options.MinimumSameSitePolicy = SameSiteMode.None;
             });
             
-            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
+            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_3_0);
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             if (env.IsDevelopment())
             {
@@ -45,16 +46,18 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
             app.UseStaticFiles();
             app.UseCookiePolicy();
 
-            app.UseMvc(routes =>
+            app.UseRouting();
+
+            app.UseEndpoints(routes =>
             {
-                routes.MapRoute(
+                routes.MapControllerRoute(
                     name: "custom",
-                    template: "Index",
+                    pattern: "Index",
                     defaults: new { controller = "Home", action = "Index" });
 
-                routes.MapRoute(
+                routes.MapControllerRoute(
                     name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
+                    pattern: "{controller=Home}/{action=Index}/{id?}");
             });
         }
     }
diff --git a/samples/WebStartup/WebStartup.Web/WebStartup.Web.csproj b/samples/WebStartup/WebStartup.Web/WebStartup.Web.csproj
@@ -1,15 +1,9 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
-  </ItemGroup>
-
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using Microsoft.AspNetCore.Mvc;`
`7`	`7`	`using Microsoft.Extensions.Configuration;`
`8`	`8`	`using Microsoft.Extensions.DependencyInjection;`
	`9`	`+ using Microsoft.Extensions.Hosting;`
`9`	`10`
`10`	`11`	`public class Startup`
`11`	`12`	`{`
`@@ -24,11 +25,11 @@ public void ConfigureServices(IServiceCollection services)`
`24`	`25`	`options.MinimumSameSitePolicy = SameSiteMode.None;`
`25`	`26`	`});`
`26`	`27`
`27`		`- services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);`
	`28`	`+ services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_3_0);`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.`
`31`		`- public void Configure(IApplicationBuilder app, IHostingEnvironment env)`
	`32`	`+ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)`
`32`	`33`	`{`
`33`	`34`	`if (env.IsDevelopment())`
`34`	`35`	`{`
`@@ -45,16 +46,18 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)`
`45`	`46`	`app.UseStaticFiles();`
`46`	`47`	`app.UseCookiePolicy();`
`47`	`48`
`48`		`- app.UseMvc(routes =>`
	`49`	`+ app.UseRouting();`
	`50`	`+`
	`51`	`+ app.UseEndpoints(routes =>`
`49`	`52`	`{`
`50`		`- routes.MapRoute(`
	`53`	`+ routes.MapControllerRoute(`
`51`	`54`	`name: "custom",`
`52`		`- template: "Index",`
	`55`	`+ pattern: "Index",`
`53`	`56`	`defaults: new { controller = "Home", action = "Index" });`
`54`	`57`
`55`		`- routes.MapRoute(`
	`58`	`+ routes.MapControllerRoute(`
`56`	`59`	`name: "default",`
`57`		`- template: "{controller=Home}/{action=Index}/{id?}");`
	`60`	`+ pattern: "{controller=Home}/{action=Index}/{id?}");`
`58`	`61`	`});`
`59`	`62`	`}`
`60`	`63`	`}`