From 45b17e97b2effbbf5fa20c0d25c26af5d7253f2d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Aug 2025 02:04:22 +0000 Subject: [PATCH 1/6] Update dependencies from https://github.com/dotnet/dotnet build 20250807.5 Microsoft.NET.Runtime.MonoTargets.Sdk , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Cecil , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.NET.ILLink , Microsoft.NET.ILLink.Tasks , Microsoft.NET.Sdk , Microsoft.NETCore.App.Ref , Microsoft.TemplateEngine.Authoring.Tasks From Version 10.0.0-rc.1.25406.102 -> To Version 10.0.0-rc.1.25407.105 --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 20 ++++++++++---------- global.json | 2 +- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 595c0828300..842106a6c58 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,25 +1,25 @@ - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 @@ -72,31 +72,31 @@ https://github.com/dotnet/macios b9cbca7ba62a8a49145c6f06b327b356a6c82f5a - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 https://github.com/dotnet/xharness 15700cf562e03a74f80064d294e9f7e2c3032ed0 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 diff --git a/eng/Versions.props b/eng/Versions.props index 95558262a20..76d60b51ef4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,18 +2,18 @@ - 10.0.100-rc.1.25406.102 - 10.0.0-rc.1.25406.102 - 10.0.0-rc.1.25406.102 - 10.0.0-beta.25406.102 - 10.0.0-beta.25406.102 - 10.0.0-rc.1.25406.102 - 10.0.0-rc.1.25406.102 - 10.0.100-rc.1.25406.102 + 10.0.100-rc.1.25407.105 + 10.0.0-rc.1.25407.105 + 10.0.0-rc.1.25407.105 + 10.0.0-beta.25407.105 + 10.0.0-beta.25407.105 + 10.0.0-rc.1.25407.105 + 10.0.0-rc.1.25407.105 + 10.0.100-rc.1.25407.105 7.0.100-alpha.1.21601.1 - 0.11.5-alpha.25406.102 + 0.11.5-alpha.25407.105 10.0.0-prerelease.25379.1 - 10.0.0-beta.25406.102 + 10.0.0-beta.25407.105 $(MicrosoftNETSdkPackageVersion) diff --git a/global.json b/global.json index e728c768513..27019ed6ee4 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "dotnet": "10.0.100-rc.1.25406.102" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25406.102" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25407.105" } } From bef3dfc603e1f1cd6d0dec2c52a075cdfb671a92 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 8 Aug 2025 02:05:02 +0000 Subject: [PATCH 2/6] Re-generate global.json for PR #23522: [net10.0] Update dependencies from dotnet/dotnet --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 27019ed6ee4..58766e9685a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-rc.1.25406.102", + "version": "10.0.100-rc.1.25407.105", "paths": [ "builds/downloads/dotnet", "$host$" @@ -8,7 +8,7 @@ "errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'." }, "tools": { - "dotnet": "10.0.100-rc.1.25406.102" + "dotnet": "10.0.100-rc.1.25407.105" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25407.105" From cd64f705a10b0946fc758011284334f15cb902c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Aug 2025 02:02:48 +0000 Subject: [PATCH 3/6] Update dependencies from https://github.com/dotnet/dotnet build 20250807.4 Microsoft.NET.Runtime.MonoTargets.Sdk , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Cecil , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.NET.ILLink , Microsoft.NET.ILLink.Tasks , Microsoft.NET.Sdk , Microsoft.NETCore.App.Ref , Microsoft.TemplateEngine.Authoring.Tasks From Version 10.0.0-rc.1.25406.102 -> To Version 10.0.0-rc.1.25407.104 --- eng/Version.Details.props | 60 ++++++++++++++++++++++++++++++++++++++- eng/Version.Details.xml | 40 +++++++++++++------------- global.json | 2 +- 3 files changed, 80 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index e33cf95355f..1746a480e8f 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -5,5 +5,63 @@ Do not edit it manually, as it will get overwritten by automation. This file should be imported by eng/Versions.props --> - + + + 10.0.0-beta.25407.104 + 10.0.0-beta.25407.104 + 0.11.5-alpha.25407.104 + 10.0.0-beta.25407.104 + 10.0.0-rc.1.25407.104 + 10.0.0-rc.1.25407.104 + 10.0.0-rc.1.25407.104 + 10.0.100-rc.1.25407.104 + 10.0.0-rc.1.25407.104 + 10.0.100-rc.1.25407.104 + + 18.5.9216 + 26.0.9330-xcode26.0 + 18.5.9216 + 26.0.9330-xcode26.0 + 15.5.9216 + 26.0.9330-xcode26.0 + 18.5.9216 + 26.0.9330-xcode26.0 + + 18.0.9617 + 18.0.9617 + 15.0.9617 + 18.0.9617 + + 10.0.0-prerelease.25318.1 + + + + + $(MicrosoftDotNetArcadeSdkPackageVersion) + $(MicrosoftDotNetBuildTasksFeedPackageVersion) + $(MicrosoftDotNetCecilPackageVersion) + $(MicrosoftDotNetSharedFrameworkSdkPackageVersion) + $(MicrosoftNETILLinkPackageVersion) + $(MicrosoftNETILLinkTasksPackageVersion) + $(MicrosoftNETRuntimeMonoTargetsSdkPackageVersion) + $(MicrosoftNETSdkPackageVersion) + $(MicrosoftNETCoreAppRefPackageVersion) + $(MicrosoftTemplateEngineAuthoringTasksPackageVersion) + + $(MicrosoftiOSSdknet90_185PackageVersion) + $(MicrosoftiOSSdknet90_260PackageVersion) + $(MicrosoftMacCatalystSdknet90_185PackageVersion) + $(MicrosoftMacCatalystSdknet90_260PackageVersion) + $(MicrosoftmacOSSdknet90_155PackageVersion) + $(MicrosoftmacOSSdknet90_260PackageVersion) + $(MicrosofttvOSSdknet90_185PackageVersion) + $(MicrosofttvOSSdknet90_260PackageVersion) + + $(MicrosoftiOSSdknet90_180PackageVersion) + $(MicrosoftMacCatalystSdknet90_180PackageVersion) + $(MicrosoftmacOSSdknet90_150PackageVersion) + $(MicrosofttvOSSdknet90_180PackageVersion) + + $(MicrosoftDotNetXHarnessiOSSharedPackageVersion) + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 842106a6c58..12793b28052 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,25 +1,25 @@ - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 @@ -72,31 +72,31 @@ https://github.com/dotnet/macios b9cbca7ba62a8a49145c6f06b327b356a6c82f5a - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 https://github.com/dotnet/xharness 15700cf562e03a74f80064d294e9f7e2c3032ed0 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 diff --git a/global.json b/global.json index 58766e9685a..b9973fc0e76 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "dotnet": "10.0.100-rc.1.25407.105" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25407.105" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25407.104" } } From aaf403cbe28a9a3df303c9845ce6e27c2098cecf Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Sat, 9 Aug 2025 02:03:28 +0000 Subject: [PATCH 4/6] Re-generate global.json for PR #23522: [net10.0] Update dependencies from dotnet/dotnet --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index b9973fc0e76..58766e9685a 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "dotnet": "10.0.100-rc.1.25407.105" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25407.104" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25407.105" } } From 0bafa8aff9c327e2ddf48f240974fdc6fcef2af6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Aug 2025 02:02:22 +0000 Subject: [PATCH 5/6] Update dependencies from https://github.com/dotnet/dotnet build 20250809.3 Microsoft.NET.Runtime.MonoTargets.Sdk , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Cecil , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.NET.ILLink , Microsoft.NET.ILLink.Tasks , Microsoft.NET.Sdk , Microsoft.NETCore.App.Ref , Microsoft.TemplateEngine.Authoring.Tasks From Version 10.0.0-rc.1.25406.102 -> To Version 10.0.0-rc.1.25409.103 --- eng/Version.Details.props | 20 +++++----- eng/Version.Details.xml | 40 +++++++++---------- eng/common/core-templates/job/onelocbuild.yml | 30 +++++++------- eng/common/tools.ps1 | 13 ++++++ eng/common/tools.sh | 24 +++++++++++ global.json | 2 +- 6 files changed, 82 insertions(+), 47 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 1746a480e8f..41bf3ed054f 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -7,16 +7,16 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25407.104 - 10.0.0-beta.25407.104 - 0.11.5-alpha.25407.104 - 10.0.0-beta.25407.104 - 10.0.0-rc.1.25407.104 - 10.0.0-rc.1.25407.104 - 10.0.0-rc.1.25407.104 - 10.0.100-rc.1.25407.104 - 10.0.0-rc.1.25407.104 - 10.0.100-rc.1.25407.104 + 10.0.0-beta.25409.103 + 10.0.0-beta.25409.103 + 0.11.5-alpha.25409.103 + 10.0.0-beta.25409.103 + 10.0.0-rc.1.25409.103 + 10.0.0-rc.1.25409.103 + 10.0.0-rc.1.25409.103 + 10.0.100-rc.1.25409.103 + 10.0.0-rc.1.25409.103 + 10.0.100-rc.1.25409.103 18.5.9216 26.0.9330-xcode26.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 12793b28052..a79c720b4e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,25 +1,25 @@ - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c @@ -72,31 +72,31 @@ https://github.com/dotnet/macios b9cbca7ba62a8a49145c6f06b327b356a6c82f5a - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c https://github.com/dotnet/xharness 15700cf562e03a74f80064d294e9f7e2c3032ed0 - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index 8034815f421..8bf7d23355b 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -4,7 +4,7 @@ parameters: # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool pool: '' - + CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) @@ -27,7 +27,7 @@ parameters: is1ESPipeline: '' jobs: - job: OneLocBuild${{ parameters.JobNameSuffix }} - + dependsOn: ${{ parameters.dependsOn }} displayName: OneLocBuild${{ parameters.JobNameSuffix }} @@ -99,22 +99,20 @@ jobs: mirrorBranch: ${{ parameters.MirrorBranch }} condition: ${{ parameters.condition }} - - template: /eng/common/core-templates/steps/publish-build-artifacts.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - args: - displayName: Publish Localization Files - pathToPublish: '$(Build.ArtifactStagingDirectory)/loc' - publishLocation: Container - artifactName: Loc - condition: ${{ parameters.condition }} + # Copy the locProject.json to the root of the Loc directory, then publish a pipeline artifact + - task: CopyFiles@2 + displayName: Copy LocProject.json + inputs: + SourceFolder: '$(Build.SourcesDirectory)/eng/Localize/' + Contents: 'LocProject.json' + TargetFolder: '$(Build.ArtifactStagingDirectory)/loc' + condition: ${{ parameters.condition }} - - template: /eng/common/core-templates/steps/publish-build-artifacts.yml + - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} args: - displayName: Publish LocProject.json - pathToPublish: '$(Build.SourcesDirectory)/eng/Localize/' - publishLocation: Container - artifactName: Loc + targetPath: '$(Build.ArtifactStagingDirectory)/loc' + artifactName: 'Loc' + displayName: 'Publish Localization Files' condition: ${{ parameters.condition }} diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 996a5f9c872..d4cfd9ccd80 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -257,7 +257,20 @@ function Retry($downloadBlock, $maxRetries = 5) { function GetDotNetInstallScript([string] $dotnetRoot) { $installScript = Join-Path $dotnetRoot 'dotnet-install.ps1' + $shouldDownload = $false + if (!(Test-Path $installScript)) { + $shouldDownload = $true + } else { + # Check if the script is older than 30 days + $fileAge = (Get-Date) - (Get-Item $installScript).LastWriteTime + if ($fileAge.Days -gt 30) { + Write-Host "Existing install script is too old, re-downloading..." + $shouldDownload = $true + } + } + + if ($shouldDownload) { Create-Directory $dotnetRoot $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit $uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 3def02a638d..c1841c9dfd0 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -300,8 +300,29 @@ function GetDotNetInstallScript { local root=$1 local install_script="$root/dotnet-install.sh" local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" + local timestamp_file="$root/.dotnet-install.timestamp" + local should_download=false if [[ ! -a "$install_script" ]]; then + should_download=true + elif [[ -f "$timestamp_file" ]]; then + # Check if the script is older than 30 days using timestamp file + local download_time=$(cat "$timestamp_file" 2>/dev/null || echo "0") + local current_time=$(date +%s) + local age_seconds=$((current_time - download_time)) + + # 30 days = 30 * 24 * 60 * 60 = 2592000 seconds + if [[ $age_seconds -gt 2592000 ]]; then + echo "Existing install script is too old, re-downloading..." + should_download=true + fi + else + # No timestamp file exists, assume script is old and re-download + echo "No timestamp found for existing install script, re-downloading..." + should_download=true + fi + + if [[ "$should_download" == true ]]; then mkdir -p "$root" echo "Downloading '$install_script_url'" @@ -328,6 +349,9 @@ function GetDotNetInstallScript { ExitWithExitCode $exit_code } fi + + # Create timestamp file to track download time in seconds from epoch + date +%s > "$timestamp_file" fi # return value _GetDotNetInstallScript="$install_script" diff --git a/global.json b/global.json index 58766e9685a..8329b523a12 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "dotnet": "10.0.100-rc.1.25407.105" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25407.105" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25409.103" } } From d71eb87f42fadede409acc97596f96b4fbf3ad86 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 11 Aug 2025 02:03:03 +0000 Subject: [PATCH 6/6] Re-generate global.json for PR #23522: [net10.0] Update dependencies from dotnet/dotnet --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 8329b523a12..58766e9685a 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "dotnet": "10.0.100-rc.1.25407.105" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25409.103" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25407.105" } }