diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c4dce36d81..18a6dabc01 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,6 @@ + https://github.com/dotnet/binaryen @@ -235,33 +236,33 @@ https://github.com/dotnet/llvm-project d38f1dd01fff4127bb86afa86c1e5ac44154a1d7 - - https://github.com/dotnet/arcade - 76dd1b4eb3b15881da350de93805ea6ab936364c + + https://github.com/dotnet/dotnet + 721dc7a2a59416b21fc49447d264009d708d6000 - - https://github.com/dotnet/arcade - 76dd1b4eb3b15881da350de93805ea6ab936364c + + https://github.com/dotnet/dotnet + 721dc7a2a59416b21fc49447d264009d708d6000 - - https://github.com/dotnet/arcade - 76dd1b4eb3b15881da350de93805ea6ab936364c + + https://github.com/dotnet/dotnet + 721dc7a2a59416b21fc49447d264009d708d6000 - - https://github.com/dotnet/arcade - 76dd1b4eb3b15881da350de93805ea6ab936364c + + https://github.com/dotnet/dotnet + 721dc7a2a59416b21fc49447d264009d708d6000 - - https://github.com/dotnet/arcade - 76dd1b4eb3b15881da350de93805ea6ab936364c + + https://github.com/dotnet/dotnet + 721dc7a2a59416b21fc49447d264009d708d6000 - - https://github.com/dotnet/arcade - 76dd1b4eb3b15881da350de93805ea6ab936364c + + https://github.com/dotnet/dotnet + 721dc7a2a59416b21fc49447d264009d708d6000 - - https://github.com/dotnet/arcade - 76dd1b4eb3b15881da350de93805ea6ab936364c + + https://github.com/dotnet/dotnet + 721dc7a2a59416b21fc49447d264009d708d6000 diff --git a/eng/Versions.props b/eng/Versions.props index f5ad0ecb33..200604774f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,10 +57,11 @@ release - 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.119 + 10.0.0-beta.25223.119 + 10.0.0-beta.25223.119 + 10.0.0-beta.25223.119 + 10.0.0-beta.25223.119 1.1.87-gba258badda diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 2341706b06..d65c222c06 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -93,7 +93,9 @@ steps: $portableBuildArgs \ /p:DotNetBuildSourceOnly=true \ /p:DotNetBuildRepo=true \ - /p:AssetManifestFileName=$assetManifestFileName + /p:AssetManifestFileName=$assetManifestFileName \ + /p:SetUpSourceBuildIntermediateNupkgCache=false \ + /p:ReportPrebuiltUsage=false displayName: Build # Upload build logs for diagnosis. diff --git a/eng/common/cross/arm64/tizen/tizen.patch b/eng/common/cross/arm64/tizen/tizen.patch index af7c8be059..2cebc54738 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/install-debs.py b/eng/common/cross/install-debs.py old mode 100644 new mode 100755 diff --git a/eng/common/cross/tizen-build-rootfs.sh b/eng/common/cross/tizen-build-rootfs.sh old mode 100644 new mode 100755 diff --git a/eng/common/cross/tizen-fetch.sh b/eng/common/cross/tizen-fetch.sh old mode 100644 new mode 100755 index 28936ceef3..37c3a61f1d --- 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/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh old mode 100644 new mode 100755 diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh old mode 100644 new mode 100755 diff --git a/eng/common/sdk-task.sh b/eng/common/sdk-task.sh old mode 100644 new mode 100755 diff --git a/eng/workloads/workloads.csproj b/eng/workloads/workloads.csproj index 6bbaab384f..9249f50786 100644 --- a/eng/workloads/workloads.csproj +++ b/eng/workloads/workloads.csproj @@ -33,10 +33,10 @@ - + - + diff --git a/global.json b/global.json index ed65f9e760..800fcde9cb 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "10.0.100-preview.3.25201.16" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25217.1", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25217.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25223.119", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25223.119", "Microsoft.Build.Traversal": "3.4.0" } }