Skip to content

Commit 099478a

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build (#54587)
[main] Update dependencies from dotnet/arcade
1 parent c5f6624 commit 099478a

File tree

7 files changed

+40
-34
lines changed

7 files changed

+40
-34
lines changed

‎eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -383,31 +383,31 @@
383383
<Uri>https://github.com/dotnet/winforms</Uri>
384384
<Sha>bfc23d4c7b17ab3ece28faedd603501e2ada9d6c</Sha>
385385
</Dependency>
386-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24159.1">
386+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24165.6">
387387
<Uri>https://github.com/dotnet/arcade</Uri>
388-
<Sha>f4538b1f8ff5ceb197aea509f3f61872b217b09e</Sha>
388+
<Sha>ace00d8719b8d1fdfd0cc05f71bb9af216338d27</Sha>
389389
</Dependency>
390390
<!-- Intermediate is necessary for source build. -->
391-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24159.1">
391+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24165.6">
392392
<Uri>https://github.com/dotnet/arcade</Uri>
393-
<Sha>f4538b1f8ff5ceb197aea509f3f61872b217b09e</Sha>
393+
<Sha>ace00d8719b8d1fdfd0cc05f71bb9af216338d27</Sha>
394394
<SourceBuild RepoName="arcade" ManagedOnly="true" />
395395
</Dependency>
396-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24159.1">
396+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24165.6">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>f4538b1f8ff5ceb197aea509f3f61872b217b09e</Sha>
398+
<Sha>ace00d8719b8d1fdfd0cc05f71bb9af216338d27</Sha>
399399
</Dependency>
400-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24159.1">
400+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24165.6">
401401
<Uri>https://github.com/dotnet/arcade</Uri>
402-
<Sha>f4538b1f8ff5ceb197aea509f3f61872b217b09e</Sha>
402+
<Sha>ace00d8719b8d1fdfd0cc05f71bb9af216338d27</Sha>
403403
</Dependency>
404-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24159.1">
404+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24165.6">
405405
<Uri>https://github.com/dotnet/arcade</Uri>
406-
<Sha>f4538b1f8ff5ceb197aea509f3f61872b217b09e</Sha>
406+
<Sha>ace00d8719b8d1fdfd0cc05f71bb9af216338d27</Sha>
407407
</Dependency>
408-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24159.1">
408+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24165.6">
409409
<Uri>https://github.com/dotnet/arcade</Uri>
410-
<Sha>f4538b1f8ff5ceb197aea509f3f61872b217b09e</Sha>
410+
<Sha>ace00d8719b8d1fdfd0cc05f71bb9af216338d27</Sha>
411411
</Dependency>
412412
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.0.0-preview.3.24159.1">
413413
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,10 @@
159159
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
160160
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
161161
<!-- Packages from dotnet/arcade -->
162-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24159.1</MicrosoftDotNetBuildTasksInstallersVersion>
163-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24159.1</MicrosoftDotNetBuildTasksTemplatingVersion>
164-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24159.1</MicrosoftDotNetRemoteExecutorVersion>
165-
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.24159.1</MicrosoftSourceBuildIntermediatearcadeVersion>
162+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24165.6</MicrosoftDotNetBuildTasksInstallersVersion>
163+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24165.6</MicrosoftDotNetBuildTasksTemplatingVersion>
164+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24165.6</MicrosoftDotNetRemoteExecutorVersion>
165+
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.24165.6</MicrosoftSourceBuildIntermediatearcadeVersion>
166166
<!-- Packages from dotnet/source-build-externals -->
167167
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>9.0.0-alpha.1.24158.2</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
168168
<!-- Packages from dotnet/source-build-reference-packages -->

‎eng/common/native/init-compiler.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ if [ -z "$CLR_CC" ]; then
6363
# Set default versions
6464
if [ -z "$majorVersion" ]; then
6565
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
66-
if [ "$compiler" = "clang" ]; then versions="17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
66+
if [ "$compiler" = "clang" ]; then versions="18 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
6767
elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi
6868

6969
for version in $versions; do
@@ -125,8 +125,8 @@ if [ -z "$CC" ]; then
125125
exit 1
126126
fi
127127

128-
# Only lld version >= 9 can be considered stable. lld doesn't support s390x.
129-
if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && [ "$build_arch" != "s390x" ]; then
128+
# Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0.
129+
if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && ([ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]); then
130130
if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
131131
LDFLAGS="-fuse-ld=lld"
132132
fi

‎eng/common/templates-official/job/job.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,11 @@ jobs:
206206
continueOnError: true
207207
condition: always()
208208
- ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}:
209-
- publish: artifacts/log
210-
artifact: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }}
211-
displayName: Publish logs
209+
- task: 1ES.PublishPipelineArtifact@1
210+
inputs:
211+
targetPath: 'artifacts/log'
212+
artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }}
213+
displayName: 'Publish logs'
212214
continueOnError: true
213215
condition: always()
214216

@@ -253,7 +255,9 @@ jobs:
253255
IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
254256

255257
- ${{ if eq(parameters.enableBuildRetry, 'true') }}:
256-
- publish: $(Build.SourcesDirectory)\eng\common\BuildConfiguration
257-
artifact: BuildConfiguration
258-
displayName: Publish build retry configuration
259-
continueOnError: true
258+
- task: 1ES.PublishPipelineArtifact@1
259+
inputs:
260+
targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration'
261+
artifactName: 'BuildConfiguration'
262+
displayName: 'Publish build retry configuration'
263+
continueOnError: true

‎eng/common/templates-official/job/publish-build-assets.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,16 @@ jobs:
9898
inputs:
9999
targetType: inline
100100
script: |
101-
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId)
102-
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)"
103-
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild)
101+
New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force
102+
$filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt"
103+
Add-Content -Path $filePath -Value $(BARBuildId)
104+
Add-Content -Path $filePath -Value "$(DefaultChannels)"
105+
Add-Content -Path $filePath -Value $(IsStableBuild)
104106
105107
- task: 1ES.PublishBuildArtifacts@1
106108
displayName: Publish ReleaseConfigs Artifact
107109
inputs:
108-
PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt'
110+
PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs'
109111
PublishLocation: Container
110112
ArtifactName: ReleaseConfigs
111113

‎eng/common/tools.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ function InstallDotNet([string] $dotnetRoot,
296296
if ($runtime -eq "aspnetcore") { $runtimePath = $runtimePath + "\Microsoft.AspNetCore.App" }
297297
if ($runtime -eq "windowsdesktop") { $runtimePath = $runtimePath + "\Microsoft.WindowsDesktop.App" }
298298
$runtimePath = $runtimePath + "\" + $version
299-
299+
300300
$dotnetVersionLabel = "runtime toolset '$runtime/$architecture v$version'"
301301

302302
if (Test-Path $runtimePath) {
@@ -608,7 +608,7 @@ function InitializeBuildTool() {
608608
} else {
609609
$initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework
610610
}
611-
611+
612612
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework }
613613
} elseif ($msbuildEngine -eq "vs") {
614614
try {

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"jdk": "11.0.22"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24159.1",
31-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24159.1"
30+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24165.6",
31+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24165.6"
3232
}
3333
}

0 commit comments

Comments
 (0)