From 664d99298ea509298d20b11fc4564a1c44735208 Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Tue, 25 Jul 2023 20:04:42 -0700 Subject: [PATCH] Updating dependencies to their latest versions --- .editorconfig | 3 +++ Directory.Build.props | 9 +++++++-- Directory.Packages.props | 7 +++---- TerraFX.Interop.Mimalloc.sln | 1 + benchmarks/Interop/Mimalloc/Bench.cs | 2 +- .../Mimalloc/TerraFX.Interop.Mimalloc.Benchmarks.csproj | 2 +- exclusion.dic | 0 global.json | 4 ++-- scripts/build.ps1 | 5 +++-- scripts/build.sh | 5 +++-- sources/Directory.Build.props | 5 +---- sources/Interop/Mimalloc/TerraFX.Interop.Mimalloc.csproj | 2 +- .../Mimalloc/TerraFX.Interop.Mimalloc.UnitTests.csproj | 2 +- 13 files changed, 27 insertions(+), 20 deletions(-) create mode 100644 exclusion.dic diff --git a/.editorconfig b/.editorconfig index 61ea459..22f348a 100644 --- 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 index ffd5168..0472886 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -20,7 +20,7 @@ true - preview + preview-all $(BaseArtifactsPath)obj/$(BaseArtifactsPathSuffix)/ embedded false @@ -42,7 +42,12 @@ $(BaseArtifactsPath)bin/$(BaseArtifactsPathSuffix)/ TerraFX true + true + true + true + true $(BaseArtifactsPath)pkg/$(Configuration)/ + 1.6.7 TerraFX.Interop.Mimalloc TerraFX.Interop 1.6.7 @@ -59,7 +64,7 @@ strict true true - latest + preview 4.3 en-US true diff --git a/Directory.Packages.props b/Directory.Packages.props index f2c570f..f123eb9 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -12,11 +12,10 @@ - - - + + - + diff --git a/TerraFX.Interop.Mimalloc.sln b/TerraFX.Interop.Mimalloc.sln index 4eabf07..c527b05 100644 --- 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 index e277dba..41c1157 100644 --- 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 index d5f869f..841298c 100644 --- a/benchmarks/Interop/Mimalloc/TerraFX.Interop.Mimalloc.Benchmarks.csproj +++ b/benchmarks/Interop/Mimalloc/TerraFX.Interop.Mimalloc.Benchmarks.csproj @@ -5,7 +5,7 @@ $(NoWarn);CS1591 TerraFX.Interop.Benchmarks - net6.0;net7.0 + net8.0;net7.0;net6.0 diff --git a/exclusion.dic b/exclusion.dic new file mode 100644 index 0000000..e69de29 diff --git a/global.json b/global.json index f5cfe25..d8833ad 100644 --- 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 index b878aa1..1a491b8 100644 --- 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 index 846e64c..4dcd027 100755 --- 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 index 9ff0fdc..d8a3f66 100644 --- a/sources/Directory.Build.props +++ b/sources/Directory.Build.props @@ -12,6 +12,7 @@ true + true sources @@ -21,8 +22,4 @@ - - - - diff --git a/sources/Interop/Mimalloc/TerraFX.Interop.Mimalloc.csproj b/sources/Interop/Mimalloc/TerraFX.Interop.Mimalloc.csproj index b144521..bd837f4 100644 --- a/sources/Interop/Mimalloc/TerraFX.Interop.Mimalloc.csproj +++ b/sources/Interop/Mimalloc/TerraFX.Interop.Mimalloc.csproj @@ -5,7 +5,7 @@ $(NoWarn);CS1591 TerraFX.Interop - net6.0;net7.0 + net8.0;net7.0;net6.0 diff --git a/tests/Interop/Mimalloc/TerraFX.Interop.Mimalloc.UnitTests.csproj b/tests/Interop/Mimalloc/TerraFX.Interop.Mimalloc.UnitTests.csproj index 694c409..b56190f 100644 --- a/tests/Interop/Mimalloc/TerraFX.Interop.Mimalloc.UnitTests.csproj +++ b/tests/Interop/Mimalloc/TerraFX.Interop.Mimalloc.UnitTests.csproj @@ -4,7 +4,7 @@ TerraFX.Interop.UnitTests - net6.0;net7.0 + net8.0;net7.0;net6.0