Skip to content

Commit b103963

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20250307.1 (#1366)
[main] Update dependencies from dotnet/arcade
1 parent 359511d commit b103963

File tree

7 files changed

+9
-18
lines changed

7 files changed

+9
-18
lines changed

eng/Version.Details.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25126.4">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25157.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
8+
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25126.4">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25157.1">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
12+
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
1313
</Dependency>
1414
</ToolsetDependencies>
1515
</Dependencies>

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

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ parameters:
2323
enablePublishBuildArtifacts: false
2424
enablePublishBuildAssets: false
2525
enablePublishTestResults: false
26-
enablePublishUsingPipelines: false
2726
enableBuildRetry: false
2827
mergeTestResults: false
2928
testRunTitle: ''

eng/common/core-templates/job/publish-build-assets.yml

-4
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ parameters:
2020
# if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects.
2121
runAsPublic: false
2222

23-
# Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
24-
publishUsingPipelines: false
25-
2623
# Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
2724
publishAssetsImmediately: false
2825

@@ -96,7 +93,6 @@ jobs:
9693
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
9794
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
9895
/p:MaestroApiEndpoint=https://maestro.dot.net
99-
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
10096
/p:OfficialBuildId=$(Build.BuildNumber)
10197
condition: ${{ parameters.condition }}
10298
continueOnError: ${{ parameters.continueOnError }}

eng/common/core-templates/jobs/codeql-build.yml

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ jobs:
1515
enablePublishBuildArtifacts: false
1616
enablePublishTestResults: false
1717
enablePublishBuildAssets: false
18-
enablePublishUsingPipelines: false
1918
enableTelemetry: true
2019

2120
variables:

eng/common/core-templates/jobs/jobs.yml

-4
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ parameters:
55
# Optional: Include PublishBuildArtifacts task
66
enablePublishBuildArtifacts: false
77

8-
# Optional: Enable publishing using release pipelines
9-
enablePublishUsingPipelines: false
10-
118
# Optional: Enable running the source-build jobs to build repo from source
129
enableSourceBuild: false
1310

@@ -112,7 +109,6 @@ jobs:
112109
- Source_Build_Complete
113110

114111
runAsPublic: ${{ parameters.runAsPublic }}
115-
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
116112
publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }}
117113
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
118114
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}

eng/common/native/install-dependencies.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ case "$os" in
2727
libssl-dev libkrb5-dev pigz cpio
2828

2929
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
30-
elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ]; then
31-
dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
30+
elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ]; then
31+
pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)"
32+
$pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
3233
elif [ "$ID" = "alpine" ]; then
3334
apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio
3435
else

global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dotnet": "10.0.100-preview.3.25125.5"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25126.4",
7-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25126.4"
6+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25157.1",
7+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25157.1"
88
}
99
}

0 commit comments

Comments
 (0)