Merge pull request #21 from tannergooding/main

Updating dependencies to their latest versions
terrafx · Aug 2, 2023 · e2dbdee · e2dbdee
2 parents e8eb345 + 664d992
commit e2dbdee
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 20 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -21,6 +21,9 @@ end_of_line = lf
 insert_final_newline = true
 indent_style = space
 indent_size = 4
+spelling_error_severity = information
+spelling_exclusion_path = exclusion.dic
+spelling_languages = en-us
 tab_width = 4
 trim_trailing_whitespace = true
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -20,7 +20,7 @@
   <!-- Default settings that explicitly differ from the Sdk.props defaults  -->
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <AnalysisLevel>preview</AnalysisLevel>
+    <AnalysisLevel>preview-all</AnalysisLevel>
     <BaseIntermediateOutputPath>$(BaseArtifactsPath)obj/$(BaseArtifactsPathSuffix)/</BaseIntermediateOutputPath>
     <DebugType>embedded</DebugType>
     <EnableDefaultNoneItems>false</EnableDefaultNoneItems>
@@ -42,7 +42,12 @@
     <BaseOutputPath>$(BaseArtifactsPath)bin/$(BaseArtifactsPathSuffix)/</BaseOutputPath>
     <Company>TerraFX</Company>
     <ContinuousIntegrationBuild Condition="'$(GITHUB_RUN_ID)' != ''">true</ContinuousIntegrationBuild>
+    <EnableAotAnalyzer>true</EnableAotAnalyzer>
+    <EnableSingleFileAnalyzer>true</EnableSingleFileAnalyzer>
+    <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <PackageOutputPath>$(BaseArtifactsPath)pkg/$(Configuration)/</PackageOutputPath>
+    <PackageValidationBaselineVersion>1.6.7</PackageValidationBaselineVersion>
     <Product>TerraFX.Interop.Mimalloc</Product>
     <RootNamespace>TerraFX.Interop</RootNamespace>
     <VersionPrefix>1.6.7</VersionPrefix>
@@ -59,7 +64,7 @@
     <Features>strict</Features>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <HighEntropyVA>true</HighEntropyVA>
-    <LangVersion>latest</LangVersion>
+    <LangVersion>preview</LangVersion>
     <MinClientVersion>4.3</MinClientVersion>
     <NeutralLanguage>en-US</NeutralLanguage>
     <OverwriteReadOnlyFiles>true</OverwriteReadOnlyFiles>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -12,11 +12,10 @@
 
   <!-- Package versions for package references across all projects -->
   <ItemGroup>
-    <PackageVersion Include="BenchmarkDotNet" Version="0.13.2" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    <PackageVersion Include="BenchmarkDotNet" Version="0.13.6" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
     <PackageVersion Include="NUnit" Version="3.13.3" />
-    <PackageVersion Include="NUnit3TestAdapter" Version="4.2.1" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 
 </Project>
diff --git a/TerraFX.Interop.Mimalloc.sln b/TerraFX.Interop.Mimalloc.sln
@@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".root", ".root", "{2F337CB6
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		Directory.Packages.props = Directory.Packages.props
+		exclusion.dic = exclusion.dic
 		global.json = global.json
 		LICENSE.md = LICENSE.md
 		NuGet.config = NuGet.config

diff --git a/benchmarks/Interop/Mimalloc/Bench.cs b/benchmarks/Interop/Mimalloc/Bench.cs
@@ -54,7 +54,7 @@ public void TestAllocHGlobal()
         {
             var p = (byte*)Marshal.AllocHGlobal(Size);
             Consume(&p);
-            Marshal.FreeHGlobal((System.IntPtr)p);
+            Marshal.FreeHGlobal((nint)p);
         }
     }
 

diff --git a/benchmarks/Interop/Mimalloc/TerraFX.Interop.Mimalloc.Benchmarks.csproj b/benchmarks/Interop/Mimalloc/TerraFX.Interop.Mimalloc.Benchmarks.csproj
@@ -5,7 +5,7 @@
   <PropertyGroup>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <RootNamespace>TerraFX.Interop.Benchmarks</RootNamespace>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/exclusion.dic b/exclusion.dic
diff --git a/global.json b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "7.0.100",
-    "allowPrerelease": false,
+    "version": "8.0.100-preview",
+    "allowPrerelease": true,
     "rollForward": "latestFeature"
   }
 }
diff --git a/scripts/build.ps1 b/scripts/build.ps1
@@ -120,8 +120,9 @@ try {
     $DotNetInstallDirectory = Join-Path -Path $ArtifactsDir -ChildPath "dotnet"
     Create-Directory -Path $DotNetInstallDirectory
 
-    & $DotNetInstallScript -Channel 6.0 -Version latest -InstallDir $DotNetInstallDirectory -Architecture $architecture
-    & $DotNetInstallScript -Channel 7.0 -Version latest -InstallDir $DotNetInstallDirectory -Architecture $architecture
+    & $DotNetInstallScript -Channel 8.0 -Version latest -InstallDir $DotNetInstallDirectory -Architecture $architecture
+    & $DotNetInstallScript -Channel 7.0 -Version latest -InstallDir $DotNetInstallDirectory -Architecture $architecture -Runtime dotnet
+    & $DotNetInstallScript -Channel 6.0 -Version latest -InstallDir $DotNetInstallDirectory -Architecture $architecture -Runtime dotnet
 
     $env:PATH="$DotNetInstallDirectory;$env:PATH"
   }

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -221,8 +221,9 @@ if [[ ! -z "$architecture" ]]; then
   DotNetInstallDirectory="$ArtifactsDir/dotnet"
   CreateDirectory "$DotNetInstallDirectory"
 
-  . "$DotNetInstallScript" --channel 6.0 --version latest --install-dir "$DotNetInstallDirectory" --architecture "$architecture"
-  . "$DotNetInstallScript" --channel 7.0 --version latest --install-dir "$DotNetInstallDirectory" --architecture "$architecture"
+  . "$DotNetInstallScript" --channel 8.0 --version latest --install-dir "$DotNetInstallDirectory" --architecture "$architecture"
+  . "$DotNetInstallScript" --channel 7.0 --version latest --install-dir "$DotNetInstallDirectory" --architecture "$architecture" --runtime dotnet
+  . "$DotNetInstallScript" --channel 6.0 --version latest --install-dir "$DotNetInstallDirectory" --architecture "$architecture" --runtime dotnet
 
   PATH="$DotNetInstallDirectory:$PATH:"
 fi

diff --git a/sources/Directory.Build.props b/sources/Directory.Build.props
@@ -12,6 +12,7 @@
 
   <PropertyGroup>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <EnablePackageValidation>true</EnablePackageValidation>
     <TerraFXProjectCategory>sources</TerraFXProjectCategory>
   </PropertyGroup>
 
@@ -21,8 +22,4 @@
     <InternalsVisibleTo Include="$(MSBuildProjectName).UnitTests" Key="$(AssemblyOriginatorPublicKey)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="all" />
-  </ItemGroup>
-
 </Project>
diff --git a/sources/Interop/Mimalloc/TerraFX.Interop.Mimalloc.csproj b/sources/Interop/Mimalloc/TerraFX.Interop.Mimalloc.csproj
@@ -5,7 +5,7 @@
   <PropertyGroup>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <RootNamespace>TerraFX.Interop</RootNamespace>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.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
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <RootNamespace>TerraFX.Interop.UnitTests</RootNamespace>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>