Skip to content

Commit 4a3a498

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build (#7075)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24159.1 -> To Version 9.0.0-beta.24165.3 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 5025830 commit 4a3a498

File tree

6 files changed

+37
-31
lines changed

6 files changed

+37
-31
lines changed

‎eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,33 @@
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24159.1">
10+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24165.3">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>f4538b1f8ff5ceb197aea509f3f61872b217b09e</Sha>
12+
<Sha>812d978c303174dc1aa305d7359e79053d7d4971</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24159.1">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24165.3">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>f4538b1f8ff5ceb197aea509f3f61872b217b09e</Sha>
16+
<Sha>812d978c303174dc1aa305d7359e79053d7d4971</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24159.1">
18+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24165.3">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>f4538b1f8ff5ceb197aea509f3f61872b217b09e</Sha>
20+
<Sha>812d978c303174dc1aa305d7359e79053d7d4971</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24159.1">
22+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24165.3">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>f4538b1f8ff5ceb197aea509f3f61872b217b09e</Sha>
24+
<Sha>812d978c303174dc1aa305d7359e79053d7d4971</Sha>
2525
</Dependency>
26-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.24159.1">
26+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.24165.3">
2727
<Uri>https://github.com/dotnet/arcade</Uri>
28-
<Sha>f4538b1f8ff5ceb197aea509f3f61872b217b09e</Sha>
28+
<Sha>812d978c303174dc1aa305d7359e79053d7d4971</Sha>
2929
</Dependency>
30-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24159.1">
30+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24165.3">
3131
<Uri>https://github.com/dotnet/arcade</Uri>
32-
<Sha>f4538b1f8ff5ceb197aea509f3f61872b217b09e</Sha>
32+
<Sha>812d978c303174dc1aa305d7359e79053d7d4971</Sha>
3333
</Dependency>
34-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24159.1">
34+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24165.3">
3535
<Uri>https://github.com/dotnet/arcade</Uri>
36-
<Sha>f4538b1f8ff5ceb197aea509f3f61872b217b09e</Sha>
36+
<Sha>812d978c303174dc1aa305d7359e79053d7d4971</Sha>
3737
</Dependency>
3838
</ToolsetDependencies>
3939
</Dependencies>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<DotNetRuntime80Version>8.0.1</DotNetRuntime80Version>
8080
<FluentAssertionVersion>5.10.2</FluentAssertionVersion>
8181
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23431.1</MicrosoftCodeAnalysisTestingVersion>
82-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24159.1</MicrosoftDotNetXUnitExtensionsVersion>
82+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24165.3</MicrosoftDotNetXUnitExtensionsVersion>
8383
<MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
8484
<MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
8585
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>

‎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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
}
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24159.1",
17-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24159.1",
16+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24165.3",
17+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24165.3",
1818
"Microsoft.Build.NoTargets": "3.7.0",
1919
"Microsoft.Build.Traversal": "3.2.0"
2020
}

0 commit comments

Comments
 (0)