Upgrade to .NET Core 3.1 LTS

LegacyTemplates · Dec 4, 2019 · b3814a5 · b3814a5
1 parent 05929c6
commit b3814a5
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 17 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,7 +10,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/MyApp/bin/Debug/netcoreapp2.1/MyApp.dll",
+            "program": "${workspaceFolder}/MyApp/bin/Debug/netcoreapp3.1/MyApp.dll",
             "args": [],
             "cwd": "${workspaceFolder}/MyApp",
             "console": "internalConsole",
@@ -25,7 +25,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/MyApp/bin/Debug/netcoreapp2.1/MyApp.dll",
+            "program": "${workspaceFolder}/MyApp/bin/Debug/netcoreapp3.1/MyApp.dll",
             "args": [],
             "cwd": "${workspaceFolder}/MyApp",
             "stopAtEntry": false,

diff --git a/MyApp.Tests/MyApp.Tests.csproj b/MyApp.Tests/MyApp.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <DebugType>portable</DebugType>
     <OutputType>Library</OutputType>
   </PropertyGroup>
@@ -10,9 +10,9 @@
     <ProjectReference Include="..\MyApp.ServiceInterface\MyApp.ServiceInterface.csproj" />
     <ProjectReference Include="..\MyApp.ServiceModel\MyApp.ServiceModel.csproj" />
 
-    <PackageReference Include="NUnit" Version="3.10.*" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.10.*" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.*" />
+    <PackageReference Include="NUnit" Version="3.12.*" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.15.*" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.*" />
     <PackageReference Include="ServiceStack" Version="5.*" />
     <PackageReference Include="ServiceStack.Kestrel" Version="5.*" />
   </ItemGroup>

diff --git a/MyApp/MyApp.csproj b/MyApp/MyApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <TypeScriptToolsVersion>2.8</TypeScriptToolsVersion>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
   </PropertyGroup>
@@ -11,7 +11,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="ServiceStack" Version="5.*" />
   </ItemGroup>
 

diff --git a/MyApp/Program.cs b/MyApp/Program.cs
@@ -7,6 +7,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
+using ServiceStack;
 
 namespace MyApp
 {
@@ -19,7 +20,7 @@ public static void Main(string[] args)
 
         public static IWebHost BuildWebHost(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>()
+                .UseModularStartup<Startup>()
                 .Build();
     }
 }
diff --git a/MyApp/Properties/launchSettings.json b/MyApp/Properties/launchSettings.json
@@ -3,7 +3,7 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:5000/;https://localhost:5001/",
+      "applicationUrl": "https://localhost:5001/",
       "sslPort": 0
     }
   },
@@ -21,7 +21,7 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "applicationUrl": "http://localhost:5000/;https://localhost:5001/"
+      "applicationUrl": "https://localhost:5001/"
     }
   }
 }
diff --git a/MyApp/Startup.cs b/MyApp/Startup.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Configuration;
 using Funq;
@@ -18,17 +19,14 @@ namespace MyApp
 {
     public class Startup : ModularStartup
     {
-        public Startup(IConfiguration configuration) 
-            : base(configuration, typeof(MyServices).Assembly) {}
-
         // This method gets called by the runtime. Use this method to add services to the container.
         // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
         public new 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, IHostingEnvironment env)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             if (env.IsDevelopment())
             {

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # parcel
 
-.NET Core 2.1 Parcel TypeScript Bootstrap App
+.NET Core 3.1 Parcel TypeScript Bootstrap App
 
 [![](https://raw.githubusercontent.com/ServiceStack/Assets/master/csharp-templates/parcel.png)](http://parcel.web-templates.io/)
 
@@ -95,5 +95,5 @@ When your App is ready to deploy, run the `publish` npm (or Gulp) script to pack
 
     $ npm run publish
 
-Which will create a production build of your App which then runs `dotnet publish -c Release` to Publish a Release build of your App in the `/bin/netcoreapp2.1/publish` folder which can then copied to remote server or an included in a Docker container to deploy your App.
+Which will create a production build of your App which then runs `dotnet publish -c Release` to Publish a Release build of your App in the `/bin/netcoreapp3.1/publish` folder which can then copied to remote server or an included in a Docker container to deploy your App.