Upgraded packages to use .NET 5.0 (#249)

niemyjski · web-flow · commit 1275e46480ed · 2021-03-20T15:03:58.000-05:00
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
@@ -13,7 +13,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.401
+        dotnet-version: 5.0.201
     - name: Build Reason
       run: "echo ref: ${{github.ref}} event: ${{github.event_name}}"
     - name: Build Version
diff --git a/.github/workflows/build-osx.yml b/.github/workflows/build-osx.yml
@@ -13,7 +13,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.401
+        dotnet-version: 5.0.201
     - name: Build Reason
       run: "echo ref: ${{github.ref}} event: ${{github.event_name}}"
     - name: Build Version
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -13,7 +13,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.401
+        dotnet-version: 5.0.201
     - name: Build Reason
       run: "echo ref: ${{github.ref}} event: ${{github.event_name}}"
     - name: Build Version
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,7 +6,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "Build",
-      "program": "${workspaceRoot}/samples/Exceptionless.SampleConsole/bin/Debug/netcoreapp3.1/Exceptionless.SampleConsole.dll",
+      "program": "${workspaceRoot}/samples/Exceptionless.SampleConsole/bin/Debug/net5.0/Exceptionless.SampleConsole.dll",
       "args": [],
       "cwd": "${workspaceRoot}/samples/Exceptionless.SampleConsole",
       "stopAtEntry": false,
@@ -20,7 +20,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "Build",
-      "program": "${workspaceRoot}/samples/Exceptionless.SampleAspNetCore/bin/Debug/netcoreapp3.1/Exceptionless.SampleAspNetCore.dll",
+      "program": "${workspaceRoot}/samples/Exceptionless.SampleAspNetCore/bin/Debug/net5.0/Exceptionless.SampleAspNetCore.dll",
       "args": [],
       "cwd": "${workspaceRoot}/samples/Exceptionless.SampleAspNetCore",
       "stopAtEntry": false,
diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ editor design surfaces are available.
 
 1. You will need to install:
    1. [Visual Studio 2019](https://visualstudio.microsoft.com/vs/community/)
-   2. [.NET Core 3.1 SDK with VS Tooling](https://dotnet.microsoft.com/download)
+   2. [.NET Core 5.x SDK with VS Tooling](https://dotnet.microsoft.com/download)
    3. [.NET Framework 4.6.2 Developer Pack](https://dotnet.microsoft.com/download/dotnet-framework/net462)
 2. Open the `Exceptionless.Net.sln` Visual Studio solution file.
 3. Select `Exceptionless.SampleConsole` as the startup project.
@@ -44,7 +44,7 @@ build windows specific packages.
 
 1. You will need to install:
    1. [Visual Studio Code](https://code.visualstudio.com)
-   2. [.NET Core 3.1 SDK with VS Tooling](https://dotnet.microsoft.com/download)
+   2. [.NET Core 5.x SDK with VS Tooling](https://dotnet.microsoft.com/download)
 2. Open the cloned Exceptionless.Net folder.
 3. Run the `Exceptionless.SampleConsole` project by pressing `F5` to start the console.
 
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "3.1.100",
+    "version": "5.0.100",
     "rollForward": "latestMinor"
   }
-}
+}
diff --git a/samples/Exceptionless.SampleAspNetCore/Exceptionless.SampleAspNetCore.csproj b/samples/Exceptionless.SampleAspNetCore/Exceptionless.SampleAspNetCore.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/Exceptionless.SampleConsole/Exceptionless.SampleConsole.csproj b/samples/Exceptionless.SampleConsole/Exceptionless.SampleConsole.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyName>Exceptionless.SampleConsole</AssemblyName>
     <OutputType>Exe</OutputType>
     <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_0</DefineConstants>
diff --git a/samples/Exceptionless.SampleHosting/Exceptionless.SampleHosting.csproj b/samples/Exceptionless.SampleHosting/Exceptionless.SampleHosting.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/Exceptionless.SampleLambda/Exceptionless.SampleLambda.csproj b/samples/Exceptionless.SampleLambda/Exceptionless.SampleLambda.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <LangVersion>latest</LangVersion>
     <AWSProjectType>Lambda</AWSProjectType>
diff --git a/samples/Exceptionless.SampleLambda/aws-lambda-tools-defaults.json b/samples/Exceptionless.SampleLambda/aws-lambda-tools-defaults.json
@@ -8,7 +8,7 @@
   "profile": "",
   "region": "",
   "configuration": "Release",
-  "framework": "netcoreapp3.1",
+  "framework": "net5.0",
   "function-runtime": "dotnetcore3.1",
   "function-memory-size": 256,
   "function-timeout": 30,
diff --git a/samples/Exceptionless.SampleLambdaAspNetCore/Exceptionless.SampleLambdaAspNetCore.csproj b/samples/Exceptionless.SampleLambdaAspNetCore/Exceptionless.SampleLambdaAspNetCore.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <AWSProjectType>Lambda</AWSProjectType>
   </PropertyGroup>
diff --git a/samples/Exceptionless.SampleLambdaAspNetCore/aws-lambda-tools-defaults.json b/samples/Exceptionless.SampleLambdaAspNetCore/aws-lambda-tools-defaults.json
@@ -8,7 +8,7 @@
   "profile": "",
   "region": "",
   "configuration": "Release",
-  "framework": "netcoreapp3.1",
+  "framework": "net5.0",
   "function-runtime": "dotnetcore3.1",
   "function-memory-size": 256,
   "function-timeout": 30,
diff --git a/samples/Exceptionless.SampleWindows/Exceptionless.SampleWindows.csproj b/samples/Exceptionless.SampleWindows/Exceptionless.SampleWindows.csproj
@@ -1,9 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-  <PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
-    <TargetFrameworks>netcoreapp3.1;net462</TargetFrameworks>
+  <PropertyGroup>
+    <TargetFrameworks>net5.0-windows;net462</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -13,7 +10,7 @@
     <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' " Label="Build">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0-windows' " Label="Build">
     <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 
diff --git a/samples/Exceptionless.SampleWpf/Exceptionless.SampleWpf.csproj b/samples/Exceptionless.SampleWpf/Exceptionless.SampleWpf.csproj
@@ -1,18 +1,16 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-  <PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' "> 
-    <TargetFrameworks>netcoreapp3.1;net462</TargetFrameworks>
+
+  <PropertyGroup>
+    <TargetFrameworks>net5.0-windows;net462</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <UseWPF>true</UseWPF>
     <RootNamespace>Exceptionless</RootNamespace>
   </PropertyGroup>
-  
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' " Label="Build">
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0-windows' " Label="Build">
     <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 
diff --git a/src/Platforms/Exceptionless.Windows/Exceptionless.Windows.csproj b/src/Platforms/Exceptionless.Windows/Exceptionless.Windows.csproj
@@ -1,11 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <Import Project="..\..\..\build\common.props" />
 
-  <PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
-    <TargetFrameworks>netcoreapp3.1;net462</TargetFrameworks>
+  <PropertyGroup>
+    <TargetFrameworks>net5.0-windows;net462</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Label="Package">
@@ -35,7 +32,7 @@
     <ProjectReference Include="..\..\Exceptionless\Exceptionless.csproj" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' " Label="Build">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0-windows' " Label="Build">
     <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 
diff --git a/src/Platforms/Exceptionless.Wpf/Exceptionless.Wpf.csproj b/src/Platforms/Exceptionless.Wpf/Exceptionless.Wpf.csproj
@@ -1,11 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <Import Project="..\..\..\build\common.props" />
 
-  <PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
-    <TargetFrameworks>netcoreapp3.1;net462</TargetFrameworks>
+  <PropertyGroup>
+    <TargetFrameworks>net5.0-windows;net462</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Label="Package">
@@ -35,7 +32,7 @@
     <ProjectReference Include="..\..\Exceptionless\Exceptionless.csproj" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' " Label="Build">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0-windows' " Label="Build">
     <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 
diff --git a/test/Exceptionless.MessagePack.Tests/Exceptionless.MessagePack.Tests.csproj b/test/Exceptionless.MessagePack.Tests/Exceptionless.MessagePack.Tests.csproj
@@ -2,10 +2,10 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
-    <TargetFrameworks>netcoreapp3.1;net462</TargetFrameworks>
+    <TargetFrameworks>net5.0;net462</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -30,7 +30,7 @@
     <ProjectReference Include="..\Exceptionless.TestHarness\Exceptionless.TestHarness.csproj" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' " Label="Build">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0' " Label="Build">
     <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 
diff --git a/test/Exceptionless.Tests/Exceptionless.Tests.csproj b/test/Exceptionless.Tests/Exceptionless.Tests.csproj
@@ -2,10 +2,10 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
-    <TargetFrameworks>netcoreapp3.1;net462</TargetFrameworks>
+    <TargetFrameworks>net5.0;net462</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -19,7 +19,7 @@
     <None Include="app.config" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' " Label="Build">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0' " Label="Build">
     <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "3.1.100",`
	`3`	`+ "version": "5.0.100",`
`4`	`4`	`"rollForward": "latestMinor"`
`5`	`5`	`}`
`6`		`-}`
	`6`	`+}`