Skip to content

[main] Update dependencies from dotnet/arcade #113056

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

Merged
merged 3 commits into from
Mar 11, 2025
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
84 changes: 42 additions & 42 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,87 +84,87 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25125.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25125.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25125.2">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25125.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25125.2">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25125.2">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.25125.2">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25125.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25125.2">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25125.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25125.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25125.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25125.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25125.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25125.2">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25125.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25125.2">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25125.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25125.2">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25125.2">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="10.0.0-beta.25126.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -348,9 +348,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>cf1b2925785f504d4d52773bcab470044e35ea15</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25125.2">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25104.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -85,22 +85,22 @@
<!-- SDK dependencies (also used in wasm build tests -->
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-preview.3.25126.5</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25125.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25125.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25125.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25125.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25125.2</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25125.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25125.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25125.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25125.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25125.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25125.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25125.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25125.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25125.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25125.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25125.2</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25157.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25157.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25157.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25157.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25157.1</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25157.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25157.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25157.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25157.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25157.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25157.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25157.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25157.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25157.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25157.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25157.1</MicrosoftDotNetPackageTestingVersion>
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
<!-- NuGet dependencies -->
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
2 changes: 1 addition & 1 deletion eng/common/core-templates/steps/generate-sbom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ steps:
PackageName: ${{ parameters.packageName }}
BuildDropPath: ${{ parameters.buildDropPath }}
PackageVersion: ${{ parameters.packageVersion }}
ManifestDirPath: ${{ parameters.manifestDirPath }}
ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME)
${{ if ne(parameters.IgnoreDirectories, '') }}:
AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}'

Expand Down
20 changes: 14 additions & 6 deletions eng/common/generate-sbom-prep.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,26 @@ Param(

. $PSScriptRoot\pipeline-logging-functions.ps1

# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly
# with their own overwriting ours. So we create it as a sub directory of the requested manifest path.
$ArtifactName = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM"
$SafeArtifactName = $ArtifactName -replace '["/:<>\\|?@*"() ]', '_'
$SbomGenerationDir = Join-Path $ManifestDirPath $SafeArtifactName

Write-Host "Artifact name before : $ArtifactName"
Write-Host "Artifact name after : $SafeArtifactName"

Write-Host "Creating dir $ManifestDirPath"

# create directory for sbom manifest to be placed
if (!(Test-Path -path $ManifestDirPath))
if (!(Test-Path -path $SbomGenerationDir))
{
New-Item -ItemType Directory -path $ManifestDirPath
Write-Host "Successfully created directory $ManifestDirPath"
New-Item -ItemType Directory -path $SbomGenerationDir
Write-Host "Successfully created directory $SbomGenerationDir"
}
else{
Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
}

Write-Host "Updating artifact name"
$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_'
Write-Host "Artifact name $artifact_name"
Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name"
Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName"
17 changes: 11 additions & 6 deletions eng/common/generate-sbom-prep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,24 @@ done
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
. $scriptroot/pipeline-logging-functions.sh


# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
manifest_dir=$1

if [ ! -d "$manifest_dir" ] ; then
mkdir -p "$manifest_dir"
echo "Sbom directory created." $manifest_dir
# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly
# with their own overwriting ours. So we create it as a sub directory of the requested manifest path.
sbom_generation_dir="$manifest_dir/$safe_artifact_name"

if [ ! -d "$sbom_generation_dir" ] ; then
mkdir -p "$sbom_generation_dir"
echo "Sbom directory created." $sbom_generation_dir
else
Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
fi

artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
echo "Artifact name before : "$artifact_name
# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
echo "Artifact name after : "$safe_artifact_name
export ARTIFACT_NAME=$safe_artifact_name
echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name"
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
1 change: 1 addition & 0 deletions eng/common/templates-official/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
parameters:
PackageVersion: ${{ parameters.packageVersion }}
BuildDropPath: ${{ parameters.buildDropPath }}
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
publishArtifacts: false

# publish artifacts
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"dotnet": "10.0.100-preview.3.25125.5"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25125.2",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25125.2",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25125.2",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25157.1",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25157.1",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25157.1",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "10.0.0-preview.3.25152.4"
Expand Down
Loading