From 2c2a8d1f4855532b4bbb0a0ac7c1638bb0b8aebc Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 11 Oct 2021 18:58:18 +0200 Subject: [PATCH 1/7] Update SDK to 6.0 RC2 --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 558a5d5d1c2cce..709e3af6ff8d43 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "6.0.100-rc.1.21430.12", + "version": "6.0.100-rc.2.21505.57", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.100-rc.1.21430.12" + "dotnet": "6.0.100-rc.2.21505.57" }, "native-tools": { "cmake": "3.16.4", From b9745dfac55f42318f39171604738eb2ce11051d Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 12 Oct 2021 19:43:55 +0200 Subject: [PATCH 2/7] Update global.json --- global.json | 1 + 1 file changed, 1 insertion(+) diff --git a/global.json b/global.json index 709e3af6ff8d43..9fad86c0816a8d 100644 --- a/global.json +++ b/global.json @@ -21,3 +21,4 @@ "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21517.1" } } + From 659b21243d71bf9ec6ba6256365738b35fd30605 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 12 Oct 2021 19:44:05 +0200 Subject: [PATCH 3/7] Update global.json --- global.json | 1 - 1 file changed, 1 deletion(-) diff --git a/global.json b/global.json index 9fad86c0816a8d..709e3af6ff8d43 100644 --- a/global.json +++ b/global.json @@ -21,4 +21,3 @@ "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21517.1" } } - From 9ad38ed6fc36b3696b95cac292e69b396c3164d7 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 21 Oct 2021 14:04:52 -0700 Subject: [PATCH 4/7] Disable targetting pack caching as we update the targetting pack during the build, which the cache doesn't support. --- eng/build.ps1 | 4 ++++ eng/build.sh | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/eng/build.ps1 b/eng/build.ps1 index a8e8a165d6bf9b..34f933baff3709 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -266,6 +266,10 @@ foreach ($argument in $PSBoundParameters.Keys) } } +# Disable targeting pack caching as reference a partially constructed targetting pack and update it later. +# The later changes are ignored when using the cache. +$env:DOTNETSDK_ALLOW_TARGETING_PACK_CACHING=0 + $failedBuilds = @() if ($os -eq "Browser") { diff --git a/eng/build.sh b/eng/build.sh index 1b20d7a922bc58..74cb77cc61f45f 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -468,6 +468,10 @@ fi initDistroRid $os $arch $crossBuild $portableBuild +# Disable targeting pack caching as reference a partially constructed targetting pack and update it later. +# The later changes are ignored when using the cache. +export DOTNETSDK_ALLOW_TARGETING_PACK_CACHING=0 + # URL-encode space (%20) to avoid quoting issues until the msbuild call in /eng/common/tools.sh. # In *proj files (XML docs), URL-encoded string are rendered in their decoded form. cmakeargs="${cmakeargs// /%20}" From 517e8dd1d107dda8be944478cd4ee9c9816fbf87 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 21 Oct 2021 14:20:04 -0700 Subject: [PATCH 5/7] Apply suggestions from code review Co-authored-by: Rainer Sigwald --- eng/build.ps1 | 2 +- eng/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/build.ps1 b/eng/build.ps1 index 34f933baff3709..5a91d3ec28fef3 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -266,7 +266,7 @@ foreach ($argument in $PSBoundParameters.Keys) } } -# Disable targeting pack caching as reference a partially constructed targetting pack and update it later. +# Disable targeting pack caching as we reference a partially constructed targeting pack and update it later. # The later changes are ignored when using the cache. $env:DOTNETSDK_ALLOW_TARGETING_PACK_CACHING=0 diff --git a/eng/build.sh b/eng/build.sh index 74cb77cc61f45f..b7e30ebef5d9cf 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -468,7 +468,7 @@ fi initDistroRid $os $arch $crossBuild $portableBuild -# Disable targeting pack caching as reference a partially constructed targetting pack and update it later. +# Disable targeting pack caching as we reference a partially constructed targeting pack and update it later. # The later changes are ignored when using the cache. export DOTNETSDK_ALLOW_TARGETING_PACK_CACHING=0 From 41379f08bb12bc09382ca01f5552b3a4dba1128d Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 22 Oct 2021 10:02:19 -0700 Subject: [PATCH 6/7] Update the compiler toolset package to match the version of the compiler included in the SDK. --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 97620413d572e8..8dc2b68cb62d17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,7 +53,7 @@ 4.0.0-4.final 7.0.0-preview1.21513.4 - 4.0.0-5.21453.15 + 4.0.0-5.21501.19 1.0.0-rc.2.21501.51 From 139c750f10ab2562b4f5fa4992ad32cde91b7ccb Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Tue, 2 Nov 2021 16:28:59 -0700 Subject: [PATCH 7/7] Disable crashing tests against new issue --- .../tests/HostActivation.Tests/NativeHosting/Nethost.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/installer/tests/HostActivation.Tests/NativeHosting/Nethost.cs b/src/installer/tests/HostActivation.Tests/NativeHosting/Nethost.cs index 9a90ad8125336c..792bf4faf6f8f6 100644 --- a/src/installer/tests/HostActivation.Tests/NativeHosting/Nethost.cs +++ b/src/installer/tests/HostActivation.Tests/NativeHosting/Nethost.cs @@ -89,6 +89,7 @@ public void GetHostFxrPath_DotNetRootParameter(bool explicitLoad, bool useAssemb } [Theory] + [ActiveIssue("https://github.com/dotnet/runtime/issues/61131", TestPlatforms.OSX)] [InlineData(true, false, true, false)] [InlineData(true, false, true, true)] [InlineData(true, false, false, false)] @@ -180,6 +181,7 @@ public void GetHostFxrPath_HostFxrAlreadyLoaded() } [Theory] + [ActiveIssue("https://github.com/dotnet/runtime/issues/61131", TestPlatforms.OSX)] [SkipOnPlatform(TestPlatforms.Windows, "This test targets the install_location config file which is only used on Linux and macOS.")] [InlineData("{0}", false, true)] [InlineData("{0}\n", false, true)] @@ -245,6 +247,7 @@ public void GetHostFxrPath_InstallLocationFile(string value, bool shouldUseArchS } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/61131", TestPlatforms.OSX)] [SkipOnPlatform(TestPlatforms.Windows, "This test targets the install_location config file which is only used on Linux and macOS.")] public void GetHostFxrPath_GlobalInstallation_HasNoDefaultInstallationPath() { @@ -275,6 +278,7 @@ public void GetHostFxrPath_GlobalInstallation_HasNoDefaultInstallationPath() } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/61131", TestPlatforms.OSX)] [SkipOnPlatform(TestPlatforms.Windows, "This test targets the install_location config file which is only used on Linux and macOS.")] public void GetHostFxrPath_GlobalInstallation_ArchitectureSpecificPathIsPickedOverDefaultPath() {