From 91a95715049160ee8a997383525d173419fa351c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Dec 2024 13:19:32 +0000 Subject: [PATCH 01/14] Update dependencies from https://github.com/dotnet/arcade build 20241205.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24604.4 -> To Version 10.0.0-beta.24605.1 --- eng/Version.Details.xml | 28 +++++++++---------- eng/Versions.props | 8 +++--- .../steps/get-delegation-sas.yml | 11 +------- global.json | 4 +-- 4 files changed, 21 insertions(+), 30 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9e7956f161bf..165d22e02f81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -589,34 +589,34 @@ - + https://github.com/dotnet/arcade - 45d845e04c05fbe5da9838c454bbc3af1df6be81 + 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed - + https://github.com/dotnet/arcade - 45d845e04c05fbe5da9838c454bbc3af1df6be81 + 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed - + https://github.com/dotnet/arcade - 45d845e04c05fbe5da9838c454bbc3af1df6be81 + 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed - + https://github.com/dotnet/arcade - 45d845e04c05fbe5da9838c454bbc3af1df6be81 + 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed - + https://github.com/dotnet/arcade - 45d845e04c05fbe5da9838c454bbc3af1df6be81 + 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed - + https://github.com/dotnet/arcade - 45d845e04c05fbe5da9838c454bbc3af1df6be81 + 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed - + https://github.com/dotnet/arcade - 45d845e04c05fbe5da9838c454bbc3af1df6be81 + 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed diff --git a/eng/Versions.props b/eng/Versions.props index 84eea613ea43..7862ce9f5f73 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -277,10 +277,10 @@ - 10.0.0-beta.24604.4 - 10.0.0-beta.24604.4 - 10.0.0-beta.24604.4 - 10.0.0-beta.24604.4 + 10.0.0-beta.24605.1 + 10.0.0-beta.24605.1 + 10.0.0-beta.24605.1 + 10.0.0-beta.24605.1 diff --git a/eng/common/core-templates/steps/get-delegation-sas.yml b/eng/common/core-templates/steps/get-delegation-sas.yml index 9db5617ea7de..d2901470a7f0 100644 --- a/eng/common/core-templates/steps/get-delegation-sas.yml +++ b/eng/common/core-templates/steps/get-delegation-sas.yml @@ -31,16 +31,7 @@ steps: # Calculate the expiration of the SAS token and convert to UTC $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") - # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads - # of correlation payloads. https://github.com/dotnet/dnceng/issues/3484 - $sas = "" - do { - $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv - if ($LASTEXITCODE -ne 0) { - Write-Error "Failed to generate SAS token." - exit 1 - } - } while($sas.IndexOf('/') -ne -1) + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv if ($LASTEXITCODE -ne 0) { Write-Error "Failed to generate SAS token." diff --git a/global.json b/global.json index 3084f6c449d8..10835cf4cb30 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24604.4", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24604.4", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24605.1", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24605.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 043eb0b76529ba7da208b8f5b6a9ff1d26eddd09 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 7 Dec 2024 13:21:22 +0000 Subject: [PATCH 02/14] Update dependencies from https://github.com/dotnet/arcade build 20241206.6 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24604.4 -> To Version 10.0.0-beta.24606.6 --- eng/Version.Details.xml | 28 +++++++++---------- eng/Versions.props | 8 +++--- .../core-templates/steps/source-build.yml | 2 +- eng/common/cross/build-rootfs.sh | 8 +++--- global.json | 6 ++-- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 165d22e02f81..3c60c6c59245 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -589,34 +589,34 @@ - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 61b8f746424762d2e3173ebfaab19346224d591c - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 61b8f746424762d2e3173ebfaab19346224d591c - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 61b8f746424762d2e3173ebfaab19346224d591c - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 61b8f746424762d2e3173ebfaab19346224d591c - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 61b8f746424762d2e3173ebfaab19346224d591c - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 61b8f746424762d2e3173ebfaab19346224d591c - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 61b8f746424762d2e3173ebfaab19346224d591c diff --git a/eng/Versions.props b/eng/Versions.props index 7862ce9f5f73..9a0cfa3e892e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -277,10 +277,10 @@ - 10.0.0-beta.24605.1 - 10.0.0-beta.24605.1 - 10.0.0-beta.24605.1 - 10.0.0-beta.24605.1 + 10.0.0-beta.24606.6 + 10.0.0-beta.24606.6 + 10.0.0-beta.24606.6 + 10.0.0-beta.24606.6 diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 4da05afe0544..f9ba1625c20f 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -78,7 +78,7 @@ steps: portableBuildArgs= if [ '${{ parameters.platform.portableBuild }}' != '' ]; then - portableBuildArgs='/p:PortabelBuild=${{ parameters.platform.portableBuild }}' + portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}' fi ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 20ae8c28687b..096bfe51f15b 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -73,8 +73,8 @@ __AlpinePackages+=" krb5-dev" __AlpinePackages+=" openssl-dev" __AlpinePackages+=" zlib-dev" -__FreeBSDBase="13.3-RELEASE" -__FreeBSDPkg="1.17.0" +__FreeBSDBase="13.4-RELEASE" +__FreeBSDPkg="1.21.3" __FreeBSDABI="13" __FreeBSDPackages="libunwind" __FreeBSDPackages+=" icu" @@ -371,7 +371,7 @@ while :; do ;; freebsd14) __CodeName=freebsd - __FreeBSDBase="14.0-RELEASE" + __FreeBSDBase="14.2-RELEASE" __FreeBSDABI="14" __SkipUnmount=1 ;; @@ -574,7 +574,7 @@ elif [[ "$__CodeName" == "freebsd" ]]; then curl -SL "https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz" | tar -C "$__RootfsDir" -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version fi echo "ABI = \"FreeBSD:${__FreeBSDABI}:${__FreeBSDMachineArch}\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > "${__RootfsDir}"/usr/local/etc/pkg.conf - echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"${__RootfsDir}/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf + echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf mkdir -p "$__RootfsDir"/tmp # get and build package manager if [[ "$__hasWget" == 1 ]]; then diff --git a/global.json b/global.json index 10835cf4cb30..e769d42d40bb 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "10.0.100-alpha.1.24551.9", + "dotnet": "10.0.100-alpha.1.24573.1", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)" @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24605.1", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24605.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24606.6", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24606.6", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 1274a9ffa09415dcbcb81709f22d5d135756b152 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 10 Dec 2024 09:58:46 +0100 Subject: [PATCH 03/14] Delete src/SourceBuild/patches/arcade/0001-Update to .NET 10 SDK and TFM to net10.0 in arcade.patch --- ... 10 SDK and TFM to net10.0 in arcade.patch | 110 ------------------ 1 file changed, 110 deletions(-) delete mode 100644 src/SourceBuild/patches/arcade/0001-Update to .NET 10 SDK and TFM to net10.0 in arcade.patch diff --git a/src/SourceBuild/patches/arcade/0001-Update to .NET 10 SDK and TFM to net10.0 in arcade.patch b/src/SourceBuild/patches/arcade/0001-Update to .NET 10 SDK and TFM to net10.0 in arcade.patch deleted file mode 100644 index 4b49c0b4ed4e..000000000000 --- a/src/SourceBuild/patches/arcade/0001-Update to .NET 10 SDK and TFM to net10.0 in arcade.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Viktor Hofer -Date: Wed, 6 Nov 2024 16:43:26 +0000 -Subject: [PATCH] Update to .NET 10 SDK and TFM to net10.0 in arcade - -Backport: https://github.com/dotnet/arcade/pull/15221 ---- - Directory.Build.props | 5 +++++ - global.json | 4 ++-- - .../src/build/Packaging.targets | 4 ++++ - .../Sdk/tools/dotnet-cli/DotNetCli.props | 2 +- - .../Sdk/tools/xunit-runner/XUnitRunner.targets | 2 +- - .../Microsoft.DotNet.XliffTasks.csproj | 4 ---- - tests/UnitTests.proj | 5 +++-- - 7 files changed, 16 insertions(+), 10 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 9d84f1dc6..b25de0091 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -17,4 +17,9 @@ - - $(WarningsNotAsErrors);NU1901;NU1902;NU1903;NU1904 -+ -+ net10.0 -+ net9.0 -+ $(NetCurrent) -+ $(NetToolCurrent) - - -diff --git a/global.json b/global.json -index af88ae5bf..904f8d03d 100644 ---- a/global.json -+++ b/global.json -@@ -1,9 +1,9 @@ - { - "sdk": { -- "version": "9.0.100", -+ "version": "10.0.100-alpha.1.24551.9", - "rollForward": "latestFeature" - }, - "tools": { -- "dotnet": "9.0.100" -+ "dotnet": "10.0.100-alpha.1.24551.9" - }, - "msbuild-sdks": { -diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets -index b94b6736d..e0fadabb2 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets -+++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets -@@ -955,4 +955,8 @@ - @(NETCoreApp90RIDs) - -+ -+ -+ @(NETCoreApp100RIDs) -+ - - -diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props -index 63552b1ed..15d5a63aa 100644 ---- a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props -+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props -@@ -4,5 +4,5 @@ - - false -- 9.0.0 -+ 10.0.0-alpha.2.24531.4 - runtime - $(BundledNETCoreAppPackageVersion) -diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets -index 0ae8d1482..9312e2672 100644 ---- a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets -+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets -@@ -3,5 +3,5 @@ - - -- net9.0 -+ net10.0 - netcoreapp2.0 - -diff --git a/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj b/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj -index 1059c3bc4..165a4a7d5 100644 ---- a/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj -+++ b/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj -@@ -2,8 +2,4 @@ - - -- - $(NetToolMinimum);$(NetFrameworkToolCurrent) - true -diff --git a/tests/UnitTests.proj b/tests/UnitTests.proj -index 910ccf3b0..ad85e4bac 100644 ---- a/tests/UnitTests.proj -+++ b/tests/UnitTests.proj -@@ -117,8 +117,9 @@ - - -- -+ -+ - - From 19c2f82e3592e474058d106be4b0282420d6121e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 Dec 2024 13:21:43 +0000 Subject: [PATCH 04/14] Update dependencies from https://github.com/dotnet/arcade build 20241210.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24604.4 -> To Version 10.0.0-beta.24610.1 --- eng/Version.Details.xml | 28 +++---- eng/Versions.props | 8 +- eng/common/cross/toolchain.cmake | 138 ++++++++++++------------------- global.json | 4 +- 4 files changed, 75 insertions(+), 103 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 51ef4d2be594..a96d981eb4ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -589,34 +589,34 @@ - + https://github.com/dotnet/arcade - 61b8f746424762d2e3173ebfaab19346224d591c + bdea4c2fa4851874b372af1c90d4bd2ec51ad499 - + https://github.com/dotnet/arcade - 61b8f746424762d2e3173ebfaab19346224d591c + bdea4c2fa4851874b372af1c90d4bd2ec51ad499 - + https://github.com/dotnet/arcade - 61b8f746424762d2e3173ebfaab19346224d591c + bdea4c2fa4851874b372af1c90d4bd2ec51ad499 - + https://github.com/dotnet/arcade - 61b8f746424762d2e3173ebfaab19346224d591c + bdea4c2fa4851874b372af1c90d4bd2ec51ad499 - + https://github.com/dotnet/arcade - 61b8f746424762d2e3173ebfaab19346224d591c + bdea4c2fa4851874b372af1c90d4bd2ec51ad499 - + https://github.com/dotnet/arcade - 61b8f746424762d2e3173ebfaab19346224d591c + bdea4c2fa4851874b372af1c90d4bd2ec51ad499 - + https://github.com/dotnet/arcade - 61b8f746424762d2e3173ebfaab19346224d591c + bdea4c2fa4851874b372af1c90d4bd2ec51ad499 diff --git a/eng/Versions.props b/eng/Versions.props index aa685748b4d8..364ca0f6071c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -277,10 +277,10 @@ - 10.0.0-beta.24606.6 - 10.0.0-beta.24606.6 - 10.0.0-beta.24606.6 - 10.0.0-beta.24606.6 + 10.0.0-beta.24610.1 + 10.0.0-beta.24610.1 + 10.0.0-beta.24610.1 + 10.0.0-beta.24610.1 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 9a4e285a5ae3..deac538e6905 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -40,7 +40,7 @@ if(TARGET_ARCH_NAME STREQUAL "arm") set(TOOLCHAIN "arm-linux-gnueabihf") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0") + set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf") endif() elseif(TARGET_ARCH_NAME STREQUAL "arm64") set(CMAKE_SYSTEM_PROCESSOR aarch64) @@ -49,7 +49,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64") elseif(LINUX) set(TOOLCHAIN "aarch64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0") + set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu") endif() elseif(FREEBSD) set(triple "aarch64-unknown-freebsd12") @@ -58,7 +58,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "armel") set(CMAKE_SYSTEM_PROCESSOR armv7l) set(TOOLCHAIN "arm-linux-gnueabi") if(TIZEN) - set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0") + set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi") endif() elseif(TARGET_ARCH_NAME STREQUAL "armv6") set(CMAKE_SYSTEM_PROCESSOR armv6l) @@ -81,7 +81,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "riscv64") else() set(TOOLCHAIN "riscv64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu/13.1.0") + set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu") endif() endif() elseif(TARGET_ARCH_NAME STREQUAL "s390x") @@ -98,7 +98,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64") elseif(LINUX) set(TOOLCHAIN "x86_64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0") + set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu") endif() elseif(FREEBSD) set(triple "x86_64-unknown-freebsd12") @@ -115,7 +115,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") set(TOOLCHAIN "i686-linux-gnu") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0") + set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu") endif() else() message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!") @@ -127,32 +127,46 @@ endif() # Specify include paths if(TIZEN) - if(TARGET_ARCH_NAME STREQUAL "arm") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7hl-tizen-linux-gnueabihf) - endif() - if(TARGET_ARCH_NAME STREQUAL "armel") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi) - endif() - if(TARGET_ARCH_NAME STREQUAL "arm64") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/aarch64-tizen-linux-gnu) - endif() - if(TARGET_ARCH_NAME STREQUAL "x86") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/i586-tizen-linux-gnu) - endif() - if(TARGET_ARCH_NAME STREQUAL "x64") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/x86_64-tizen-linux-gnu) - endif() - if(TARGET_ARCH_NAME STREQUAL "riscv64") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/riscv64-tizen-linux-gnu) + function(find_toolchain_dir prefix) + # Dynamically find the version subdirectory + file(GLOB DIRECTORIES "${prefix}/*") + list(GET DIRECTORIES 0 FIRST_MATCH) + get_filename_component(TOOLCHAIN_VERSION ${FIRST_MATCH} NAME) + + set(TIZEN_TOOLCHAIN_PATH "${prefix}/${TOOLCHAIN_VERSION}" PARENT_SCOPE) + endfunction() + + if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$") + find_toolchain_dir("${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + else() + find_toolchain_dir("${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") endif() + + message(STATUS "TIZEN_TOOLCHAIN_PATH set to: ${TIZEN_TOOLCHAIN_PATH}") + + include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++) + include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++/${TIZEN_TOOLCHAIN}) endif() +function(locate_toolchain_exec exec var) + set(TOOLSET_PREFIX ${TOOLCHAIN}-) + string(TOUPPER ${exec} EXEC_UPPERCASE) + if(NOT "$ENV{CLR_${EXEC_UPPERCASE}}" STREQUAL "") + set(${var} "$ENV{CLR_${EXEC_UPPERCASE}}" PARENT_SCOPE) + return() + endif() + + find_program(EXEC_LOCATION_${exec} + NAMES + "${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}" + "${TOOLSET_PREFIX}${exec}") + + if (EXEC_LOCATION_${exec} STREQUAL "EXEC_LOCATION_${exec}-NOTFOUND") + message(FATAL_ERROR "Unable to find toolchain executable. Name: ${exec}, Prefix: ${TOOLSET_PREFIX}.") + endif() + set(${var} ${EXEC_LOCATION_${exec}} PARENT_SCOPE) +endfunction() + if(ANDROID) if(TARGET_ARCH_NAME STREQUAL "arm") set(ANDROID_ABI armeabi-v7a) @@ -183,66 +197,24 @@ elseif(FREEBSD) set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fuse-ld=lld") elseif(ILLUMOS) set(CMAKE_SYSROOT "${CROSS_ROOTFS}") + set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}") + set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp") + set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp") include_directories(SYSTEM ${CROSS_ROOTFS}/include) - set(TOOLSET_PREFIX ${TOOLCHAIN}-) - function(locate_toolchain_exec exec var) - string(TOUPPER ${exec} EXEC_UPPERCASE) - if(NOT "$ENV{CLR_${EXEC_UPPERCASE}}" STREQUAL "") - set(${var} "$ENV{CLR_${EXEC_UPPERCASE}}" PARENT_SCOPE) - return() - endif() - - find_program(EXEC_LOCATION_${exec} - NAMES - "${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}" - "${TOOLSET_PREFIX}${exec}") - - if (EXEC_LOCATION_${exec} STREQUAL "EXEC_LOCATION_${exec}-NOTFOUND") - message(FATAL_ERROR "Unable to find toolchain executable. Name: ${exec}, Prefix: ${TOOLSET_PREFIX}.") - endif() - set(${var} ${EXEC_LOCATION_${exec}} PARENT_SCOPE) - endfunction() - - set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}") - locate_toolchain_exec(gcc CMAKE_C_COMPILER) locate_toolchain_exec(g++ CMAKE_CXX_COMPILER) - - set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp") - set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp") elseif(HAIKU) set(CMAKE_SYSROOT "${CROSS_ROOTFS}") set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin") - - set(TOOLSET_PREFIX ${TOOLCHAIN}-) - function(locate_toolchain_exec exec var) - string(TOUPPER ${exec} EXEC_UPPERCASE) - if(NOT "$ENV{CLR_${EXEC_UPPERCASE}}" STREQUAL "") - set(${var} "$ENV{CLR_${EXEC_UPPERCASE}}" PARENT_SCOPE) - return() - endif() - - find_program(EXEC_LOCATION_${exec} - NAMES - "${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}" - "${TOOLSET_PREFIX}${exec}") - - if (EXEC_LOCATION_${exec} STREQUAL "EXEC_LOCATION_${exec}-NOTFOUND") - message(FATAL_ERROR "Unable to find toolchain executable. Name: ${exec}, Prefix: ${TOOLSET_PREFIX}.") - endif() - set(${var} ${EXEC_LOCATION_${exec}} PARENT_SCOPE) - endfunction() - set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}") + set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp") + set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp") locate_toolchain_exec(gcc CMAKE_C_COMPILER) locate_toolchain_exec(g++ CMAKE_CXX_COMPILER) - set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp") - set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp") - # let CMake set up the correct search paths include(Platform/Haiku) else() @@ -272,21 +244,21 @@ endif() if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$") if(TIZEN) - add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib") - add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}") endif() elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$") if(TIZEN) - add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64") - add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib64") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64") - add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-Wl,--rpath-link=${TIZEN_TOOLCHAIN_PATH}") endif() elseif(TARGET_ARCH_NAME STREQUAL "s390x") add_toolchain_linker_flag("--target=${TOOLCHAIN}") @@ -297,10 +269,10 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") endif() add_toolchain_linker_flag(-m32) if(TIZEN) - add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib") - add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}") endif() elseif(ILLUMOS) add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64") diff --git a/global.json b/global.json index e769d42d40bb..3eef7e7e3774 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24606.6", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24606.6", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24610.1", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24610.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 18652f2af5a18a0a935b3c2445dcfae9597c995f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Dec 2024 13:20:34 +0000 Subject: [PATCH 05/14] Update dependencies from https://github.com/dotnet/arcade build 20241210.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24604.4 -> To Version 10.0.0-beta.24610.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- global.json | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a96d981eb4ec..0ad21db3db47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -589,34 +589,34 @@ - + https://github.com/dotnet/arcade - bdea4c2fa4851874b372af1c90d4bd2ec51ad499 + d5c8bb8726b46b5867961f5d8f56f1b13e72dcb9 - + https://github.com/dotnet/arcade - bdea4c2fa4851874b372af1c90d4bd2ec51ad499 + d5c8bb8726b46b5867961f5d8f56f1b13e72dcb9 - + https://github.com/dotnet/arcade - bdea4c2fa4851874b372af1c90d4bd2ec51ad499 + d5c8bb8726b46b5867961f5d8f56f1b13e72dcb9 - + https://github.com/dotnet/arcade - bdea4c2fa4851874b372af1c90d4bd2ec51ad499 + d5c8bb8726b46b5867961f5d8f56f1b13e72dcb9 - + https://github.com/dotnet/arcade - bdea4c2fa4851874b372af1c90d4bd2ec51ad499 + d5c8bb8726b46b5867961f5d8f56f1b13e72dcb9 - + https://github.com/dotnet/arcade - bdea4c2fa4851874b372af1c90d4bd2ec51ad499 + d5c8bb8726b46b5867961f5d8f56f1b13e72dcb9 - + https://github.com/dotnet/arcade - bdea4c2fa4851874b372af1c90d4bd2ec51ad499 + d5c8bb8726b46b5867961f5d8f56f1b13e72dcb9 diff --git a/eng/Versions.props b/eng/Versions.props index 364ca0f6071c..9026d64e6e92 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -277,10 +277,10 @@ - 10.0.0-beta.24610.1 - 10.0.0-beta.24610.1 - 10.0.0-beta.24610.1 - 10.0.0-beta.24610.1 + 10.0.0-beta.24610.2 + 10.0.0-beta.24610.2 + 10.0.0-beta.24610.2 + 10.0.0-beta.24610.2 diff --git a/global.json b/global.json index 3eef7e7e3774..5b091207e264 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24610.1", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24610.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24610.2", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24610.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 09aef354aaad493c11069be0c17f8373f7f4d5ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Dec 2024 13:20:03 +0000 Subject: [PATCH 06/14] Update dependencies from https://github.com/dotnet/arcade build 20241212.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24604.4 -> To Version 10.0.0-beta.24612.1 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- eng/common/cross/build-rootfs.sh | 14 +++----------- eng/common/cross/toolchain.cmake | 11 +++++++++-- global.json | 4 ++-- 5 files changed, 32 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ad21db3db47..ca2ee165bc57 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -589,34 +589,34 @@ - + https://github.com/dotnet/arcade - d5c8bb8726b46b5867961f5d8f56f1b13e72dcb9 + 2c4eeabbeab30dfe532190f7e5c448078231cdd0 - + https://github.com/dotnet/arcade - d5c8bb8726b46b5867961f5d8f56f1b13e72dcb9 + 2c4eeabbeab30dfe532190f7e5c448078231cdd0 - + https://github.com/dotnet/arcade - d5c8bb8726b46b5867961f5d8f56f1b13e72dcb9 + 2c4eeabbeab30dfe532190f7e5c448078231cdd0 - + https://github.com/dotnet/arcade - d5c8bb8726b46b5867961f5d8f56f1b13e72dcb9 + 2c4eeabbeab30dfe532190f7e5c448078231cdd0 - + https://github.com/dotnet/arcade - d5c8bb8726b46b5867961f5d8f56f1b13e72dcb9 + 2c4eeabbeab30dfe532190f7e5c448078231cdd0 - + https://github.com/dotnet/arcade - d5c8bb8726b46b5867961f5d8f56f1b13e72dcb9 + 2c4eeabbeab30dfe532190f7e5c448078231cdd0 - + https://github.com/dotnet/arcade - d5c8bb8726b46b5867961f5d8f56f1b13e72dcb9 + 2c4eeabbeab30dfe532190f7e5c448078231cdd0 diff --git a/eng/Versions.props b/eng/Versions.props index 9026d64e6e92..97fd7d898ccc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -277,10 +277,10 @@ - 10.0.0-beta.24610.2 - 10.0.0-beta.24610.2 - 10.0.0-beta.24610.2 - 10.0.0-beta.24610.2 + 10.0.0-beta.24612.1 + 10.0.0-beta.24612.1 + 10.0.0-beta.24612.1 + 10.0.0-beta.24612.1 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 096bfe51f15b..de9807297909 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -52,14 +52,12 @@ __UbuntuPackages+=" symlinks" __UbuntuPackages+=" libicu-dev" __UbuntuPackages+=" liblttng-ust-dev" __UbuntuPackages+=" libunwind8-dev" -__UbuntuPackages+=" libnuma-dev" __AlpinePackages+=" gettext-dev" __AlpinePackages+=" icu-dev" __AlpinePackages+=" libunwind-dev" __AlpinePackages+=" lttng-ust-dev" __AlpinePackages+=" compiler-rt" -__AlpinePackages+=" numactl-dev" # runtime libraries' dependencies __UbuntuPackages+=" libcurl4-openssl-dev" @@ -424,13 +422,12 @@ case "$__AlpineVersion" in elif [[ "$__AlpineArch" == "riscv64" ]]; then __AlpineLlvmLibsLookup=1 __AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive) + elif [[ -n "$__AlpineVersion" ]]; then + # use whichever alpine version is provided and select the latest toolchain libs + __AlpineLlvmLibsLookup=1 else __AlpineVersion=3.13 # 3.13 to maximize compatibility __AlpinePackages+=" llvm10-libs" - - if [[ "$__AlpineArch" == "armv7" ]]; then - __AlpinePackages="${__AlpinePackages//numactl-dev/}" - fi fi esac @@ -444,11 +441,6 @@ if [[ "$__BuildArch" == "armel" ]]; then __LLDB_Package="lldb-3.5-dev" fi -if [[ "$__CodeName" == "xenial" && "$__UbuntuArch" == "armhf" ]]; then - # libnuma-dev is not available on armhf for xenial - __UbuntuPackages="${__UbuntuPackages//libnuma-dev/}" -fi - __UbuntuPackages+=" ${__LLDB_Package:-}" if [[ -z "$__UbuntuRepo" ]]; then diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index deac538e6905..0ff85cf0367e 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -67,6 +67,13 @@ elseif(TARGET_ARCH_NAME STREQUAL "armv6") else() set(TOOLCHAIN "arm-linux-gnueabihf") endif() +elseif(TARGET_ARCH_NAME STREQUAL "loongarch64") + set(CMAKE_SYSTEM_PROCESSOR "loongarch64") + if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/loongarch64-alpine-linux-musl) + set(TOOLCHAIN "loongarch64-alpine-linux-musl") + else() + set(TOOLCHAIN "loongarch64-linux-gnu") + endif() elseif(TARGET_ARCH_NAME STREQUAL "ppc64le") set(CMAKE_SYSTEM_PROCESSOR ppc64le) if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/powerpc64le-alpine-linux-musl) @@ -118,7 +125,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu") endif() else() - message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!") + message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, loongarch64, ppc64le, riscv64, s390x, x64 and x86 are supported!") endif() if(DEFINED ENV{TOOLCHAIN}) @@ -284,7 +291,7 @@ endif() # Specify compile options -if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU) +if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|loongarch64|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU) set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN}) diff --git a/global.json b/global.json index 5b091207e264..e5351c707715 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24610.2", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24610.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24612.1", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24612.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From bd616f04eee967f6ffd26a0f30acb60198e2ceee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Dec 2024 09:38:23 +0000 Subject: [PATCH 07/14] Update dependencies from https://github.com/dotnet/arcade build 20241212.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24604.4 -> To Version 10.0.0-beta.24612.4 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- global.json | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ca2ee165bc57..1c8272a11c8d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -589,34 +589,34 @@ - + https://github.com/dotnet/arcade - 2c4eeabbeab30dfe532190f7e5c448078231cdd0 + 1e161ed635ca19f61b1ddddee61b0bfc995fd716 - + https://github.com/dotnet/arcade - 2c4eeabbeab30dfe532190f7e5c448078231cdd0 + 1e161ed635ca19f61b1ddddee61b0bfc995fd716 - + https://github.com/dotnet/arcade - 2c4eeabbeab30dfe532190f7e5c448078231cdd0 + 1e161ed635ca19f61b1ddddee61b0bfc995fd716 - + https://github.com/dotnet/arcade - 2c4eeabbeab30dfe532190f7e5c448078231cdd0 + 1e161ed635ca19f61b1ddddee61b0bfc995fd716 - + https://github.com/dotnet/arcade - 2c4eeabbeab30dfe532190f7e5c448078231cdd0 + 1e161ed635ca19f61b1ddddee61b0bfc995fd716 - + https://github.com/dotnet/arcade - 2c4eeabbeab30dfe532190f7e5c448078231cdd0 + 1e161ed635ca19f61b1ddddee61b0bfc995fd716 - + https://github.com/dotnet/arcade - 2c4eeabbeab30dfe532190f7e5c448078231cdd0 + 1e161ed635ca19f61b1ddddee61b0bfc995fd716 diff --git a/eng/Versions.props b/eng/Versions.props index 97fd7d898ccc..a34e99604ba6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -277,10 +277,10 @@ - 10.0.0-beta.24612.1 - 10.0.0-beta.24612.1 - 10.0.0-beta.24612.1 - 10.0.0-beta.24612.1 + 10.0.0-beta.24612.4 + 10.0.0-beta.24612.4 + 10.0.0-beta.24612.4 + 10.0.0-beta.24612.4 diff --git a/global.json b/global.json index e5351c707715..283f80262d2f 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24612.1", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24612.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24612.4", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24612.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 993053ee2c16c4717a15659bee0eb079d436b268 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 13 Dec 2024 10:45:05 +0100 Subject: [PATCH 08/14] Add roslyn patch --- .../roslyn/0002-update-roslyn-tfms.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/SourceBuild/patches/roslyn/0002-update-roslyn-tfms.patch diff --git a/src/SourceBuild/patches/roslyn/0002-update-roslyn-tfms.patch b/src/SourceBuild/patches/roslyn/0002-update-roslyn-tfms.patch new file mode 100644 index 000000000000..6c74806f4e31 --- /dev/null +++ b/src/SourceBuild/patches/roslyn/0002-update-roslyn-tfms.patch @@ -0,0 +1,24 @@ +From 0114840c9bc5264189a129e362e4e73f8dc127ea Mon Sep 17 00:00:00 2001 +From: Jan Jones +Date: Tue, 10 Dec 2024 14:36:16 +0100 +Subject: [PATCH] Fix TFM inconsistency in BuildHost + +Backport: https://github.com/dotnet/roslyn/pull/76354 + +--- + eng/targets/TargetFrameworks.props | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/eng/targets/TargetFrameworks.props b/eng/targets/TargetFrameworks.props +index 728de8b627db9..2dddaff156044 100644 +--- a/eng/targets/TargetFrameworks.props ++++ b/eng/targets/TargetFrameworks.props +@@ -55,7 +55,7 @@ + $(NetCurrent) + $(NetCurrent);$(NetPrevious) + $(NetCurrent);$(NetPrevious) +- $(NetCurrent) ++ $(NetPrevious) + $(NetCurrent) + + \ No newline at end of file From 7e87e1a2d82d38272c855f66472e6008299b0bc2 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 13 Dec 2024 12:39:50 +0100 Subject: [PATCH 09/14] update patch --- .../patches/roslyn/0002-update-roslyn-tfms.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/patches/roslyn/0002-update-roslyn-tfms.patch b/src/SourceBuild/patches/roslyn/0002-update-roslyn-tfms.patch index 6c74806f4e31..97404af859fd 100644 --- a/src/SourceBuild/patches/roslyn/0002-update-roslyn-tfms.patch +++ b/src/SourceBuild/patches/roslyn/0002-update-roslyn-tfms.patch @@ -1,7 +1,7 @@ -From 0114840c9bc5264189a129e362e4e73f8dc127ea Mon Sep 17 00:00:00 2001 +From 58d7d7b8b31f453e044da8e6aa2dcdce86e759a1 Mon Sep 17 00:00:00 2001 From: Jan Jones -Date: Tue, 10 Dec 2024 14:36:16 +0100 -Subject: [PATCH] Fix TFM inconsistency in BuildHost +Date: Fri, 13 Dec 2024 12:25:03 +0100 +Subject: [PATCH] Fix TFM inconsistency in BuildHost (#76354) Backport: https://github.com/dotnet/roslyn/pull/76354 @@ -10,7 +10,7 @@ Backport: https://github.com/dotnet/roslyn/pull/76354 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/targets/TargetFrameworks.props b/eng/targets/TargetFrameworks.props -index 728de8b627db9..2dddaff156044 100644 +index 728de8b6..2dddaff1 100644 --- a/eng/targets/TargetFrameworks.props +++ b/eng/targets/TargetFrameworks.props @@ -55,7 +55,7 @@ From 915348df0705b0cfd2b7a494dc38a52b01c64569 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 13 Dec 2024 13:17:43 +0100 Subject: [PATCH 10/14] update patch again --- src/SourceBuild/patches/roslyn/0002-update-roslyn-tfms.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/patches/roslyn/0002-update-roslyn-tfms.patch b/src/SourceBuild/patches/roslyn/0002-update-roslyn-tfms.patch index 97404af859fd..acb02c4ccd5b 100644 --- a/src/SourceBuild/patches/roslyn/0002-update-roslyn-tfms.patch +++ b/src/SourceBuild/patches/roslyn/0002-update-roslyn-tfms.patch @@ -1,4 +1,4 @@ -From 58d7d7b8b31f453e044da8e6aa2dcdce86e759a1 Mon Sep 17 00:00:00 2001 +From fb4c78c665909725022c008c17b54107a6def75c Mon Sep 17 00:00:00 2001 From: Jan Jones Date: Fri, 13 Dec 2024 12:25:03 +0100 Subject: [PATCH] Fix TFM inconsistency in BuildHost (#76354) @@ -10,7 +10,7 @@ Backport: https://github.com/dotnet/roslyn/pull/76354 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/targets/TargetFrameworks.props b/eng/targets/TargetFrameworks.props -index 728de8b6..2dddaff1 100644 +index 728de8b627d..2dddaff1560 100644 --- a/eng/targets/TargetFrameworks.props +++ b/eng/targets/TargetFrameworks.props @@ -55,7 +55,7 @@ From 845ad5a45624389f53121ed4275104a5af534270 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 14 Dec 2024 13:19:20 +0000 Subject: [PATCH 11/14] Update dependencies from https://github.com/dotnet/arcade build 20241213.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24604.4 -> To Version 10.0.0-beta.24613.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- global.json | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c6fe357a7708..7ba5f85980fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -589,34 +589,34 @@ - + https://github.com/dotnet/arcade - 1e161ed635ca19f61b1ddddee61b0bfc995fd716 + 255d5e0c89958af276883a988108c2d616438805 - + https://github.com/dotnet/arcade - 1e161ed635ca19f61b1ddddee61b0bfc995fd716 + 255d5e0c89958af276883a988108c2d616438805 - + https://github.com/dotnet/arcade - 1e161ed635ca19f61b1ddddee61b0bfc995fd716 + 255d5e0c89958af276883a988108c2d616438805 - + https://github.com/dotnet/arcade - 1e161ed635ca19f61b1ddddee61b0bfc995fd716 + 255d5e0c89958af276883a988108c2d616438805 - + https://github.com/dotnet/arcade - 1e161ed635ca19f61b1ddddee61b0bfc995fd716 + 255d5e0c89958af276883a988108c2d616438805 - + https://github.com/dotnet/arcade - 1e161ed635ca19f61b1ddddee61b0bfc995fd716 + 255d5e0c89958af276883a988108c2d616438805 - + https://github.com/dotnet/arcade - 1e161ed635ca19f61b1ddddee61b0bfc995fd716 + 255d5e0c89958af276883a988108c2d616438805 diff --git a/eng/Versions.props b/eng/Versions.props index 3f79d05e367d..819a85e81547 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -277,10 +277,10 @@ - 10.0.0-beta.24612.4 - 10.0.0-beta.24612.4 - 10.0.0-beta.24612.4 - 10.0.0-beta.24612.4 + 10.0.0-beta.24613.2 + 10.0.0-beta.24613.2 + 10.0.0-beta.24613.2 + 10.0.0-beta.24613.2 diff --git a/global.json b/global.json index 283f80262d2f..7aea1ac3fde7 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24612.4", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24612.4", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24613.2", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24613.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 6fed7627df4e820a4bbfdb5d5324f21f9898a98b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Dec 2024 13:20:56 +0000 Subject: [PATCH 12/14] Update dependencies from https://github.com/dotnet/arcade build 20241216.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24604.4 -> To Version 10.0.0-beta.24616.1 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- global.json | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ba5f85980fb..75941d5315c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -589,34 +589,34 @@ - + https://github.com/dotnet/arcade - 255d5e0c89958af276883a988108c2d616438805 + e0abaf3431b0fe3c9f9902aa42f6008b1250e75e - + https://github.com/dotnet/arcade - 255d5e0c89958af276883a988108c2d616438805 + e0abaf3431b0fe3c9f9902aa42f6008b1250e75e - + https://github.com/dotnet/arcade - 255d5e0c89958af276883a988108c2d616438805 + e0abaf3431b0fe3c9f9902aa42f6008b1250e75e - + https://github.com/dotnet/arcade - 255d5e0c89958af276883a988108c2d616438805 + e0abaf3431b0fe3c9f9902aa42f6008b1250e75e - + https://github.com/dotnet/arcade - 255d5e0c89958af276883a988108c2d616438805 + e0abaf3431b0fe3c9f9902aa42f6008b1250e75e - + https://github.com/dotnet/arcade - 255d5e0c89958af276883a988108c2d616438805 + e0abaf3431b0fe3c9f9902aa42f6008b1250e75e - + https://github.com/dotnet/arcade - 255d5e0c89958af276883a988108c2d616438805 + e0abaf3431b0fe3c9f9902aa42f6008b1250e75e diff --git a/eng/Versions.props b/eng/Versions.props index 819a85e81547..5201fb041a14 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -277,10 +277,10 @@ - 10.0.0-beta.24613.2 - 10.0.0-beta.24613.2 - 10.0.0-beta.24613.2 - 10.0.0-beta.24613.2 + 10.0.0-beta.24616.1 + 10.0.0-beta.24616.1 + 10.0.0-beta.24616.1 + 10.0.0-beta.24616.1 diff --git a/global.json b/global.json index 7aea1ac3fde7..fddd31809194 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24613.2", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24613.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24616.1", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24616.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 563f20eaf170ce3038cd2f0eadeb4eae858b6375 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Dec 2024 13:18:24 +0000 Subject: [PATCH 13/14] Update dependencies from https://github.com/dotnet/arcade build 20241217.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24604.4 -> To Version 10.0.0-beta.24617.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- eng/common/cross/build-rootfs.sh | 2 +- global.json | 4 ++-- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75941d5315c0..debe12cbaec5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -589,34 +589,34 @@ - + https://github.com/dotnet/arcade - e0abaf3431b0fe3c9f9902aa42f6008b1250e75e + 4f2968fce08735a7e22fca6bd4c99d003221d716 - + https://github.com/dotnet/arcade - e0abaf3431b0fe3c9f9902aa42f6008b1250e75e + 4f2968fce08735a7e22fca6bd4c99d003221d716 - + https://github.com/dotnet/arcade - e0abaf3431b0fe3c9f9902aa42f6008b1250e75e + 4f2968fce08735a7e22fca6bd4c99d003221d716 - + https://github.com/dotnet/arcade - e0abaf3431b0fe3c9f9902aa42f6008b1250e75e + 4f2968fce08735a7e22fca6bd4c99d003221d716 - + https://github.com/dotnet/arcade - e0abaf3431b0fe3c9f9902aa42f6008b1250e75e + 4f2968fce08735a7e22fca6bd4c99d003221d716 - + https://github.com/dotnet/arcade - e0abaf3431b0fe3c9f9902aa42f6008b1250e75e + 4f2968fce08735a7e22fca6bd4c99d003221d716 - + https://github.com/dotnet/arcade - e0abaf3431b0fe3c9f9902aa42f6008b1250e75e + 4f2968fce08735a7e22fca6bd4c99d003221d716 diff --git a/eng/Versions.props b/eng/Versions.props index 5201fb041a14..caf97c3c34ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -277,10 +277,10 @@ - 10.0.0-beta.24616.1 - 10.0.0-beta.24616.1 - 10.0.0-beta.24616.1 - 10.0.0-beta.24616.1 + 10.0.0-beta.24617.2 + 10.0.0-beta.24617.2 + 10.0.0-beta.24617.2 + 10.0.0-beta.24617.2 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index de9807297909..464040aaaea6 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -422,7 +422,7 @@ case "$__AlpineVersion" in elif [[ "$__AlpineArch" == "riscv64" ]]; then __AlpineLlvmLibsLookup=1 __AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive) - elif [[ -n "$__AlpineVersion" ]]; then + elif [[ -n "$__AlpineMajorVersion" ]]; then # use whichever alpine version is provided and select the latest toolchain libs __AlpineLlvmLibsLookup=1 else diff --git a/global.json b/global.json index fddd31809194..54d9f756804e 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24616.1", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24616.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24617.2", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24617.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 785d87c8a61cbf4b5cccb13eee4ca39da484d191 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 18 Dec 2024 19:57:01 +0100 Subject: [PATCH 14/14] Delete src/SourceBuild/patches/roslyn/0002-update-roslyn-tfms.patch --- .../roslyn/0002-update-roslyn-tfms.patch | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 src/SourceBuild/patches/roslyn/0002-update-roslyn-tfms.patch diff --git a/src/SourceBuild/patches/roslyn/0002-update-roslyn-tfms.patch b/src/SourceBuild/patches/roslyn/0002-update-roslyn-tfms.patch deleted file mode 100644 index acb02c4ccd5b..000000000000 --- a/src/SourceBuild/patches/roslyn/0002-update-roslyn-tfms.patch +++ /dev/null @@ -1,24 +0,0 @@ -From fb4c78c665909725022c008c17b54107a6def75c Mon Sep 17 00:00:00 2001 -From: Jan Jones -Date: Fri, 13 Dec 2024 12:25:03 +0100 -Subject: [PATCH] Fix TFM inconsistency in BuildHost (#76354) - -Backport: https://github.com/dotnet/roslyn/pull/76354 - ---- - eng/targets/TargetFrameworks.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/targets/TargetFrameworks.props b/eng/targets/TargetFrameworks.props -index 728de8b627d..2dddaff1560 100644 ---- a/eng/targets/TargetFrameworks.props -+++ b/eng/targets/TargetFrameworks.props -@@ -55,7 +55,7 @@ - $(NetCurrent) - $(NetCurrent);$(NetPrevious) - $(NetCurrent);$(NetPrevious) -- $(NetCurrent) -+ $(NetPrevious) - $(NetCurrent) - - \ No newline at end of file