diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9f3926e5..ddb944084 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,23 +197,23 @@ - + https://github.com/dotnet/arcade - 2e24ed0bdbd4e3b42c296503955c837bb0b08372 + 4000024394df3049886c50e54ad0a2b903221ef0 - + https://github.com/dotnet/arcade - 2e24ed0bdbd4e3b42c296503955c837bb0b08372 + 4000024394df3049886c50e54ad0a2b903221ef0 - + https://github.com/dotnet/arcade - 2e24ed0bdbd4e3b42c296503955c837bb0b08372 + 4000024394df3049886c50e54ad0a2b903221ef0 - + https://github.com/dotnet/source-build-reference-packages - 5d865ff0971f712b52cf1dd7d3e98ff4c0ff5759 + 3147e7ae7ba3ba499d4a2d18c8a4d89bab6769d0 @@ -221,9 +221,9 @@ 00accce73f32b91a59d3be28c1f6993c3cd4df3e - + https://github.com/dotnet/xliff-tasks - c52e008e5cfd83344739acb2f6d5ef4586f4b426 + 8af700a39b25c7c01185e7140795cb80dbb48cf1 diff --git a/eng/Versions.props b/eng/Versions.props index 8818c6be0..67cbaf661 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0-beta.22213.2 + 7.0.0-beta.22215.2 diff --git a/global.json b/global.json index ea8129514..5e2640914 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22213.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22213.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22215.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22215.2" } } diff --git a/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch b/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch new file mode 100644 index 000000000..f7d7668dc --- /dev/null +++ b/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Wed, 13 Apr 2022 21:30:39 +0000 +Subject: [PATCH] Condition out the BannedApiAnalyzers usage in source-build + +Removes prebuilt. +Patch for https://github.com/dotnet/linker/pull/2742 +--- + src/linker/Mono.Linker.csproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/linker/Mono.Linker.csproj b/src/linker/Mono.Linker.csproj +index 391300aa..d276003e 100644 +--- a/src/linker/Mono.Linker.csproj ++++ b/src/linker/Mono.Linker.csproj +@@ -31,7 +31,7 @@ + + + +- ++ + runtime; build; native; contentfiles; analyzers; buildtransitive + all + diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index c8237e87d..b99346824 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -176,9 +176,7 @@ $(ToolRunPrefix)set DOTNET_INSTALLDIR=&& - $(ToolRunPrefix)unset MSBuildSDKsPath && - $(ToolRunPrefix)unset DOTNET_HOST_PATH && - $(ToolRunPrefix)unset DOTNET_INSTALLDIR && + $(ToolRunPrefix)unset MSBuildSDKsPath DOTNET_HOST_PATH DOTNET_INSTALLDIR &&