From 2e281e112470418a25066ddcfb15dbe4b1bd5ae9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Dec 2023 13:24:21 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/arcade build 20231207.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.23606.1 -> To Version 9.0.0-beta.23607.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 30c002b69..87b70ddc8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,18 +206,18 @@ - + https://github.com/dotnet/arcade - 71149d1f281ab5e066d1f524f4862152683f5144 + 3faeb9817f465151aa4bbcdb315f0a6170206760 - + https://github.com/dotnet/arcade - 71149d1f281ab5e066d1f524f4862152683f5144 + 3faeb9817f465151aa4bbcdb315f0a6170206760 - + https://github.com/dotnet/arcade - 71149d1f281ab5e066d1f524f4862152683f5144 + 3faeb9817f465151aa4bbcdb315f0a6170206760 https://github.com/dotnet/arcade-services @@ -227,9 +227,9 @@ https://github.com/dotnet/arcade-services 5263b603d90991a0c200aca8b8892c3d7cfe4751 - + https://github.com/dotnet/arcade - 71149d1f281ab5e066d1f524f4862152683f5144 + 3faeb9817f465151aa4bbcdb315f0a6170206760 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index b23e70b9b..53985ec9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 9.0.0-beta.23606.1 + 9.0.0-beta.23607.2 diff --git a/global.json b/global.json index 477fea67f..1834e0ff0 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23606.1", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23606.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23607.2", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23607.2" } } From a00eb91d0ec2fe9902102ff9c87e8c8c3e171a02 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 8 Dec 2023 17:38:32 +0000 Subject: [PATCH 2/4] [main] Update dependencies from dotnet/source-build-reference-packages (#17928) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 30c002b69..164a97b7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -235,9 +235,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - b5ceed90b72d1b05975dd95fedd86c2455969adb + 9e09ace1897546ac85dab114a6e1a5b6f773db7a From 3d9c0a841daee491815e4e9774b4b8c91d3989e3 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Fri, 8 Dec 2023 09:44:18 -0800 Subject: [PATCH 3/4] Use SHA256 for RPM digest (#17933) --- src/core-sdk-tasks/BuildFPMToolPreReqs.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/core-sdk-tasks/BuildFPMToolPreReqs.cs b/src/core-sdk-tasks/BuildFPMToolPreReqs.cs index ec43d0ae3..b24fbfd10 100644 --- a/src/core-sdk-tasks/BuildFPMToolPreReqs.cs +++ b/src/core-sdk-tasks/BuildFPMToolPreReqs.cs @@ -101,6 +101,7 @@ namespace Microsoft.DotNet.Build.Tasks // -a : architecture --JSON // -d : is for all dependent packages. This can be used multiple times to specify the dependencies of the package. --JSON // --rpm-os : the operating system to target this rpm --Static + // --rpm-digest : rpm digest algorithm --Static // --rpm-changelog : the changelog from FILEPATH contents --ARG // --rpm-summary : it is the RPM summary that shows in the Title --JSON // --description : it is the description for the package --JSON @@ -157,6 +158,7 @@ namespace Microsoft.DotNet.Build.Tasks } parameters.Add("--rpm-os linux"); + parameters.Add("--rpm-digest sha256"); parameters.Add(string.Concat("--rpm-changelog ", EscapeArg(Path.Combine(InputDir, "templates", "changelog")))); // Changelog File parameters.Add(string.Concat("--rpm-summary ", EscapeArg(configJson.Short_Description))); From 0485445c57cf5ca4287fa0f717c6384a3d8f6e80 Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Fri, 8 Dec 2023 10:51:16 -0800 Subject: [PATCH 4/4] Remove Microsoft.SourceBuild.Intermediate from prebuilt baseline (#17935) --- eng/SourceBuildPrebuiltBaseline.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index b821a269a..0847642e0 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -3,8 +3,6 @@ - -