diff --git a/eng/build.ps1 b/eng/build.ps1 index a8e8a165d6bf9b..5a91d3ec28fef3 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -266,6 +266,10 @@ foreach ($argument in $PSBoundParameters.Keys) } } +# 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 + $failedBuilds = @() if ($os -eq "Browser") { diff --git a/eng/build.sh b/eng/build.sh index 1b20d7a922bc58..b7e30ebef5d9cf 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -468,6 +468,10 @@ fi initDistroRid $os $arch $crossBuild $portableBuild +# 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 + # 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}" diff --git a/global.json b/global.json index 2db26fc52d3d28..8317e5cd3172db 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", 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() {