From 301f6290320a8926b3d9b1e9dbbfa256f5148592 Mon Sep 17 00:00:00 2001
From: Tanner Gooding <tagoo@outlook.com>
Date: Sun, 11 Jul 2021 09:32:03 -0700
Subject: [PATCH] Adding support for net6.0 and linking/trimming

---
 Directory.Build.props                           |  4 ++--
 Directory.Build.targets                         | 17 ++++++++++++++---
 scripts/build.ps1                               |  1 +
 scripts/build.sh                                |  1 +
 .../Mimalloc/TerraFX.Interop.Mimalloc.csproj    |  2 +-
 .../TerraFX.Interop.Mimalloc.UnitTests.csproj   |  2 +-
 6 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index b32bc6f..b6771f3 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -42,8 +42,8 @@
     <ContinuousIntegrationBuild Condition="'$(GITHUB_RUN_ID)' != ''">true</ContinuousIntegrationBuild>
     <PackageOutputPath>$(BaseArtifactsPath)pkg/$(Configuration)/</PackageOutputPath>
     <Product>TerraFX.Interop.Mimalloc</Product>
-    <VersionPrefix>1.6</VersionPrefix>
-    <VersionSuffix>beta1</VersionSuffix>
+    <VersionPrefix>1.6.0</VersionPrefix>
+    <VersionSuffix>beta2</VersionSuffix>
     <VersionSuffix Condition="'$(GITHUB_EVENT_NAME)' == 'pull_request'">pr</VersionSuffix>
   </PropertyGroup>
 
diff --git a/Directory.Build.targets b/Directory.Build.targets
index c643db2..7104860 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -21,12 +21,23 @@
     <PackageVersion Condition="'$(EXCLUDE_RUN_ID_FROM_PACKAGE)' == ''">$(Version)-$(GITHUB_RUN_ID)</PackageVersion>
   </PropertyGroup>
 
+  <!-- Settings that are only set for executables -->
+  <PropertyGroup Condition="'$(OutputType)' != 'Library'">
+    <PublishTrimmed>true</PublishTrimmed>
+  </PropertyGroup>
+
+  <!-- Settings that are only set for libraries -->
+  <PropertyGroup Condition="'$(OutputType)' == 'Library'">
+    <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+    <IsTrimmable>true</IsTrimmable>
+  </PropertyGroup>
+
   <!-- Package versions for package references across all projects -->
   <ItemGroup>
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" />
-    <PackageReference Update="NUnit" Version="3.13.1" />
-    <PackageReference Update="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Update="NUnit" Version="3.13.2" />
+    <PackageReference Update="NUnit3TestAdapter" Version="4.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/scripts/build.ps1 b/scripts/build.ps1
index 9407dcf..6ae9475 100644
--- a/scripts/build.ps1
+++ b/scripts/build.ps1
@@ -121,6 +121,7 @@ try {
     Create-Directory -Path $DotNetInstallDirectory
 
     & $DotNetInstallScript -Channel 5.0 -Version latest -InstallDir $DotNetInstallDirectory -Architecture $architecture
+    & $DotNetInstallScript -Channel 6.0 -Version latest -InstallDir $DotNetInstallDirectory -Architecture $architecture
 
     $env:PATH="$DotNetInstallDirectory;$env:PATH"
   }
diff --git a/scripts/build.sh b/scripts/build.sh
index 63b298d..0bb00b6 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -222,6 +222,7 @@ if [[ ! -z "$architecture" ]]; then
   CreateDirectory "$DotNetInstallDirectory"
 
   . "$DotNetInstallScript" --channel 5.0 --version latest --install-dir "$DotNetInstallDirectory" --architecture "$architecture"
+  . "$DotNetInstallScript" --channel 6.0 --version latest --install-dir "$DotNetInstallDirectory" --architecture "$architecture"
 
   PATH="$DotNetInstallDirectory:$PATH:"
 fi
diff --git a/sources/Interop/Mimalloc/TerraFX.Interop.Mimalloc.csproj b/sources/Interop/Mimalloc/TerraFX.Interop.Mimalloc.csproj
index cf6e798..75ea898 100644
--- a/sources/Interop/Mimalloc/TerraFX.Interop.Mimalloc.csproj
+++ b/sources/Interop/Mimalloc/TerraFX.Interop.Mimalloc.csproj
@@ -5,7 +5,7 @@
   <PropertyGroup>
     <NoWarn>1591;$(NoWarn)</NoWarn>
     <RootNamespace>TerraFX.Interop</RootNamespace>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
 </Project>
diff --git a/tests/Interop/Mimalloc/TerraFX.Interop.Mimalloc.UnitTests.csproj b/tests/Interop/Mimalloc/TerraFX.Interop.Mimalloc.UnitTests.csproj
index fff8196..9bf0f6b 100644
--- a/tests/Interop/Mimalloc/TerraFX.Interop.Mimalloc.UnitTests.csproj
+++ b/tests/Interop/Mimalloc/TerraFX.Interop.Mimalloc.UnitTests.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <RootNamespace>TerraFX.Interop.UnitTests</RootNamespace>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>