From 4b9be365d5ec00b6b3fa1e57e6f6d8f3620b59ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 30 Apr 2024 12:07:44 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20240429.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24226.3 -> To Version 9.0.0-beta.24229.1 --- eng/Version.Details.xml | 84 +++++++++---------- eng/Versions.props | 32 +++---- eng/common/native/init-distro-rid.sh | 18 +++- .../steps/publish-pipeline-artifacts.yml | 24 +++--- global.json | 6 +- 5 files changed, 90 insertions(+), 74 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4afd8464469d7..9aaf65a3ca51a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - 97e2f41e909dcabb1103fe98ba4540a246662187 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 - + https://github.com/dotnet/arcade - 97e2f41e909dcabb1103fe98ba4540a246662187 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 - + https://github.com/dotnet/arcade - 97e2f41e909dcabb1103fe98ba4540a246662187 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 - + https://github.com/dotnet/arcade - 97e2f41e909dcabb1103fe98ba4540a246662187 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 - + https://github.com/dotnet/arcade - 97e2f41e909dcabb1103fe98ba4540a246662187 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 - + https://github.com/dotnet/arcade - 97e2f41e909dcabb1103fe98ba4540a246662187 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 - + https://github.com/dotnet/arcade - 97e2f41e909dcabb1103fe98ba4540a246662187 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 - + https://github.com/dotnet/arcade - 97e2f41e909dcabb1103fe98ba4540a246662187 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 - + https://github.com/dotnet/arcade - 97e2f41e909dcabb1103fe98ba4540a246662187 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 - + https://github.com/dotnet/arcade - 97e2f41e909dcabb1103fe98ba4540a246662187 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 - + https://github.com/dotnet/arcade - 97e2f41e909dcabb1103fe98ba4540a246662187 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 - + https://github.com/dotnet/arcade - 97e2f41e909dcabb1103fe98ba4540a246662187 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 - + https://github.com/dotnet/arcade - 97e2f41e909dcabb1103fe98ba4540a246662187 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 - + https://github.com/dotnet/arcade - 97e2f41e909dcabb1103fe98ba4540a246662187 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 - + https://github.com/dotnet/arcade - 97e2f41e909dcabb1103fe98ba4540a246662187 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 - + https://github.com/dotnet/arcade - 97e2f41e909dcabb1103fe98ba4540a246662187 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 - + https://github.com/dotnet/arcade - 97e2f41e909dcabb1103fe98ba4540a246662187 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 - + https://github.com/dotnet/arcade - 97e2f41e909dcabb1103fe98ba4540a246662187 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 - + https://github.com/dotnet/arcade - 97e2f41e909dcabb1103fe98ba4540a246662187 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 - + https://github.com/dotnet/arcade - 97e2f41e909dcabb1103fe98ba4540a246662187 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness ec633d9ddbdb86dd3d772989889690821f790484 - + https://github.com/dotnet/arcade - 97e2f41e909dcabb1103fe98ba4540a246662187 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 241d20a5801b0..854ddc25ee07e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,22 +83,22 @@ 9.0.100-preview.5.24227.1 - 9.0.0-beta.24226.3 - 9.0.0-beta.24226.3 - 9.0.0-beta.24226.3 - 9.0.0-beta.24226.3 - 2.6.7-beta.24226.3 - 9.0.0-beta.24226.3 - 2.6.7-beta.24226.3 - 9.0.0-beta.24226.3 - 9.0.0-beta.24226.3 - 9.0.0-beta.24226.3 - 9.0.0-beta.24226.3 - 9.0.0-beta.24226.3 - 9.0.0-beta.24226.3 - 9.0.0-beta.24226.3 - 9.0.0-beta.24226.3 - 9.0.0-beta.24226.3 + 9.0.0-beta.24229.1 + 9.0.0-beta.24229.1 + 9.0.0-beta.24229.1 + 9.0.0-beta.24229.1 + 2.6.7-beta.24229.1 + 9.0.0-beta.24229.1 + 2.6.7-beta.24229.1 + 9.0.0-beta.24229.1 + 9.0.0-beta.24229.1 + 9.0.0-beta.24229.1 + 9.0.0-beta.24229.1 + 9.0.0-beta.24229.1 + 9.0.0-beta.24229.1 + 9.0.0-beta.24229.1 + 9.0.0-beta.24229.1 + 9.0.0-beta.24229.1 1.4.0 diff --git a/eng/common/native/init-distro-rid.sh b/eng/common/native/init-distro-rid.sh index 83ea7aab0e081..228be0b159862 100644 --- a/eng/common/native/init-distro-rid.sh +++ b/eng/common/native/init-distro-rid.sh @@ -20,6 +20,10 @@ getNonPortableDistroRid() # shellcheck disable=SC1091 if [ -e "${rootfsDir}/etc/os-release" ]; then . "${rootfsDir}/etc/os-release" + if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ] || [ "${ID}" = "ol" ]; then + VERSION_ID="${VERSION_ID%.*}" # Remove the last version digit for these distros + fi + if echo "${VERSION_ID:-}" | grep -qE '^([[:digit:]]|\.)+$'; then nonPortableRid="${ID}.${VERSION_ID}-${targetArch}" else @@ -44,7 +48,19 @@ getNonPortableDistroRid() nonPortableRid="android.$__android_sdk_version-${targetArch}" elif [ "$targetOs" = "illumos" ]; then __uname_version=$(uname -v) - nonPortableRid="illumos-${targetArch}" + case "$__uname_version" in + omnios-*) + __omnios_major_version=$(echo "$__uname_version" | cut -c9-10) + nonPortableRid="omnios.$__omnios_major_version-${targetArch}" + ;; + joyent_*) + __smartos_major_version=$(echo "$__uname_version" | cut -c9-10) + nonPortableRid="smartos.$__smartos_major_version-${targetArch}" + ;; + *) + nonPortableRid="illumos-${targetArch}" + ;; + esac elif [ "$targetOs" = "solaris" ]; then __uname_version=$(uname -v) __solaris_major_version=$(echo "$__uname_version" | cut -d'.' -f1) diff --git a/eng/common/templates/steps/publish-pipeline-artifacts.yml b/eng/common/templates/steps/publish-pipeline-artifacts.yml index 88c56354128c0..815c86038e3ab 100644 --- a/eng/common/templates/steps/publish-pipeline-artifacts.yml +++ b/eng/common/templates/steps/publish-pipeline-artifacts.yml @@ -19,16 +19,16 @@ steps: ${{ if parameters.args.continueOnError }}: continueOnError: ${{ parameters.args.continueOnError }} inputs: - TargetPath: ${{ parameters.args.TargetPath }} - ${{ if parameters.args.ArtifactName }}: - ArtifactName: ${{ parameters.args.ArtifactName }} - ${{ if parameters.args.PublishLocation }}: - PublishLocation: ${{ parameters.args.PublishLocation }} - ${{ if parameters.args.FileSharePath }}: - FileSharePath: ${{ parameters.args.FileSharePath }} + targetPath: ${{ parameters.args.targetPath }} + ${{ if parameters.args.artifactName }}: + artifactName: ${{ parameters.args.artifactName }} + ${{ if parameters.args.publishLocation }}: + publishLocation: ${{ parameters.args.publishLocation }} + ${{ if parameters.args.fileSharePath }}: + fileSharePath: ${{ parameters.args.fileSharePath }} ${{ if parameters.args.Parallel }}: - Parallel: ${{ parameters.args.Parallel }} - ${{ if parameters.args.ParallelCount }}: - ParallelCount: ${{ parameters.args.ParallelCount }} - ${{ if parameters.args.Properties }}: - Properties: ${{ properties.args.Properties }} \ No newline at end of file + parallel: ${{ parameters.args.Parallel }} + ${{ if parameters.args.parallelCount }}: + parallelCount: ${{ parameters.args.parallelCount }} + ${{ if parameters.args.properties }}: + properties: ${{ properties.args.properties }} \ No newline at end of file diff --git a/global.json b/global.json index 8cafaf799ea2c..55e7657f79c43 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-preview.3.24204.13" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24226.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24226.3", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24226.3", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24229.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24229.1", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24229.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-preview.4.24229.1" From 1e4396c4144c70bb3f4e2c42e0f6bef4ba02ff69 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 30 Apr 2024 20:23:57 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/arcade build 20240429.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24226.3 -> To Version 9.0.0-beta.24229.1