Skip to content

Commit 930b6a0

Browse files
[main] Update dependencies from dotnet/arcade (#15244)
* Update dependencies from https://github.com/dotnet/arcade build 20250801.2 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25374.4 -> To Version 10.0.0-beta.25401.2 * Update dependencies from https://github.com/dotnet/arcade build 20250808.3 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25374.4 -> To Version 10.0.0-beta.25408.3 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jakub Jareš <me@jakubjares.com>
1 parent 4d2e4b0 commit 930b6a0

File tree

6 files changed

+57
-22
lines changed

6 files changed

+57
-22
lines changed

eng/Version.Details.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This file should be imported by eng/Versions.props
1616
<!-- dotnet/core-setup dependencies -->
1717
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>2.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
1818
<!-- dotnet/arcade dependencies -->
19-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25374.4</MicrosoftDotNetArcadeSdkPackageVersion>
19+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25408.3</MicrosoftDotNetArcadeSdkPackageVersion>
2020
<!-- dotnet/symreader-converter dependencies -->
2121
<MicrosoftDiaSymReaderConverterPackageVersion>1.1.0-beta2-19575-01</MicrosoftDiaSymReaderConverterPackageVersion>
2222
<MicrosoftDiaSymReaderPdb2PdbPackageVersion>1.1.0-beta2-19575-01</MicrosoftDiaSymReaderPdb2PdbPackageVersion>

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
</Dependency>
2828
</ProductDependencies>
2929
<ToolsetDependencies>
30-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25374.4">
30+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25408.3">
3131
<Uri>https://github.com/dotnet/arcade</Uri>
32-
<Sha>e2fed65f9c524d12c64876194ae4ce177b935bb3</Sha>
32+
<Sha>d27184f7cb92b4abb4b20e91ecb5c43bc43de65b</Sha>
3333
</Dependency>
3434
<Dependency Name="Microsoft.DiaSymReader.Pdb2Pdb" Version="1.1.0-beta2-19575-01">
3535
<Uri>https://github.com/dotnet/symreader-converter</Uri>

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
"sdk": {
3-
"version": "10.0.100-preview.7.25322.101",
3+
"version": "10.0.100-preview.7.25372.107",
44
"rollForward": "minor",
55
"allowPrerelease": false,
66
"architecture": "x64"
@@ -30,9 +30,9 @@
3030
"version": "17.8.0"
3131
},
3232
"vswhere": "2.2.7",
33-
"dotnet": "10.0.100-preview.7.25322.101"
33+
"dotnet": "10.0.100-preview.7.25372.107"
3434
},
3535
"msbuild-sdks": {
36-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25374.4"
36+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25408.3"
3737
}
3838
}

0 commit comments

Comments
 (0)