Skip to content

Commit 83260bd

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[feature/10.0] Update dependencies from dotnet/dotnet (#8472)
* Update dependencies from https://github.com/dotnet/dotnet build 20250801.3 Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions , Microsoft.NETCore.App.Runtime.win-x64 , System.CommandLine , VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0 , VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0 , VS.Redist.Common.NetCore.SharedFramework.x64.10.0 From Version 10.0.0-rc.1.25377.103 -> To Version 10.0.0-rc.1.25401.103 * Update dependencies from https://github.com/dotnet/dotnet build 20250805.3 Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions , Microsoft.NETCore.App.Runtime.win-x64 , System.CommandLine , VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0 , VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0 , VS.Redist.Common.NetCore.SharedFramework.x64.10.0 From Version 10.0.0-rc.1.25377.103 -> To Version 10.0.0-rc.1.25405.103 * Update dependencies from https://github.com/dotnet/dotnet build 20250806.2 Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions , Microsoft.NETCore.App.Runtime.win-x64 , System.CommandLine , VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0 , VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0 , VS.Redist.Common.NetCore.SharedFramework.x64.10.0 From Version 10.0.0-rc.1.25377.103 -> To Version 10.0.0-rc.1.25406.102 * Update dependencies from https://github.com/dotnet/dotnet build 20250807.5 Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions , Microsoft.NETCore.App.Runtime.win-x64 , System.CommandLine , VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0 , VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0 , VS.Redist.Common.NetCore.SharedFramework.x64.10.0 From Version 10.0.0-rc.1.25377.103 -> To Version 10.0.0-rc.1.25407.105 * Update dependencies from https://github.com/dotnet/dotnet build 20250807.4 Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions , Microsoft.NETCore.App.Runtime.win-x64 , System.CommandLine , VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0 , VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0 , VS.Redist.Common.NetCore.SharedFramework.x64.10.0 From Version 10.0.0-rc.1.25377.103 -> To Version 10.0.0-rc.1.25407.104 * Update dependencies from https://github.com/dotnet/dotnet build 20250809.3 Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions , Microsoft.NETCore.App.Runtime.win-x64 , System.CommandLine , VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0 , VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0 , VS.Redist.Common.NetCore.SharedFramework.x64.10.0 From Version 10.0.0-rc.1.25377.103 -> To Version 10.0.0-rc.1.25409.103 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 5222172 commit 83260bd

File tree

6 files changed

+88
-53
lines changed

6 files changed

+88
-53
lines changed

‎eng/Version.Details.xml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-rc.1.25377.103">
3+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-rc.1.25409.103">
44
<Uri>https://github.com/dotnet/dotnet</Uri>
5-
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
5+
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
66
</Dependency>
77
<Dependency Name="Microsoft.Diagnostics.Monitoring" Version="9.0.0-preview.25381.1">
88
<Uri>https://github.com/dotnet/diagnostics</Uri>
@@ -12,55 +12,55 @@
1212
<Uri>https://github.com/dotnet/diagnostics</Uri>
1313
<Sha>058c2fef083bc427b23e74752acaf3b436fcddda</Sha>
1414
</Dependency>
15-
<Dependency Name="System.CommandLine" Version="2.0.0-rc.1.25377.103">
15+
<Dependency Name="System.CommandLine" Version="2.0.0-rc.1.25409.103">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
17+
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
1818
</Dependency>
1919
</ProductDependencies>
2020
<ToolsetDependencies>
21-
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-preview.25377.103">
21+
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-preview.25409.103">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
23+
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25377.103">
25+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25409.103">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
27+
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25377.103">
29+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25409.103">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
31+
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25377.103">
33+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25409.103">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
35+
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25377.103">
37+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25409.103">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
39+
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25377.103">
41+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25409.103">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
43+
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
4444
</Dependency>
4545
<Dependency Name="Microsoft.FileFormats" Version="1.0.638101">
4646
<Uri>https://github.com/dotnet/diagnostics</Uri>
4747
<Sha>058c2fef083bc427b23e74752acaf3b436fcddda</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.7.25377.103">
49+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-rc.1.25409.103">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
51+
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
5252
</Dependency>
53-
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-rc.1.25377.103">
53+
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-rc.1.25409.103">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
55+
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
5656
</Dependency>
57-
<Dependency Name="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0" Version="10.0.100-preview.7.25377.103">
57+
<Dependency Name="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0" Version="10.0.100-rc.1.25409.103">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
59+
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
6060
</Dependency>
61-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.7.25377.103">
61+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-rc.1.25409.103">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
63+
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
6464
</Dependency>
6565
</ToolsetDependencies>
6666
</Dependencies>

‎eng/Versions.props

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@
5252
<MicrosoftDiagnosticsMonitoringEventPipeVersion>9.0.0-preview.25381.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
5353
<MicrosoftFileFormatsVersion>1.0.638101</MicrosoftFileFormatsVersion>
5454
<!-- dotnet/dotnet references -->
55-
<MicrosoftAspNetCoreAppRuntimewinx64Version>10.0.0-rc.1.25377.103</MicrosoftAspNetCoreAppRuntimewinx64Version>
56-
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.25377.103</MicrosoftCodeAnalysisNetAnalyzersVersion>
57-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25377.103</MicrosoftDotNetBuildTasksArchivesVersion>
58-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25377.103</MicrosoftDotNetCodeAnalysisVersion>
59-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25377.103</MicrosoftDotNetXUnitExtensionsVersion>
60-
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.7.25377.103</MicrosoftNETCoreAppRuntimewinx64Version>
61-
<SystemCommandLineVersion>2.0.0-rc.1.25377.103</SystemCommandLineVersion>
62-
<VSRedistCommonAspNetCoreSharedFrameworkx64100Version>10.0.0-rc.1.25377.103</VSRedistCommonAspNetCoreSharedFrameworkx64100Version>
63-
<VSRedistCommonNetCoreSdkPlaceholderx64100Version>10.0.100-preview.7.25377.103</VSRedistCommonNetCoreSdkPlaceholderx64100Version>
64-
<VSRedistCommonNetCoreSharedFrameworkx64100Version>10.0.0-preview.7.25377.103</VSRedistCommonNetCoreSharedFrameworkx64100Version>
55+
<MicrosoftAspNetCoreAppRuntimewinx64Version>10.0.0-rc.1.25409.103</MicrosoftAspNetCoreAppRuntimewinx64Version>
56+
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.25409.103</MicrosoftCodeAnalysisNetAnalyzersVersion>
57+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25409.103</MicrosoftDotNetBuildTasksArchivesVersion>
58+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25409.103</MicrosoftDotNetCodeAnalysisVersion>
59+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25409.103</MicrosoftDotNetXUnitExtensionsVersion>
60+
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-rc.1.25409.103</MicrosoftNETCoreAppRuntimewinx64Version>
61+
<SystemCommandLineVersion>2.0.0-rc.1.25409.103</SystemCommandLineVersion>
62+
<VSRedistCommonAspNetCoreSharedFrameworkx64100Version>10.0.0-rc.1.25409.103</VSRedistCommonAspNetCoreSharedFrameworkx64100Version>
63+
<VSRedistCommonNetCoreSdkPlaceholderx64100Version>10.0.100-rc.1.25409.103</VSRedistCommonNetCoreSdkPlaceholderx64100Version>
64+
<VSRedistCommonNetCoreSharedFrameworkx64100Version>10.0.0-rc.1.25409.103</VSRedistCommonNetCoreSharedFrameworkx64100Version>
6565
</PropertyGroup>
6666
<PropertyGroup Label="Runtime Versions">
6767
<MicrosoftAspNetCoreApp80Version>$(MicrosoftNETCoreApp80Version)</MicrosoftAspNetCoreApp80Version>

‎eng/common/core-templates/job/onelocbuild.yml

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ parameters:
44

55
# Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
66
pool: ''
7-
7+
88
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
99
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
1010

@@ -27,7 +27,7 @@ parameters:
2727
is1ESPipeline: ''
2828
jobs:
2929
- job: OneLocBuild${{ parameters.JobNameSuffix }}
30-
30+
3131
dependsOn: ${{ parameters.dependsOn }}
3232

3333
displayName: OneLocBuild${{ parameters.JobNameSuffix }}
@@ -99,22 +99,20 @@ jobs:
9999
mirrorBranch: ${{ parameters.MirrorBranch }}
100100
condition: ${{ parameters.condition }}
101101

102-
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
103-
parameters:
104-
is1ESPipeline: ${{ parameters.is1ESPipeline }}
105-
args:
106-
displayName: Publish Localization Files
107-
pathToPublish: '$(Build.ArtifactStagingDirectory)/loc'
108-
publishLocation: Container
109-
artifactName: Loc
110-
condition: ${{ parameters.condition }}
102+
# Copy the locProject.json to the root of the Loc directory, then publish a pipeline artifact
103+
- task: CopyFiles@2
104+
displayName: Copy LocProject.json
105+
inputs:
106+
SourceFolder: '$(Build.SourcesDirectory)/eng/Localize/'
107+
Contents: 'LocProject.json'
108+
TargetFolder: '$(Build.ArtifactStagingDirectory)/loc'
109+
condition: ${{ parameters.condition }}
111110

112-
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
111+
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
113112
parameters:
114113
is1ESPipeline: ${{ parameters.is1ESPipeline }}
115114
args:
116-
displayName: Publish LocProject.json
117-
pathToPublish: '$(Build.SourcesDirectory)/eng/Localize/'
118-
publishLocation: Container
119-
artifactName: Loc
115+
targetPath: '$(Build.ArtifactStagingDirectory)/loc'
116+
artifactName: 'Loc'
117+
displayName: 'Publish Localization Files'
120118
condition: ${{ parameters.condition }}

‎eng/common/tools.ps1

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,20 @@ function Retry($downloadBlock, $maxRetries = 5) {
257257

258258
function GetDotNetInstallScript([string] $dotnetRoot) {
259259
$installScript = Join-Path $dotnetRoot 'dotnet-install.ps1'
260+
$shouldDownload = $false
261+
260262
if (!(Test-Path $installScript)) {
263+
$shouldDownload = $true
264+
} else {
265+
# Check if the script is older than 30 days
266+
$fileAge = (Get-Date) - (Get-Item $installScript).LastWriteTime
267+
if ($fileAge.Days -gt 30) {
268+
Write-Host "Existing install script is too old, re-downloading..."
269+
$shouldDownload = $true
270+
}
271+
}
272+
273+
if ($shouldDownload) {
261274
Create-Directory $dotnetRoot
262275
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
263276
$uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"

‎eng/common/tools.sh

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,29 @@ function GetDotNetInstallScript {
300300
local root=$1
301301
local install_script="$root/dotnet-install.sh"
302302
local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
303+
local timestamp_file="$root/.dotnet-install.timestamp"
304+
local should_download=false
303305

304306
if [[ ! -a "$install_script" ]]; then
307+
should_download=true
308+
elif [[ -f "$timestamp_file" ]]; then
309+
# Check if the script is older than 30 days using timestamp file
310+
local download_time=$(cat "$timestamp_file" 2>/dev/null || echo "0")
311+
local current_time=$(date +%s)
312+
local age_seconds=$((current_time - download_time))
313+
314+
# 30 days = 30 * 24 * 60 * 60 = 2592000 seconds
315+
if [[ $age_seconds -gt 2592000 ]]; then
316+
echo "Existing install script is too old, re-downloading..."
317+
should_download=true
318+
fi
319+
else
320+
# No timestamp file exists, assume script is old and re-download
321+
echo "No timestamp found for existing install script, re-downloading..."
322+
should_download=true
323+
fi
324+
325+
if [[ "$should_download" == true ]]; then
305326
mkdir -p "$root"
306327

307328
echo "Downloading '$install_script_url'"
@@ -328,6 +349,9 @@ function GetDotNetInstallScript {
328349
ExitWithExitCode $exit_code
329350
}
330351
fi
352+
353+
# Create timestamp file to track download time in seconds from epoch
354+
date +%s > "$timestamp_file"
331355
fi
332356
# return value
333357
_GetDotNetInstallScript="$install_script"

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "10.0.100-preview.7.25322.101",
3+
"dotnet": "10.0.100-preview.7.25372.107",
44
"runtimes": {
55
"aspnetcore": [
66
"$(MicrosoftAspNetCoreApp80Version)",
@@ -26,7 +26,7 @@
2626
},
2727
"msbuild-sdks": {
2828
"Microsoft.Build.NoTargets": "3.7.0",
29-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25377.103",
30-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25377.103"
29+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25409.103",
30+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25409.103"
3131
}
3232
}

0 commit comments

Comments
 (0)