Skip to content
Permalink
Browse files

Upgrade to .NET Core 3.1 LTS

  • Loading branch information
mythz committed Dec 4, 2019
1 parent 925272b commit 32ce1a9cdd806d723ffa22407bc6a872256e3c51
Showing with 13 additions and 15 deletions.
  1. +2 −2 .vscode/launch.json
  2. +4 −4 MyApp.Tests/MyApp.Tests.csproj
  3. +1 −2 MyApp/MyApp.csproj
  4. +2 −1 MyApp/Program.cs
  5. +2 −4 MyApp/Startup.cs
  6. +2 −2 README.md
@@ -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,
@@ -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>
@@ -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>

@@ -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();
}
}
@@ -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())
{
@@ -1,6 +1,6 @@
# angular-spa

.NET Core 2.1 Angular 8 project generated with [Angular CLI](https://github.com/angular/angular-spa).
.NET Core 3.1 Angular 8 project generated with [Angular CLI](https://github.com/angular/angular-spa).

[![](https://raw.githubusercontent.com/ServiceStack/Assets/master/csharp-templates/angular-spa.png)](http://angular-spa.web-templates.io/)

@@ -46,7 +46,7 @@ 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.

### Testing

0 comments on commit 32ce1a9

Please sign in to comment.
You can’t perform that action at this time.