Skip to content

Commit 065b047

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#4955)
[main] Update dependencies from dotnet/arcade
1 parent 132be2f commit 065b047

File tree

8 files changed

+19
-28
lines changed

8 files changed

+19
-28
lines changed

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -152,29 +152,29 @@
152152
</Dependency>
153153
</ProductDependencies>
154154
<ToolsetDependencies>
155-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25126.4">
155+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25154.6">
156156
<Uri>https://github.com/dotnet/arcade</Uri>
157-
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
157+
<Sha>36d3ce68f855c5902926f1e158d96364462c9adf</Sha>
158158
</Dependency>
159-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25126.4">
159+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25154.6">
160160
<Uri>https://github.com/dotnet/arcade</Uri>
161-
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
161+
<Sha>36d3ce68f855c5902926f1e158d96364462c9adf</Sha>
162162
</Dependency>
163-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25126.4">
163+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25154.6">
164164
<Uri>https://github.com/dotnet/arcade</Uri>
165-
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
165+
<Sha>36d3ce68f855c5902926f1e158d96364462c9adf</Sha>
166166
</Dependency>
167-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25126.4">
167+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25154.6">
168168
<Uri>https://github.com/dotnet/arcade</Uri>
169-
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
169+
<Sha>36d3ce68f855c5902926f1e158d96364462c9adf</Sha>
170170
</Dependency>
171-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25126.4">
171+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25154.6">
172172
<Uri>https://github.com/dotnet/arcade</Uri>
173-
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
173+
<Sha>36d3ce68f855c5902926f1e158d96364462c9adf</Sha>
174174
</Dependency>
175-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25126.4">
175+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25154.6">
176176
<Uri>https://github.com/dotnet/arcade</Uri>
177-
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
177+
<Sha>36d3ce68f855c5902926f1e158d96364462c9adf</Sha>
178178
</Dependency>
179179
</ToolsetDependencies>
180180
</Dependencies>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
</PropertyGroup>
1212
<PropertyGroup>
1313
<!-- arcade -->
14-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25126.4</MicrosoftDotNetBuildTasksArchivesVersion>
15-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25126.4</MicrosoftDotNetBuildTasksInstallersVersion>
14+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25154.6</MicrosoftDotNetBuildTasksArchivesVersion>
15+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25154.6</MicrosoftDotNetBuildTasksInstallersVersion>
1616
<!-- corefx -->
1717
<SystemDataDataSetExtensionsVersion>4.5.0</SystemDataDataSetExtensionsVersion>
1818
<!-- The SQL team had deprecated System.Data.SqlClient package and replaced it with Microsoft.Data.SqlClient.

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

Lines changed: 0 additions & 1 deletion
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‎

Lines changed: 0 additions & 4 deletions
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‎

Lines changed: 0 additions & 1 deletion
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‎

Lines changed: 0 additions & 4 deletions
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‎

Lines changed: 3 additions & 2 deletions
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‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
}
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25126.4",
12-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25126.4",
11+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25154.6",
12+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25154.6",
1313
"Microsoft.Build.NoTargets": "3.7.0",
1414
"Microsoft.Build.Traversal": "3.4.0"
1515
}

0 commit comments

Comments
 (0)