diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b07f8fd2752..fe11cd77b5cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -396,39 +396,39 @@ https://github.com/dotnet/runtime 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/arcade - 76dd1b4eb3b15881da350de93805ea6ab936364c + 36f91467d150caf4f8ca0008f039d746bc03017b - + https://github.com/dotnet/arcade - 76dd1b4eb3b15881da350de93805ea6ab936364c + 36f91467d150caf4f8ca0008f039d746bc03017b - + https://github.com/dotnet/arcade - 76dd1b4eb3b15881da350de93805ea6ab936364c + 36f91467d150caf4f8ca0008f039d746bc03017b - + https://github.com/dotnet/arcade - 76dd1b4eb3b15881da350de93805ea6ab936364c + 36f91467d150caf4f8ca0008f039d746bc03017b - + https://github.com/dotnet/arcade - 76dd1b4eb3b15881da350de93805ea6ab936364c + 36f91467d150caf4f8ca0008f039d746bc03017b - + https://github.com/dotnet/arcade - 76dd1b4eb3b15881da350de93805ea6ab936364c + 36f91467d150caf4f8ca0008f039d746bc03017b - + https://github.com/dotnet/arcade - 76dd1b4eb3b15881da350de93805ea6ab936364c + 36f91467d150caf4f8ca0008f039d746bc03017b - + https://github.com/dotnet/arcade - 76dd1b4eb3b15881da350de93805ea6ab936364c + 36f91467d150caf4f8ca0008f039d746bc03017b https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index bef0fd45671f..c3b435cc6d47 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -168,11 +168,11 @@ 6.2.4 6.2.4 - 10.0.0-beta.25217.1 - 10.0.0-beta.25217.1 - 10.0.0-beta.25217.1 - 10.0.0-beta.25217.1 - 10.0.0-beta.25217.1 + 10.0.0-beta.25223.1 + 10.0.0-beta.25223.1 + 10.0.0-beta.25223.1 + 10.0.0-beta.25223.1 + 10.0.0-beta.25223.1 10.0.621401 diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index e653d19971c9..bf35b78faa60 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -96,7 +96,7 @@ jobs: ${{ parameter.key }}: ${{ parameter.value }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: + - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, ''), eq(parameters.isAssetlessBuild, true)) }}: - template: ../job/publish-build-assets.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} @@ -112,7 +112,7 @@ jobs: - Source_Build_Complete runAsPublic: ${{ parameters.runAsPublic }} - publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }} + publishAssetsImmediately: ${{ or(parameters.publishAssetsImmediately, parameters.isAssetlessBuild) }} isAssetlessBuild: ${{ parameters.isAssetlessBuild }} enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} diff --git a/eng/common/cross/arm64/tizen/tizen.patch b/eng/common/cross/arm64/tizen/tizen.patch index af7c8be05906..2cebc547382e 100644 --- a/eng/common/cross/arm64/tizen/tizen.patch +++ b/eng/common/cross/arm64/tizen/tizen.patch @@ -5,5 +5,5 @@ diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so Use the shared library, but some functions are only in the static library, so try that secondarily. */ OUTPUT_FORMAT(elf64-littleaarch64) --GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib/ld-linux-aarch64.so.1 ) ) +-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-aarch64.so.1 ) ) +GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-aarch64.so.1 ) ) diff --git a/eng/common/cross/tizen-fetch.sh b/eng/common/cross/tizen-fetch.sh index 28936ceef3a7..37c3a61f1de8 100644 --- a/eng/common/cross/tizen-fetch.sh +++ b/eng/common/cross/tizen-fetch.sh @@ -156,13 +156,8 @@ fetch_tizen_pkgs() done } -if [ "$TIZEN_ARCH" == "riscv64" ]; then - BASE="Tizen-Base-RISCV" - UNIFIED="Tizen-Unified-RISCV" -else - BASE="Tizen-Base" - UNIFIED="Tizen-Unified" -fi +BASE="Tizen-Base" +UNIFIED="Tizen-Unified" Inform "Initialize ${TIZEN_ARCH} base" fetch_tizen_pkgs_init standard $BASE diff --git a/global.json b/global.json index ddeb9c2c869b..171ca830c311 100644 --- a/global.json +++ b/global.json @@ -27,9 +27,9 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25217.1", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25217.1", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25217.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25223.1", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25223.1", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25223.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" }