From da66af2cbce11c024e69e72751575feb5c55e318 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 16 May 2025 03:47:10 +0000
Subject: [PATCH 1/3] [release/8.0.1xx] Update dependencies from dotnet/arcade
(#20438)
[release/8.0.1xx] Update dependencies from dotnet/arcade
- Coherency Updates:
- Microsoft.Build: from 17.8.27 to 17.8.27 (parent: Microsoft.NET.Sdk)
- Microsoft.SourceBuild.Intermediate.msbuild: from 17.8.27-servicing-25210-15 to 17.8.27-servicing-25210-15 (parent: Microsoft.NET.Sdk)
---
NuGet.config | 49 +++++++++++++++++++++++++++++++++++++++++
eng/Version.Details.xml | 16 +++++++-------
eng/Versions.props | 2 +-
global.json | 4 ++--
4 files changed, 60 insertions(+), 11 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 4b403295d13c..508665ab773a 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -8,21 +8,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -42,17 +70,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b35d331ba689..a2bb29029a2b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -156,11 +156,11 @@
- https://github.com/dotnet/msbuild
+ https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted
3ab07f0cf43d15c3d05da60fb0ff44b49799ed5e
- https://github.com/dotnet/msbuild
+ https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted
3ab07f0cf43d15c3d05da60fb0ff44b49799ed5e
@@ -219,18 +219,18 @@
-
+
https://github.com/dotnet/arcade
- 20ab70a74d52b68f4271bd946884e24049b14f83
+ 983d15077d88cfed26837e40e8f984fdee5d1715
-
+
https://github.com/dotnet/arcade
- 20ab70a74d52b68f4271bd946884e24049b14f83
+ 983d15077d88cfed26837e40e8f984fdee5d1715
-
+
https://github.com/dotnet/arcade
- 20ab70a74d52b68f4271bd946884e24049b14f83
+ 983d15077d88cfed26837e40e8f984fdee5d1715
https://github.com/dotnet/arcade-services
diff --git a/eng/Versions.props b/eng/Versions.props
index 67ec741bbb51..d80a7859195e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -40,7 +40,7 @@
- 8.0.0-beta.25263.4
+ 8.0.0-beta.25264.2
diff --git a/global.json b/global.json
index 53c1a9e74277..24671626c98e 100644
--- a/global.json
+++ b/global.json
@@ -11,7 +11,7 @@
"cmake": "3.21.0"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25263.4",
- "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25263.4"
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25264.2",
+ "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25264.2"
}
}
From 7525d572a602cbfd006fe123d0d960125bdbfb63 Mon Sep 17 00:00:00 2001
From: Wenwen <53243232+Winniexu01@users.noreply.github.com>
Date: Mon, 19 May 2025 20:44:56 +0800
Subject: [PATCH 2/3] Upgrade scancode to 32.3.3 and downgrade click to 8.1.8
(#20445)
---
eng/install-scancode.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/eng/install-scancode.sh b/eng/install-scancode.sh
index 39ad70be318c..7cb27c17bbf7 100755
--- a/eng/install-scancode.sh
+++ b/eng/install-scancode.sh
@@ -5,12 +5,13 @@ set -euo pipefail
# Install instructions: https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#installation-as-a-library-via-pip
# See latest release at https://github.com/nexB/scancode-toolkit/releases
-SCANCODE_VERSION="32.3.2"
+SCANCODE_VERSION="32.3.3"
pyEnvPath="/tmp/scancode-env"
python3 -m venv $pyEnvPath
source $pyEnvPath/bin/activate
pip install scancode-toolkit==$SCANCODE_VERSION
+pip install click==8.1.8
deactivate
# Setup a script which executes scancode in the virtual environment
From 4c57634f491bd02ae6b07daf9358b034e9e8c2e5 Mon Sep 17 00:00:00 2001
From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com>
Date: Mon, 19 May 2025 11:08:09 -0700
Subject: [PATCH 3/3] [release/8.0.1xx] Fix SDK Diff pipeline trigger (#20448)
---
.../content/eng/pipelines/source-build-sdk-diff-tests.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml b/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml
index 5b020fe1d9d4..cbd83bc0bf0d 100644
--- a/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml
+++ b/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml
@@ -9,8 +9,8 @@ schedules:
# https://learn.microsoft.com/en-us/azure/devops/pipelines/process/pipeline-triggers?view=azure-devops#branch-considerations
resources:
pipelines:
- - pipeline: dotnet-source-build
- source: dotnet-source-build
+ - pipeline: dotnet-source-build-pre10.0
+ source: dotnet-source-build-pre10.0
trigger:
branches:
include: