Skip to content

Commit 7df7fae

Browse files
[main] Update dependencies from dotnet/arcade (#5456)
[main] Update dependencies from dotnet/arcade
1 parent 8f24e45 commit 7df7fae

File tree

6 files changed

+29
-23
lines changed

6 files changed

+29
-23
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24158.3">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24170.7">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>e91ff1729192ebae270f0d42502da51eeb853741</Sha>
9+
<Sha>117337a1e7024e31b321d44d8b71a821e69c3967</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24158.3">
11+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24170.7">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>e91ff1729192ebae270f0d42502da51eeb853741</Sha>
13+
<Sha>117337a1e7024e31b321d44d8b71a821e69c3967</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24158.3">
15+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24170.7">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>e91ff1729192ebae270f0d42502da51eeb853741</Sha>
17+
<Sha>117337a1e7024e31b321d44d8b71a821e69c3967</Sha>
1818
</Dependency>
1919
</ToolsetDependencies>
2020
</Dependencies>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</PropertyGroup>
1919
<!-- Arcade dependencies -->
2020
<PropertyGroup>
21-
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.24158.3</MicrosoftDotNetGenFacadesPackageVersion>
22-
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24158.3</MicrosoftDotNetXUnitExtensionsPackageVersion>
21+
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.24170.7</MicrosoftDotNetGenFacadesPackageVersion>
22+
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24170.7</MicrosoftDotNetXUnitExtensionsPackageVersion>
2323
</PropertyGroup>
2424
<!-- CoreFx dependencies -->
2525
<PropertyGroup>

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

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": "9.0.100-preview.1.24101.2"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24158.3",
17+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24170.7",
1818
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5"
1919
}
2020
}

0 commit comments

Comments
 (0)