From 9062f69c745449e01142b9f547dfc240a937e668 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 7 Apr 2024 12:18:08 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20240407.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.24205.14 -> To Version 9.0.0-beta.24207.1 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- eng/common/internal/NuGet.config | 1 + eng/common/loc/P22DotNetHtmlLocalization.lss | 1 + eng/common/sdl/NuGet.config | 3 ++- eng/common/sdl/packages.config | 1 + global.json | 4 ++-- 7 files changed, 18 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a96dae9a3a30..e9082835dacb 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 c12ef4ca0e5c..0ef48e1c8839 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 7168936696b8..19d3d311b166 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 bbb21003f01b..5d892d619398 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 a083bd094d71..3849bdb3cf51 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 56eab78a8704..4585cfd6bba1 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 fa2932023689..aecf7619f945 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" } } From 1e3b87187d2f7c8f396880832d7305c5b8d07ac7 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 8 Apr 2024 12:18:54 +0200 Subject: [PATCH 2/2] Delete src/SourceBuild/patches/arcade/0002-Disable-CA2022-error.patch --- .../arcade/0002-Disable-CA2022-error.patch | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 src/SourceBuild/patches/arcade/0002-Disable-CA2022-error.patch 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 ca717d5fc69a..000000000000 --- 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);