add explicit net6 target (#1703)

* add explicit net6 target * Update global.json * Update BuildNativeUWP.ps1 * Update BuildNativeUWP.ps1 * remove uwp
serilog · Jul 25, 2022 · 45386bb · 45386bb
1 parent 81e9dee
commit 45386bb
Show file tree

Hide file tree

Showing 21 changed files with 12 additions and 379 deletions.
diff --git a/BuildNativeUWP.ps1 b/BuildNativeUWP.ps1
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,13 +1,12 @@
 version: '{build}'
 skip_tags: true
 image:
-  - Visual Studio 2019
+  - Visual Studio 2022
   - Ubuntu
 configuration: Release
 test: off
 build_script:
   - ps: ./Build.ps1
-  - ps: ./BuildNativeUWP.ps1
 for:
 -
   matrix:

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.202",
+    "version": "6.0.300",
     "allowPrerelease": false,
     "rollForward": "latestFeature"
   }

diff --git a/src/Serilog/Serilog.csproj b/src/Serilog/Serilog.csproj
@@ -3,7 +3,7 @@
     <Description>Simple .NET logging with fully-structured events</Description>
     <VersionPrefix>2.11.1</VersionPrefix>
     <Authors>Serilog Contributors</Authors>
-    <TargetFrameworks>netstandard2.1;netstandard2.0;netstandard1.3;netstandard1.0;net45;net46;net5.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netstandard2.0;netstandard1.3;netstandard1.0;net45;net46;net5.0;net6.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Serilog</AssemblyName>
     <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
@@ -45,6 +45,10 @@
     <DefineConstants>$(DefineConstants);ASYNCLOCAL;HASHTABLE;FEATURE_DEFAULT_INTERFACE;FEATURE_SPAN</DefineConstants>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <DefineConstants>$(DefineConstants);ASYNCLOCAL;HASHTABLE;FEATURE_DEFAULT_INTERFACE;FEATURE_SPAN</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
     <PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
   </ItemGroup>

diff --git a/test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj b/test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>Serilog.PerformanceTests</AssemblyName>
     <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>

diff --git a/test/Serilog.Tests/Serilog.Tests.csproj b/test/Serilog.Tests/Serilog.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1;net452;net46</TargetFrameworks>
+    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netcoreapp2.1;net452;net46</TargetFrameworks>
     <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
@@ -39,4 +39,7 @@
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
     <DefineConstants>$(DefineConstants);ASYNCLOCAL;FEATURE_DEFAULT_INTERFACE;FEATURE_SPAN</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <DefineConstants>$(DefineConstants);ASYNCLOCAL;FEATURE_DEFAULT_INTERFACE;FEATURE_SPAN</DefineConstants>
+  </PropertyGroup>
 </Project>
diff --git a/test/Serilog.UwpTests/Assets/LockScreenLogo.scale-200.png b/test/Serilog.UwpTests/Assets/LockScreenLogo.scale-200.png
diff --git a/test/Serilog.UwpTests/Assets/SplashScreen.scale-200.png b/test/Serilog.UwpTests/Assets/SplashScreen.scale-200.png
diff --git a/test/Serilog.UwpTests/Assets/Square150x150Logo.scale-200.png b/test/Serilog.UwpTests/Assets/Square150x150Logo.scale-200.png
diff --git a/test/Serilog.UwpTests/Assets/Square44x44Logo.scale-200.png b/test/Serilog.UwpTests/Assets/Square44x44Logo.scale-200.png
diff --git a/test/Serilog.UwpTests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/test/Serilog.UwpTests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/test/Serilog.UwpTests/Assets/StoreLogo.png b/test/Serilog.UwpTests/Assets/StoreLogo.png
diff --git a/test/Serilog.UwpTests/Assets/Wide310x150Logo.scale-200.png b/test/Serilog.UwpTests/Assets/Wide310x150Logo.scale-200.png
diff --git a/test/Serilog.UwpTests/Package.appxmanifest b/test/Serilog.UwpTests/Package.appxmanifest
diff --git a/test/Serilog.UwpTests/Properties/AssemblyInfo.cs b/test/Serilog.UwpTests/Properties/AssemblyInfo.cs
diff --git a/test/Serilog.UwpTests/Properties/UnitTestApp.rd.xml b/test/Serilog.UwpTests/Properties/UnitTestApp.rd.xml
diff --git a/test/Serilog.UwpTests/Serilog.UwpTests.csproj b/test/Serilog.UwpTests/Serilog.UwpTests.csproj
diff --git a/test/Serilog.UwpTests/Serilog.UwpTests_TemporaryKey.pfx b/test/Serilog.UwpTests/Serilog.UwpTests_TemporaryKey.pfx
diff --git a/test/Serilog.UwpTests/UnitTest.cs b/test/Serilog.UwpTests/UnitTest.cs
diff --git a/test/Serilog.UwpTests/UnitTestApp.xaml b/test/Serilog.UwpTests/UnitTestApp.xaml