Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from dotnet/arcade #47272

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -640,34 +640,34 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25126.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25154.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
<Sha>36d3ce68f855c5902926f1e158d96364462c9adf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25126.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25154.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
<Sha>36d3ce68f855c5902926f1e158d96364462c9adf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25126.4">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25154.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
<Sha>36d3ce68f855c5902926f1e158d96364462c9adf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25126.4">
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25154.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
<Sha>36d3ce68f855c5902926f1e158d96364462c9adf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25126.4">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25154.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
<Sha>36d3ce68f855c5902926f1e158d96364462c9adf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25126.4">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25154.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
<Sha>36d3ce68f855c5902926f1e158d96364462c9adf</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25126.4">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25154.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
<Sha>36d3ce68f855c5902926f1e158d96364462c9adf</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.3.25153.8">
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25126.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25126.4</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25126.4</MicrosoftDotNetXliffTasksVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25126.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25154.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25154.6</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25154.6</MicrosoftDotNetXliffTasksVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25154.6</MicrosoftDotNetXUnitExtensionsVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sourcelink -->
Expand Down
1 change: 0 additions & 1 deletion eng/common/core-templates/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ parameters:
enablePublishBuildArtifacts: false
enablePublishBuildAssets: false
enablePublishTestResults: false
enablePublishUsingPipelines: false
enableBuildRetry: false
mergeTestResults: false
testRunTitle: ''
Expand Down
4 changes: 0 additions & 4 deletions eng/common/core-templates/job/publish-build-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ parameters:
# if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects.
runAsPublic: false

# Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
publishUsingPipelines: false

# Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
publishAssetsImmediately: false

Expand Down Expand Up @@ -96,7 +93,6 @@ jobs:
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
/p:MaestroApiEndpoint=https://maestro.dot.net
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
/p:OfficialBuildId=$(Build.BuildNumber)
condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}
Expand Down
1 change: 0 additions & 1 deletion eng/common/core-templates/jobs/codeql-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ jobs:
enablePublishBuildArtifacts: false
enablePublishTestResults: false
enablePublishBuildAssets: false
enablePublishUsingPipelines: false
enableTelemetry: true

variables:
Expand Down
4 changes: 0 additions & 4 deletions eng/common/core-templates/jobs/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ parameters:
# Optional: Include PublishBuildArtifacts task
enablePublishBuildArtifacts: false

# Optional: Enable publishing using release pipelines
enablePublishUsingPipelines: false

# Optional: Enable running the source-build jobs to build repo from source
enableSourceBuild: false

Expand Down Expand Up @@ -112,7 +109,6 @@ jobs:
- Source_Build_Complete

runAsPublic: ${{ parameters.runAsPublic }}
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }}
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
Expand Down
5 changes: 3 additions & 2 deletions eng/common/native/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ case "$os" in
libssl-dev libkrb5-dev pigz cpio

localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ]; then
dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ]; then
pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)"
$pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
elif [ "$ID" = "alpine" ]; then
apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio
else
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"cmake": "latest"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25126.4",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25126.4",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25154.6",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25154.6",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
}
Expand Down
Loading