diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a96dae9a3..e9082835d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -238,17 +238,17 @@ - + https://github.com/dotnet/arcade - f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 https://github.com/dotnet/arcade-services @@ -258,14 +258,14 @@ https://github.com/dotnet/arcade-services 0e9abfee048404d9b994fc64235b42216ce68dad - + https://github.com/dotnet/arcade - f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 diff --git a/eng/Versions.props b/eng/Versions.props index c12ef4ca0..0ef48e1c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.24205.14 + 9.0.0-beta.24207.1 diff --git a/eng/common/internal/NuGet.config b/eng/common/internal/NuGet.config index 716893669..19d3d311b 100644 --- a/eng/common/internal/NuGet.config +++ b/eng/common/internal/NuGet.config @@ -1,3 +1,4 @@ + diff --git a/eng/common/loc/P22DotNetHtmlLocalization.lss b/eng/common/loc/P22DotNetHtmlLocalization.lss index bbb21003f..5d892d619 100644 --- a/eng/common/loc/P22DotNetHtmlLocalization.lss +++ b/eng/common/loc/P22DotNetHtmlLocalization.lss @@ -1,3 +1,4 @@ + diff --git a/eng/common/sdl/NuGet.config b/eng/common/sdl/NuGet.config index a083bd094..3849bdb3c 100644 --- a/eng/common/sdl/NuGet.config +++ b/eng/common/sdl/NuGet.config @@ -1,4 +1,5 @@ - + + diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 56eab78a8..4585cfd6b 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,3 +1,4 @@ + diff --git a/global.json b/global.json index fa2932023..aecf7619f 100644 --- a/global.json +++ b/global.json @@ -11,8 +11,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24205.14", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24205.14", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24207.1", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24207.1", "Microsoft.Build.NoTargets": "3.7.0" } } diff --git a/src/SourceBuild/patches/arcade/0002-Disable-CA2022-error.patch b/src/SourceBuild/patches/arcade/0002-Disable-CA2022-error.patch deleted file mode 100644 index ca717d5fc..000000000 --- a/src/SourceBuild/patches/arcade/0002-Disable-CA2022-error.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Fri, 29 Mar 2024 16:33:22 +0000 -Subject: [PATCH] Disable CA2022 error - -Backport: https://github.com/dotnet/arcade/issues/14668 ---- - src/SignCheck/Microsoft.SignCheck/Verification/LZMAUtils.cs | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/SignCheck/Microsoft.SignCheck/Verification/LZMAUtils.cs b/src/SignCheck/Microsoft.SignCheck/Verification/LZMAUtils.cs -index 764a87fa6..e20f70ff4 100644 ---- a/src/SignCheck/Microsoft.SignCheck/Verification/LZMAUtils.cs -+++ b/src/SignCheck/Microsoft.SignCheck/Verification/LZMAUtils.cs -@@ -30,8 +30,10 @@ public static void Decompress(string sourceFile, string destinationFile) - byte[] properties = new byte[5]; - byte[] fileLengthBytes = new byte[8]; - -+#pragma warning disable CA2022 // Avoid inexact read - inFile.Read(properties, 0, 5); - inFile.Read(fileLengthBytes, 0, 8); -+#pragma warning restore CA2022 - - long fileLength = BitConverter.ToInt64(fileLengthBytes, 0); - decoder.SetDecoderProperties(properties);