From 0bce25f6fddebd3b274fbf01559757c53e41560c Mon Sep 17 00:00:00 2001
From: ".NET Source-Build Bot"
<102560831+dotnet-sb-bot@users.noreply.github.com>
Date: Mon, 14 Oct 2024 12:02:59 -0500
Subject: [PATCH 1/4] .NET Source-Build 8.0.110 October 2024 Updates (#20172)
Co-authored-by: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com>
---
src/SourceBuild/content/eng/Versions.props | 4 ++--
src/SourceBuild/content/global.json | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props
index f272b2eae4e5..c6809928d082 100644
--- a/src/SourceBuild/content/eng/Versions.props
+++ b/src/SourceBuild/content/eng/Versions.props
@@ -30,7 +30,7 @@
These URLs can't be composed from their base URL and version as we read them from the
prep.sh and pipeline scripts, outside of MSBuild.
-->
- https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.108-servicing.24372.1.centos.9-x64.tar.gz
- https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.108-centos.9-x64.tar.gz
+ https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.110-servicing.24474.1.centos.9-x64.tar.gz
+ https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.110-centos.9-x64.tar.gz
diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json
index 4ce3bc3b13b9..9c9f81df396a 100644
--- a/src/SourceBuild/content/global.json
+++ b/src/SourceBuild/content/global.json
@@ -1,12 +1,12 @@
{
"tools": {
- "dotnet": "8.0.108"
+ "dotnet": "8.0.110"
},
"msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.0.1",
"Microsoft.Build.Traversal": "2.0.2",
"Microsoft.NET.Sdk.IL": "3.0.0-preview-27107-01",
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24367.1",
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24463.3",
"Yarn.MSBuild": "1.15.2"
}
}
From 9f61cf9dfa4e9a9077398f4bf156fd3f035d9456 Mon Sep 17 00:00:00 2001
From: Matt Thalman
Date: Tue, 15 Oct 2024 15:40:43 -0500
Subject: [PATCH 2/4] msbuild patch to remove BuildXL feed (#20202)
---
.../msbuild/0001-Remove-BuildXL-feed.patch | 22 +++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 src/SourceBuild/patches/msbuild/0001-Remove-BuildXL-feed.patch
diff --git a/src/SourceBuild/patches/msbuild/0001-Remove-BuildXL-feed.patch b/src/SourceBuild/patches/msbuild/0001-Remove-BuildXL-feed.patch
new file mode 100644
index 000000000000..26a734e970c4
--- /dev/null
+++ b/src/SourceBuild/patches/msbuild/0001-Remove-BuildXL-feed.patch
@@ -0,0 +1,22 @@
+From 0ea8c4bf37ca4e700ed4adc9e588416dcf10f51c Mon Sep 17 00:00:00 2001
+From: Matt Thalman
+Date: Tue, 15 Oct 2024 14:24:55 -0500
+Subject: [PATCH] Remove BuildXL feed
+
+Backport: https://github.com/dotnet/msbuild/pull/10765
+---
+ NuGet.config | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/NuGet.config b/NuGet.config
+index d7187b4d64..4e9907ea83 100644
+--- a/NuGet.config
++++ b/NuGet.config
+@@ -8,7 +8,6 @@
+
+
+
+-
+
+
+
From a4ce9b7ddbf4714be647b7e6ca45aa5ca47e2235 Mon Sep 17 00:00:00 2001
From: Manodasan Wignarajah
Date: Mon, 14 Oct 2024 17:44:24 -0700
Subject: [PATCH 3/4] Update Windows SDK projection
---
eng/ManualVersions.props | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props
index 88e4fdae99fe..a0011d25e4c5 100644
--- a/eng/ManualVersions.props
+++ b/eng/ManualVersions.props
@@ -9,19 +9,19 @@
Basically: In this file, choose the highest version when resolving merge conflicts.
-->
- 10.0.17763.44
- 10.0.18362.44
- 10.0.19041.44
- 10.0.20348.44
- 10.0.22000.44
- 10.0.22621.44
- 10.0.26100.44
- 10.0.17763.43
- 10.0.18362.43
- 10.0.19041.43
- 10.0.20348.43
- 10.0.22000.43
- 10.0.22621.43
- 10.0.26100.43
+ 10.0.17763.53
+ 10.0.18362.53
+ 10.0.19041.53
+ 10.0.20348.53
+ 10.0.22000.53
+ 10.0.22621.53
+ 10.0.26100.53
+ 10.0.17763.52
+ 10.0.18362.52
+ 10.0.19041.52
+ 10.0.20348.52
+ 10.0.22000.52
+ 10.0.22621.52
+ 10.0.26100.52
From 5b12bb243859e9e90e52d36840962e3c225880bb Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 16 Oct 2024 16:19:47 -0700
Subject: [PATCH 4/4] [release/8.0.3xx] Update dependencies from dotnet/arcade
(#20206)
Co-authored-by: dotnet-maestro[bot]
---
eng/Version.Details.xml | 12 ++++++------
eng/Versions.props | 2 +-
.../templates-official/steps/get-delegation-sas.yml | 11 ++++++++++-
eng/common/templates/steps/get-delegation-sas.yml | 11 ++++++++++-
global.json | 4 ++--
5 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f7c0819041db..80fab0409d2b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -214,18 +214,18 @@
-
+
https://github.com/dotnet/arcade
- e5b13e054339e41d422212a0ecaf24fec20cb5a1
+ f7fb1fec01b91be69e4dcc5290a0bff3f28e214f
-
+
https://github.com/dotnet/arcade
- e5b13e054339e41d422212a0ecaf24fec20cb5a1
+ f7fb1fec01b91be69e4dcc5290a0bff3f28e214f
-
+
https://github.com/dotnet/arcade
- e5b13e054339e41d422212a0ecaf24fec20cb5a1
+ f7fb1fec01b91be69e4dcc5290a0bff3f28e214f
https://github.com/dotnet/arcade-services
diff --git a/eng/Versions.props b/eng/Versions.props
index d5791dded3d7..ba8ad493f66e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -39,7 +39,7 @@
- 8.0.0-beta.24508.1
+ 8.0.0-beta.24516.1
diff --git a/eng/common/templates-official/steps/get-delegation-sas.yml b/eng/common/templates-official/steps/get-delegation-sas.yml
index c0e8f91317f0..c690cc0a070c 100644
--- a/eng/common/templates-official/steps/get-delegation-sas.yml
+++ b/eng/common/templates-official/steps/get-delegation-sas.yml
@@ -28,7 +28,16 @@ steps:
# Calculate the expiration of the SAS token and convert to UTC
$expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
- $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv
+ # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads
+ # of correlation payloads. https://github.com/dotnet/dnceng/issues/3484
+ $sas = ""
+ do {
+ $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv
+ if ($LASTEXITCODE -ne 0) {
+ Write-Error "Failed to generate SAS token."
+ exit 1
+ }
+ } while($sas.IndexOf('/') -ne -1)
if ($LASTEXITCODE -ne 0) {
Write-Error "Failed to generate SAS token."
diff --git a/eng/common/templates/steps/get-delegation-sas.yml b/eng/common/templates/steps/get-delegation-sas.yml
index c0e8f91317f0..c690cc0a070c 100644
--- a/eng/common/templates/steps/get-delegation-sas.yml
+++ b/eng/common/templates/steps/get-delegation-sas.yml
@@ -28,7 +28,16 @@ steps:
# Calculate the expiration of the SAS token and convert to UTC
$expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
- $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv
+ # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads
+ # of correlation payloads. https://github.com/dotnet/dnceng/issues/3484
+ $sas = ""
+ do {
+ $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv
+ if ($LASTEXITCODE -ne 0) {
+ Write-Error "Failed to generate SAS token."
+ exit 1
+ }
+ } while($sas.IndexOf('/') -ne -1)
if ($LASTEXITCODE -ne 0) {
Write-Error "Failed to generate SAS token."
diff --git a/global.json b/global.json
index 4f310b2c43ab..6e378e0b6d84 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.24508.1",
- "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24508.1"
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24516.1",
+ "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24516.1"
}
}