From c831ba555142d2a008ee1580e16477ff085c5236 Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Fri, 7 Jan 2022 19:21:37 -0800 Subject: [PATCH] Moving forward to .NET 6 --- scripts/build.ps1 | 3 +-- scripts/build.sh | 3 +-- sources/LLVMSharp.Interop/LLVMSharp.Interop.csproj | 2 +- sources/LLVMSharp/LLVMSharp.csproj | 2 +- tests/LLVMSharp.UnitTests/LLVMSharp.UnitTests.csproj | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/scripts/build.ps1 b/scripts/build.ps1 index 9e68ebd..0f4329a 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -123,8 +123,7 @@ try { $DotNetInstallDirectory = Join-Path -Path $ArtifactsDir -ChildPath "dotnet" Create-Directory -Path $DotNetInstallDirectory - & $DotNetInstallScript -Channel 5.0 -Version latest -InstallDir $DotNetInstallDirectory -Architecture $architecture - & $DotNetInstallScript -Channel 3.1 -Version latest -InstallDir $DotNetInstallDirectory -Architecture $architecture -Runtime dotnet + & $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 a49523b..8b789ce 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -204,8 +204,7 @@ if [[ ! -z "$architecture" ]]; then DotNetInstallDirectory="$ArtifactsDir/dotnet" CreateDirectory "$DotNetInstallDirectory" - . "$DotNetInstallScript" --channel 5.0 --version latest --install-dir "$DotNetInstallDirectory" --architecture "$architecture" - . "$DotNetInstallScript" --channel 3.1 --version latest --install-dir "$DotNetInstallDirectory" --architecture "$architecture" --runtime dotnet + . "$DotNetInstallScript" --channel 6.0 --version latest --install-dir "$DotNetInstallDirectory" --architecture "$architecture" PATH="$DotNetInstallDirectory:$PATH:" fi diff --git a/sources/LLVMSharp.Interop/LLVMSharp.Interop.csproj b/sources/LLVMSharp.Interop/LLVMSharp.Interop.csproj index b0a6ad8..98a8a66 100644 --- a/sources/LLVMSharp.Interop/LLVMSharp.Interop.csproj +++ b/sources/LLVMSharp.Interop/LLVMSharp.Interop.csproj @@ -2,7 +2,7 @@ - net5.0;netcoreapp3.1;netstandard2.0 + net6.0;netstandard2.0 diff --git a/sources/LLVMSharp/LLVMSharp.csproj b/sources/LLVMSharp/LLVMSharp.csproj index 0e04df2..4c2be5d 100644 --- a/sources/LLVMSharp/LLVMSharp.csproj +++ b/sources/LLVMSharp/LLVMSharp.csproj @@ -3,7 +3,7 @@ false - net5.0;netcoreapp3.1;netstandard2.0 + net6.0;netstandard2.0 diff --git a/tests/LLVMSharp.UnitTests/LLVMSharp.UnitTests.csproj b/tests/LLVMSharp.UnitTests/LLVMSharp.UnitTests.csproj index 3286cc4..910741f 100644 --- a/tests/LLVMSharp.UnitTests/LLVMSharp.UnitTests.csproj +++ b/tests/LLVMSharp.UnitTests/LLVMSharp.UnitTests.csproj @@ -2,7 +2,7 @@ - net5.0;netcoreapp3.1 + net6.0