From 2c6375d6aed12c04ed7e361f75a258919a0f4862 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Nov 2024 13:47:13 +0000 Subject: [PATCH 01/23] Update dependencies from https://github.com/dotnet/arcade build 20241110.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24558.2 -> To Version 10.0.0-beta.24560.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- eng/common/native/install-dependencies.sh | 6 +++--- global.json | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 14196658c76..0a8939b0622 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ - + https://github.com/dotnet/arcade - 74ee04447a9882906e02bb135787ce2eca67ee67 + 232061b49ae2157efbb83acde9acae79ef3d6d40 - + https://github.com/dotnet/arcade - 74ee04447a9882906e02bb135787ce2eca67ee67 + 232061b49ae2157efbb83acde9acae79ef3d6d40 - + https://github.com/dotnet/arcade - 74ee04447a9882906e02bb135787ce2eca67ee67 + 232061b49ae2157efbb83acde9acae79ef3d6d40 diff --git a/eng/Versions.props b/eng/Versions.props index 63a5c2eb21e..8a901608218 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,8 @@ - 10.0.0-beta.24558.2 - 10.0.0-beta.24558.2 + 10.0.0-beta.24560.1 + 10.0.0-beta.24560.1 diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh index 03e47c48ac9..6d1f8a94a68 100644 --- a/eng/common/native/install-dependencies.sh +++ b/eng/common/native/install-dependencies.sh @@ -24,13 +24,13 @@ case "$os" in apt update apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \ - libssl-dev libkrb5-dev zlib1g-dev pigz + libssl-dev libkrb5-dev zlib1g-dev pigz cpio localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 elif [ "$ID" = "fedora" ]; then - dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel pigz + dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-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 zlib-dev openssl-dev pigz + apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev pigz cpio else echo "Unsupported distro. distro: $ID" exit 1 diff --git a/global.json b/global.json index f3a8a7a888b..4cd6ef166db 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ "version": "9.0.100-rc.2.24474.11" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24558.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24560.1", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From b7c4ce4789f81868abc822af24d02e98996316b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Nov 2024 14:02:45 +0000 Subject: [PATCH 02/23] Update dependencies from https://github.com/dotnet/arcade build 20241111.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24558.2 -> To Version 10.0.0-beta.24561.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- global.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a8939b0622..9d28336bd12 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ - + https://github.com/dotnet/arcade - 232061b49ae2157efbb83acde9acae79ef3d6d40 + 32b8acf5b6f79e78a7cc5f7b7c619f68ff0c97ad - + https://github.com/dotnet/arcade - 232061b49ae2157efbb83acde9acae79ef3d6d40 + 32b8acf5b6f79e78a7cc5f7b7c619f68ff0c97ad - + https://github.com/dotnet/arcade - 232061b49ae2157efbb83acde9acae79ef3d6d40 + 32b8acf5b6f79e78a7cc5f7b7c619f68ff0c97ad diff --git a/eng/Versions.props b/eng/Versions.props index 8a901608218..f3abfbf9a72 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,8 @@ - 10.0.0-beta.24560.1 - 10.0.0-beta.24560.1 + 10.0.0-beta.24561.1 + 10.0.0-beta.24561.1 diff --git a/global.json b/global.json index 4cd6ef166db..6c28bb63125 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ "version": "9.0.100-rc.2.24474.11" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24560.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24561.1", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From acb537ea82419921e77923502275cf314340eae4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Nov 2024 13:50:06 +0000 Subject: [PATCH 03/23] Update dependencies from https://github.com/dotnet/arcade build 20241112.15 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24558.2 -> To Version 10.0.0-beta.24562.15 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- global.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d28336bd12..97235da087b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ - + https://github.com/dotnet/arcade - 32b8acf5b6f79e78a7cc5f7b7c619f68ff0c97ad + e882d5925ca55013d5810ac51e36574a65c5da84 - + https://github.com/dotnet/arcade - 32b8acf5b6f79e78a7cc5f7b7c619f68ff0c97ad + e882d5925ca55013d5810ac51e36574a65c5da84 - + https://github.com/dotnet/arcade - 32b8acf5b6f79e78a7cc5f7b7c619f68ff0c97ad + e882d5925ca55013d5810ac51e36574a65c5da84 diff --git a/eng/Versions.props b/eng/Versions.props index f3abfbf9a72..330079286a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,8 @@ - 10.0.0-beta.24561.1 - 10.0.0-beta.24561.1 + 10.0.0-beta.24562.15 + 10.0.0-beta.24562.15 diff --git a/global.json b/global.json index 6c28bb63125..9bbbb2d3bb0 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ "version": "9.0.100-rc.2.24474.11" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24561.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24562.15", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From a2bcd016a8e3e85014fadb139f2b9907d1db5ab1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Nov 2024 14:59:44 +0000 Subject: [PATCH 04/23] Update dependencies from https://github.com/dotnet/arcade build 20241114.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24558.2 -> To Version 10.0.0-beta.24564.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- eng/common/core-templates/job/source-build.yml | 5 +++-- eng/common/core-templates/steps/source-build.yml | 7 ++++++- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 ++-- global.json | 6 +++--- 7 files changed, 23 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97235da087b..41b04dacd5e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ - + https://github.com/dotnet/arcade - e882d5925ca55013d5810ac51e36574a65c5da84 + c1852b9ac37df9a86630c2f078dbee43f7b186e7 - + https://github.com/dotnet/arcade - e882d5925ca55013d5810ac51e36574a65c5da84 + c1852b9ac37df9a86630c2f078dbee43f7b186e7 - + https://github.com/dotnet/arcade - e882d5925ca55013d5810ac51e36574a65c5da84 + c1852b9ac37df9a86630c2f078dbee43f7b186e7 diff --git a/eng/Versions.props b/eng/Versions.props index 330079286a6..a128750183b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,8 @@ - 10.0.0-beta.24562.15 - 10.0.0-beta.24562.15 + 10.0.0-beta.24564.1 + 10.0.0-beta.24564.1 diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index c4713c8b6ed..05f7ad6ef0d 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -12,9 +12,10 @@ parameters: # The name of the job. This is included in the job ID. # targetRID: '' # The name of the target RID to use, instead of the one auto-detected by Arcade. - # nonPortable: false + # portableBuild: false # Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than - # linux-x64), and compiling against distro-provided packages rather than portable ones. + # linux-x64), and compiling against distro-provided packages rather than portable ones. The + # default is portable mode. # skipPublishValidation: false # Disables publishing validation. By default, a check is performed to ensure no packages are # published by source-build. diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index c9271c01158..4da05afe054 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -76,6 +76,11 @@ steps: assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml fi + portableBuildArgs= + if [ '${{ parameters.platform.portableBuild }}' != '' ]; then + portableBuildArgs='/p:PortabelBuild=${{ parameters.platform.portableBuild }}' + fi + ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ --configuration $buildConfig \ --restore --build --pack $publishArgs -bl \ @@ -85,7 +90,7 @@ steps: $targetRidArgs \ $runtimeOsArgs \ $baseOsArgs \ - /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ + $portableBuildArgs \ /p:DotNetBuildSourceOnly=true \ /p:DotNetBuildRepo=true \ /p:AssetManifestFileName=$assetManifestFileName diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index aab40de3fd9..4f0546dce12 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.10.0-pre.4.0" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 7bd54b6ba9b..bd80ccccb51 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.10.0-pre.4.0 - $defaultXCopyMSBuildVersion = '17.10.0-pre.4.0' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0 + $defaultXCopyMSBuildVersion = '17.12.0' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 9bbbb2d3bb0..bd56cbc2490 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-rc.2.24474.11", + "dotnet": "9.0.100", "runtimes": { "aspnetcore": [ "3.1.5", @@ -10,10 +10,10 @@ } }, "sdk": { - "version": "9.0.100-rc.2.24474.11" + "version": "9.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24562.15", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24564.1", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From 369f951c8d13d71a668067f374e34586451da14f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Nov 2024 13:56:44 +0000 Subject: [PATCH 05/23] Update dependencies from https://github.com/dotnet/arcade build 20241120.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24558.2 -> To Version 10.0.0-beta.24570.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- eng/common/native/install-dependencies.sh | 4 ++++ global.json | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41b04dacd5e..ca4138a4d62 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ - + https://github.com/dotnet/arcade - c1852b9ac37df9a86630c2f078dbee43f7b186e7 + efdc52bb77eeadae5420eb48e66722c4fdcaa3be - + https://github.com/dotnet/arcade - c1852b9ac37df9a86630c2f078dbee43f7b186e7 + efdc52bb77eeadae5420eb48e66722c4fdcaa3be - + https://github.com/dotnet/arcade - c1852b9ac37df9a86630c2f078dbee43f7b186e7 + efdc52bb77eeadae5420eb48e66722c4fdcaa3be diff --git a/eng/Versions.props b/eng/Versions.props index a128750183b..a7b2eee0de4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,8 @@ - 10.0.0-beta.24564.1 - 10.0.0-beta.24564.1 + 10.0.0-beta.24570.1 + 10.0.0-beta.24570.1 diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh index 6d1f8a94a68..dc396a95560 100644 --- a/eng/common/native/install-dependencies.sh +++ b/eng/common/native/install-dependencies.sh @@ -44,6 +44,10 @@ case "$os" in export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 # Skip brew update for now, see https://github.com/actions/setup-python/issues/577 # brew update --preinstall + + # Temporarily uninstall pkg-config@0.29.2 to work around https://github.com/actions/runner-images/issues/10984 + brew uninstall --ignore-dependencies --force pkg-config@0.29.2 + brew bundle --no-upgrade --no-lock --file=- < Date: Thu, 21 Nov 2024 13:53:18 +0000 Subject: [PATCH 06/23] Update dependencies from https://github.com/dotnet/arcade build 20241120.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24558.2 -> To Version 10.0.0-beta.24570.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- global.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ca4138a4d62..a50bc2cd0af 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ - + https://github.com/dotnet/arcade - efdc52bb77eeadae5420eb48e66722c4fdcaa3be + 0c8f4989db0251f49a4f37d1b35bf4da1e9d6415 - + https://github.com/dotnet/arcade - efdc52bb77eeadae5420eb48e66722c4fdcaa3be + 0c8f4989db0251f49a4f37d1b35bf4da1e9d6415 - + https://github.com/dotnet/arcade - efdc52bb77eeadae5420eb48e66722c4fdcaa3be + 0c8f4989db0251f49a4f37d1b35bf4da1e9d6415 diff --git a/eng/Versions.props b/eng/Versions.props index a7b2eee0de4..8363541816b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,8 @@ - 10.0.0-beta.24570.1 - 10.0.0-beta.24570.1 + 10.0.0-beta.24570.4 + 10.0.0-beta.24570.4 diff --git a/global.json b/global.json index d53d4be7962..74083171718 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ "version": "9.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24570.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24570.4", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From 275fb3664eeb08caa540b861836354cc10b8d8c2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Nov 2024 13:52:50 +0000 Subject: [PATCH 07/23] Update dependencies from https://github.com/dotnet/arcade build 20241122.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24558.2 -> To Version 10.0.0-beta.24572.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- global.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a50bc2cd0af..8ff8be22fe9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ - + https://github.com/dotnet/arcade - 0c8f4989db0251f49a4f37d1b35bf4da1e9d6415 + 7d955f9f470465e144c76d47fd2596a0e4c02a21 - + https://github.com/dotnet/arcade - 0c8f4989db0251f49a4f37d1b35bf4da1e9d6415 + 7d955f9f470465e144c76d47fd2596a0e4c02a21 - + https://github.com/dotnet/arcade - 0c8f4989db0251f49a4f37d1b35bf4da1e9d6415 + 7d955f9f470465e144c76d47fd2596a0e4c02a21 diff --git a/eng/Versions.props b/eng/Versions.props index 8363541816b..bf11e31e4da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,8 @@ - 10.0.0-beta.24570.4 - 10.0.0-beta.24570.4 + 10.0.0-beta.24572.3 + 10.0.0-beta.24572.3 diff --git a/global.json b/global.json index 74083171718..735c30d1295 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ "version": "9.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24570.4", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24572.3", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From 5a3832d2852c4d844d974e6d150bf44415c5a6dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 14:01:39 +0000 Subject: [PATCH 08/23] Update dependencies from https://github.com/dotnet/arcade build 20241125.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24558.2 -> To Version 10.0.0-beta.24575.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- global.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8ff8be22fe9..b3043615f59 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ - + https://github.com/dotnet/arcade - 7d955f9f470465e144c76d47fd2596a0e4c02a21 + 2a3bf4e3a4c473135d058adcd7193a5a4bcd38a7 - + https://github.com/dotnet/arcade - 7d955f9f470465e144c76d47fd2596a0e4c02a21 + 2a3bf4e3a4c473135d058adcd7193a5a4bcd38a7 - + https://github.com/dotnet/arcade - 7d955f9f470465e144c76d47fd2596a0e4c02a21 + 2a3bf4e3a4c473135d058adcd7193a5a4bcd38a7 diff --git a/eng/Versions.props b/eng/Versions.props index bf11e31e4da..f13e374a828 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,8 @@ - 10.0.0-beta.24572.3 - 10.0.0-beta.24572.3 + 10.0.0-beta.24575.1 + 10.0.0-beta.24575.1 diff --git a/global.json b/global.json index 735c30d1295..cc334b22b58 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ "version": "9.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24572.3", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24575.1", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From 63777c8d88836efb991b79d9eb57e727a3a83dfc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Nov 2024 13:57:59 +0000 Subject: [PATCH 09/23] Update dependencies from https://github.com/dotnet/arcade build 20241126.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24558.2 -> To Version 10.0.0-beta.24576.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- global.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b3043615f59..be9c224f702 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ - + https://github.com/dotnet/arcade - 2a3bf4e3a4c473135d058adcd7193a5a4bcd38a7 + 9ad0880a9f8450f4ac4e097cfe830e401ea3e22c - + https://github.com/dotnet/arcade - 2a3bf4e3a4c473135d058adcd7193a5a4bcd38a7 + 9ad0880a9f8450f4ac4e097cfe830e401ea3e22c - + https://github.com/dotnet/arcade - 2a3bf4e3a4c473135d058adcd7193a5a4bcd38a7 + 9ad0880a9f8450f4ac4e097cfe830e401ea3e22c diff --git a/eng/Versions.props b/eng/Versions.props index f13e374a828..b366eef21c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,8 @@ - 10.0.0-beta.24575.1 - 10.0.0-beta.24575.1 + 10.0.0-beta.24576.1 + 10.0.0-beta.24576.1 diff --git a/global.json b/global.json index cc334b22b58..1946be194b8 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ "version": "9.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24575.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24576.1", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From fe54118205bdf23ce79cc8f323393cdbd0fc9017 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Nov 2024 13:48:11 +0000 Subject: [PATCH 10/23] Update dependencies from https://github.com/dotnet/arcade build 20241127.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24558.2 -> To Version 10.0.0-beta.24577.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- global.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be9c224f702..c5d2cbc1b36 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ - + https://github.com/dotnet/arcade - 9ad0880a9f8450f4ac4e097cfe830e401ea3e22c + d0f89c635d780e183a97ad86af4f3c8d7e95977f - + https://github.com/dotnet/arcade - 9ad0880a9f8450f4ac4e097cfe830e401ea3e22c + d0f89c635d780e183a97ad86af4f3c8d7e95977f - + https://github.com/dotnet/arcade - 9ad0880a9f8450f4ac4e097cfe830e401ea3e22c + d0f89c635d780e183a97ad86af4f3c8d7e95977f diff --git a/eng/Versions.props b/eng/Versions.props index b366eef21c9..d4d47ec9496 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,8 @@ - 10.0.0-beta.24576.1 - 10.0.0-beta.24576.1 + 10.0.0-beta.24577.1 + 10.0.0-beta.24577.1 diff --git a/global.json b/global.json index 1946be194b8..67606c30b3d 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ "version": "9.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24576.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24577.1", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From 5a1174cf5a2ab8fb1fc616d0fb9e00e426049eb4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 29 Nov 2024 13:43:39 +0000 Subject: [PATCH 11/23] Update dependencies from https://github.com/dotnet/arcade build 20241128.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24558.2 -> To Version 10.0.0-beta.24578.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- eng/common/native/install-dependencies.sh | 6 +----- global.json | 2 +- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c5d2cbc1b36..fe445b3e55b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ - + https://github.com/dotnet/arcade - d0f89c635d780e183a97ad86af4f3c8d7e95977f + e8de3415124309210e4cbd0105e4a9da8dc01696 - + https://github.com/dotnet/arcade - d0f89c635d780e183a97ad86af4f3c8d7e95977f + e8de3415124309210e4cbd0105e4a9da8dc01696 - + https://github.com/dotnet/arcade - d0f89c635d780e183a97ad86af4f3c8d7e95977f + e8de3415124309210e4cbd0105e4a9da8dc01696 diff --git a/eng/Versions.props b/eng/Versions.props index d4d47ec9496..7f3907268a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,8 @@ - 10.0.0-beta.24577.1 - 10.0.0-beta.24577.1 + 10.0.0-beta.24578.2 + 10.0.0-beta.24578.2 diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh index dc396a95560..3eef7409f72 100644 --- a/eng/common/native/install-dependencies.sh +++ b/eng/common/native/install-dependencies.sh @@ -44,15 +44,11 @@ case "$os" in export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 # Skip brew update for now, see https://github.com/actions/setup-python/issues/577 # brew update --preinstall - - # Temporarily uninstall pkg-config@0.29.2 to work around https://github.com/actions/runner-images/issues/10984 - brew uninstall --ignore-dependencies --force pkg-config@0.29.2 - brew bundle --no-upgrade --no-lock --file=- < Date: Thu, 5 Dec 2024 13:52:05 +0000 Subject: [PATCH 12/23] Update dependencies from https://github.com/dotnet/arcade build 20241204.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24558.2 -> To Version 10.0.0-beta.24604.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- global.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe445b3e55b..0d033ca89cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ - + https://github.com/dotnet/arcade - e8de3415124309210e4cbd0105e4a9da8dc01696 + 45d845e04c05fbe5da9838c454bbc3af1df6be81 - + https://github.com/dotnet/arcade - e8de3415124309210e4cbd0105e4a9da8dc01696 + 45d845e04c05fbe5da9838c454bbc3af1df6be81 - + https://github.com/dotnet/arcade - e8de3415124309210e4cbd0105e4a9da8dc01696 + 45d845e04c05fbe5da9838c454bbc3af1df6be81 diff --git a/eng/Versions.props b/eng/Versions.props index 7f3907268a5..aa4ad0d4d1f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,8 @@ - 10.0.0-beta.24578.2 - 10.0.0-beta.24578.2 + 10.0.0-beta.24604.4 + 10.0.0-beta.24604.4 diff --git a/global.json b/global.json index 8e51fed00d7..9b83da03358 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ "version": "9.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24578.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24604.4", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From f3a113a6bb231dc395cbfc9b11ce108a334f3792 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Dec 2024 13:49:11 +0000 Subject: [PATCH 13/23] Update dependencies from https://github.com/dotnet/arcade build 20241205.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24558.2 -> To Version 10.0.0-beta.24605.6 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- eng/common/core-templates/steps/source-build.yml | 2 +- global.json | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0d033ca89cf..0439c62899e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ - + https://github.com/dotnet/arcade - 45d845e04c05fbe5da9838c454bbc3af1df6be81 + 3bd806cb4e6669c969614fd7b8a15990f3a1cd9e - + https://github.com/dotnet/arcade - 45d845e04c05fbe5da9838c454bbc3af1df6be81 + 3bd806cb4e6669c969614fd7b8a15990f3a1cd9e - + https://github.com/dotnet/arcade - 45d845e04c05fbe5da9838c454bbc3af1df6be81 + 3bd806cb4e6669c969614fd7b8a15990f3a1cd9e diff --git a/eng/Versions.props b/eng/Versions.props index aa4ad0d4d1f..89dd9ffadd6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,8 @@ - 10.0.0-beta.24604.4 - 10.0.0-beta.24604.4 + 10.0.0-beta.24605.6 + 10.0.0-beta.24605.6 diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 4da05afe054..f9ba1625c20 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/global.json b/global.json index 9b83da03358..fea1571ad44 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100", + "dotnet": "10.0.100-alpha.1.24573.1", "runtimes": { "aspnetcore": [ "3.1.5", @@ -10,10 +10,10 @@ } }, "sdk": { - "version": "9.0.100" + "version": "10.0.100-alpha.1.24573.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24604.4", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24605.6", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From 99cdbe7bb5a490a39bbfdb14f684996e5d3f7a90 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 7 Dec 2024 13:47:25 +0000 Subject: [PATCH 14/23] Update dependencies from https://github.com/dotnet/arcade build 20241206.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24558.2 -> To Version 10.0.0-beta.24606.6 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- eng/common/cross/build-rootfs.sh | 8 ++++---- global.json | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0439c62899e..683daa3207f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ - + https://github.com/dotnet/arcade - 3bd806cb4e6669c969614fd7b8a15990f3a1cd9e + 61b8f746424762d2e3173ebfaab19346224d591c - + https://github.com/dotnet/arcade - 3bd806cb4e6669c969614fd7b8a15990f3a1cd9e + 61b8f746424762d2e3173ebfaab19346224d591c - + https://github.com/dotnet/arcade - 3bd806cb4e6669c969614fd7b8a15990f3a1cd9e + 61b8f746424762d2e3173ebfaab19346224d591c diff --git a/eng/Versions.props b/eng/Versions.props index 89dd9ffadd6..bcff44218e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,8 @@ - 10.0.0-beta.24605.6 - 10.0.0-beta.24605.6 + 10.0.0-beta.24606.6 + 10.0.0-beta.24606.6 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 20ae8c28687..096bfe51f15 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 fea1571ad44..ae4af4f9d49 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ "version": "10.0.100-alpha.1.24573.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24605.6", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24606.6", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From 9207a66d68e8fb532723b82d7e068ce5f7b900f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 Dec 2024 13:56:29 +0000 Subject: [PATCH 15/23] Update dependencies from https://github.com/dotnet/arcade build 20241210.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24558.2 -> To Version 10.0.0-beta.24610.1 --- eng/Version.Details.xml | 12 +-- eng/Versions.props | 4 +- eng/common/cross/toolchain.cmake | 138 ++++++++++++------------------- global.json | 2 +- 4 files changed, 64 insertions(+), 92 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 683daa3207f..494e0b3478f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ - + 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 bcff44218e2..2af3f8e7720 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,8 @@ - 10.0.0-beta.24606.6 - 10.0.0-beta.24606.6 + 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 9a4e285a5ae..deac538e690 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 ae4af4f9d49..cf7f9419e14 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ "version": "10.0.100-alpha.1.24573.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24606.6", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24610.1", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From 0bacbc0fdab2ea7bee6d10933decabe3c1bf22d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Dec 2024 13:51:28 +0000 Subject: [PATCH 16/23] Update dependencies from https://github.com/dotnet/arcade build 20241210.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24558.2 -> To Version 10.0.0-beta.24610.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- global.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 494e0b3478f..87129889c0b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ - + 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 2af3f8e7720..eff305f9688 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,8 @@ - 10.0.0-beta.24610.1 - 10.0.0-beta.24610.1 + 10.0.0-beta.24610.2 + 10.0.0-beta.24610.2 diff --git a/global.json b/global.json index cf7f9419e14..843e5c1c1d9 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ "version": "10.0.100-alpha.1.24573.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24610.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24610.2", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From 4ee0a13e68c8055f30379fe220a9b48b93429168 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Dec 2024 13:49:41 +0000 Subject: [PATCH 17/23] Update dependencies from https://github.com/dotnet/arcade build 20241212.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24558.2 -> To Version 10.0.0-beta.24612.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- eng/common/cross/build-rootfs.sh | 14 +++----------- eng/common/cross/toolchain.cmake | 11 +++++++++-- global.json | 2 +- 5 files changed, 21 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 87129889c0b..17d8d79ea6b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ - + 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 eff305f9688..16377d090a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,8 @@ - 10.0.0-beta.24610.2 - 10.0.0-beta.24610.2 + 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 096bfe51f15..de980729790 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 deac538e690..0ff85cf0367 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 843e5c1c1d9..15bcd56bf12 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ "version": "10.0.100-alpha.1.24573.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24610.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24612.1", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From 215eeaa57794441e3a4c8acf8d12bdfed3967b53 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Dec 2024 13:44:20 +0000 Subject: [PATCH 18/23] Update dependencies from https://github.com/dotnet/arcade build 20241212.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24558.2 -> To Version 10.0.0-beta.24612.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- global.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 17d8d79ea6b..61665f2acf0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ - + 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 16377d090a8..668e1982c71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,8 @@ - 10.0.0-beta.24612.1 - 10.0.0-beta.24612.1 + 10.0.0-beta.24612.4 + 10.0.0-beta.24612.4 diff --git a/global.json b/global.json index 15bcd56bf12..91eb83c6afc 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ "version": "10.0.100-alpha.1.24573.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24612.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24612.4", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From d9be2dc14deb06be7ec9ea7a8b911b9a575ace1c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 14 Dec 2024 13:43:48 +0000 Subject: [PATCH 19/23] Update dependencies from https://github.com/dotnet/arcade build 20241213.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24558.2 -> To Version 10.0.0-beta.24613.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- global.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 61665f2acf0..af583808db9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ - + 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 668e1982c71..57f043902e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,8 @@ - 10.0.0-beta.24612.4 - 10.0.0-beta.24612.4 + 10.0.0-beta.24613.2 + 10.0.0-beta.24613.2 diff --git a/global.json b/global.json index 91eb83c6afc..4db3e209805 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ "version": "10.0.100-alpha.1.24573.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24612.4", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24613.2", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From 40a81758d02131c6c33e2245be37dbc1c6544621 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Dec 2024 13:55:08 +0000 Subject: [PATCH 20/23] Update dependencies from https://github.com/dotnet/arcade build 20241216.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24558.2 -> To Version 10.0.0-beta.24616.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- global.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af583808db9..4067bef7c11 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ - + 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 57f043902e2..0fa69a53638 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,8 @@ - 10.0.0-beta.24613.2 - 10.0.0-beta.24613.2 + 10.0.0-beta.24616.1 + 10.0.0-beta.24616.1 diff --git a/global.json b/global.json index 4db3e209805..3c95546d6dd 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ "version": "10.0.100-alpha.1.24573.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24613.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24616.1", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From e50ae69e65ca7723446e2edc0dbf0ba15a268cee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Dec 2024 13:44:34 +0000 Subject: [PATCH 21/23] Update dependencies from https://github.com/dotnet/arcade build 20241217.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24558.2 -> To Version 10.0.0-beta.24617.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- eng/common/cross/build-rootfs.sh | 2 +- global.json | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4067bef7c11..d82b5ccbd5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ - + 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 0fa69a53638..5d9c70c151f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,8 @@ - 10.0.0-beta.24616.1 - 10.0.0-beta.24616.1 + 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 de980729790..464040aaaea 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 3c95546d6dd..baad32e3573 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ "version": "10.0.100-alpha.1.24573.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24616.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24617.2", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From c1fd6d2424b96fb89f14544208f8885a02451228 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 22 Dec 2024 23:44:30 +0000 Subject: [PATCH 22/23] Update dependencies from https://github.com/dotnet/arcade build 20241222.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24558.2 -> To Version 10.0.0-beta.24622.1 --- eng/Version.Details.xml | 12 ++--- eng/Versions.props | 4 +- .../steps/install-microbuild.yml | 44 ++++++++++++++--- eng/common/cross/build-android-rootfs.sh | 49 ++++++++++++------- eng/common/native/install-dependencies.sh | 2 +- eng/common/tools.ps1 | 4 +- eng/common/tools.sh | 4 +- global.json | 2 +- 8 files changed, 85 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d82b5ccbd5d..c93487994b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ - + https://github.com/dotnet/arcade - 4f2968fce08735a7e22fca6bd4c99d003221d716 + 8589bd2a216025d753b5f107081bfa28a2d51bb8 - + https://github.com/dotnet/arcade - 4f2968fce08735a7e22fca6bd4c99d003221d716 + 8589bd2a216025d753b5f107081bfa28a2d51bb8 - + https://github.com/dotnet/arcade - 4f2968fce08735a7e22fca6bd4c99d003221d716 + 8589bd2a216025d753b5f107081bfa28a2d51bb8 diff --git a/eng/Versions.props b/eng/Versions.props index 5d9c70c151f..04ec3277909 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,8 @@ - 10.0.0-beta.24617.2 - 10.0.0-beta.24617.2 + 10.0.0-beta.24622.1 + 10.0.0-beta.24622.1 diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index 9abe726e54b..2a6a529482b 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -1,19 +1,49 @@ parameters: - # Enable cleanup tasks for MicroBuild + # Enable install tasks for MicroBuild enableMicrobuild: false - # Enable cleanup tasks for MicroBuild on Mac and Linux + # Enable install tasks for MicroBuild on Mac and Linux # Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT' enableMicrobuildForMacAndLinux: false + # Location of the MicroBuild output folder + microBuildOutputFolder: '$(Agent.TempDirectory)' continueOnError: false steps: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - # Remove Python downgrade with https://github.com/dotnet/arcade/issues/15151 - - ${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}: + - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}: + # Install Python 3.12.x on when Python > 3.12.x is installed - https://github.com/dotnet/source-build/issues/4802 + - script: | + version=$(python3 --version | awk '{print $2}') + major=$(echo $version | cut -d. -f1) + minor=$(echo $version | cut -d. -f2) + + installPython=false + if [ "$major" -gt 3 ] || { [ "$major" -eq 3 ] && [ "$minor" -gt 12 ]; }; then + installPython=true + fi + + echo "Python version: $version." + echo "Install Python 3.12.x: $installPython." + echo "##vso[task.setvariable variable=installPython;isOutput=true]$installPython" + name: InstallPython + displayName: 'Determine Python installation' + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + - task: UsePythonVersion@0 - displayName: 'Use Python 3.11.x' inputs: - versionSpec: '3.11.x' + versionSpec: '3.12.x' + displayName: 'Use Python 3.12.x' + condition: and(succeeded(), eq(variables['InstallPython.installPython'], 'true'), ne(variables['Agent.Os'], 'Windows_NT')) + + # Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable + - task: UseDotNet@2 + displayName: Install .NET 8.0 SDK for MicroBuild Plugin + inputs: + packageType: sdk + version: 8.0.x + installationPath: ${{ parameters.microBuildOutputFolder }}/dotnet + workingDirectory: ${{ parameters.microBuildOutputFolder }} + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) - task: MicroBuildSigningPlugin@4 displayName: Install MicroBuild plugin @@ -25,7 +55,7 @@ steps: azureSubscription: 'MicroBuild Signing Task (DevDiv)' env: TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' + MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} condition: and( diff --git a/eng/common/cross/build-android-rootfs.sh b/eng/common/cross/build-android-rootfs.sh index 7e9ba2b75ed..fbd8d80848a 100755 --- a/eng/common/cross/build-android-rootfs.sh +++ b/eng/common/cross/build-android-rootfs.sh @@ -6,10 +6,11 @@ usage() { echo "Creates a toolchain and sysroot used for cross-compiling for Android." echo - echo "Usage: $0 [BuildArch] [ApiLevel]" + echo "Usage: $0 [BuildArch] [ApiLevel] [--ndk NDKVersion]" echo echo "BuildArch is the target architecture of Android. Currently only arm64 is supported." echo "ApiLevel is the target Android API level. API levels usually match to Android releases. See https://source.android.com/source/build-numbers.html" + echo "NDKVersion is the version of Android NDK. The default is r21. See https://developer.android.com/ndk/downloads/revision_history" echo echo "By default, the toolchain and sysroot will be generated in cross/android-rootfs/toolchain/[BuildArch]. You can change this behavior" echo "by setting the TOOLCHAIN_DIR environment variable" @@ -25,10 +26,15 @@ __BuildArch=arm64 __AndroidArch=aarch64 __AndroidToolchain=aarch64-linux-android -for i in "$@" - do - lowerI="$(echo $i | tr "[:upper:]" "[:lower:]")" - case $lowerI in +while :; do + if [[ "$#" -le 0 ]]; then + break + fi + + i=$1 + + lowerI="$(echo $i | tr "[:upper:]" "[:lower:]")" + case $lowerI in -?|-h|--help) usage exit 1 @@ -43,6 +49,10 @@ for i in "$@" __AndroidArch=arm __AndroidToolchain=arm-linux-androideabi ;; + --ndk) + shift + __NDK_Version=$1 + ;; *[0-9]) __ApiLevel=$i ;; @@ -50,8 +60,17 @@ for i in "$@" __UnprocessedBuildArgs="$__UnprocessedBuildArgs $i" ;; esac + shift done +if [[ "$__NDK_Version" == "r21" ]] || [[ "$__NDK_Version" == "r22" ]]; then + __NDK_File_Arch_Spec=-x86_64 + __SysRoot=sysroot +else + __NDK_File_Arch_Spec= + __SysRoot=toolchains/llvm/prebuilt/linux-x86_64/sysroot +fi + # Obtain the location of the bash script to figure out where the root of the repo is. __ScriptBaseDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" @@ -78,6 +97,7 @@ fi echo "Target API level: $__ApiLevel" echo "Target architecture: $__BuildArch" +echo "NDK version: $__NDK_Version" echo "NDK location: $__NDK_Dir" echo "Target Toolchain location: $__ToolchainDir" @@ -85,8 +105,8 @@ echo "Target Toolchain location: $__ToolchainDir" if [ ! -d $__NDK_Dir ]; then echo Downloading the NDK into $__NDK_Dir mkdir -p $__NDK_Dir - wget -q --progress=bar:force:noscroll --show-progress https://dl.google.com/android/repository/android-ndk-$__NDK_Version-linux-x86_64.zip -O $__CrossDir/android-ndk-$__NDK_Version-linux-x86_64.zip - unzip -q $__CrossDir/android-ndk-$__NDK_Version-linux-x86_64.zip -d $__CrossDir + wget -q --progress=bar:force:noscroll --show-progress https://dl.google.com/android/repository/android-ndk-$__NDK_Version-linux$__NDK_File_Arch_Spec.zip -O $__CrossDir/android-ndk-$__NDK_Version-linux.zip + unzip -q $__CrossDir/android-ndk-$__NDK_Version-linux.zip -d $__CrossDir fi if [ ! -d $__lldb_Dir ]; then @@ -116,16 +136,11 @@ for path in $(wget -qO- https://packages.termux.dev/termux-main-21/dists/stable/ fi done -cp -R "$__TmpDir/data/data/com.termux/files/usr/"* "$__ToolchainDir/sysroot/usr/" +cp -R "$__TmpDir/data/data/com.termux/files/usr/"* "$__ToolchainDir/$__SysRoot/usr/" # Generate platform file for build.sh script to assign to __DistroRid echo "Generating platform file..." -echo "RID=android.${__ApiLevel}-${__BuildArch}" > $__ToolchainDir/sysroot/android_platform - -echo "Now to build coreclr, libraries and installers; run:" -echo ROOTFS_DIR=\$\(realpath $__ToolchainDir/sysroot\) ./build.sh --cross --arch $__BuildArch \ - --subsetCategory coreclr -echo ROOTFS_DIR=\$\(realpath $__ToolchainDir/sysroot\) ./build.sh --cross --arch $__BuildArch \ - --subsetCategory libraries -echo ROOTFS_DIR=\$\(realpath $__ToolchainDir/sysroot\) ./build.sh --cross --arch $__BuildArch \ - --subsetCategory installer +echo "RID=android.${__ApiLevel}-${__BuildArch}" > $__ToolchainDir/$__SysRoot/android_platform + +echo "Now to build coreclr, libraries and host; run:" +echo ROOTFS_DIR=$(realpath $__ToolchainDir/$__SysRoot) ./build.sh clr+libs+host --cross --arch $__BuildArch diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh index 3eef7409f72..71bde0e4573 100644 --- a/eng/common/native/install-dependencies.sh +++ b/eng/common/native/install-dependencies.sh @@ -27,7 +27,7 @@ case "$os" in libssl-dev libkrb5-dev zlib1g-dev pigz cpio localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 - elif [ "$ID" = "fedora" ]; then + elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ]; then dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-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 zlib-dev openssl-dev pigz cpio diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index bd80ccccb51..f46b3c692f8 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -262,7 +262,9 @@ function GetDotNetInstallScript([string] $dotnetRoot) { if (!(Test-Path $installScript)) { Create-Directory $dotnetRoot $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit - $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" + # $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" + # Pre-flighting new install script + $uri = "https://raw.githubusercontent.com/dotnet/install-scripts/fe7622c52c1ed67871a8d2ad9e794be9be7eea01/src/dotnet-install.ps1" Retry({ Write-Host "GET $uri" diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 79b4a28e170..b4d7b0b4ee9 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -295,7 +295,9 @@ function with_retries { function GetDotNetInstallScript { local root=$1 local install_script="$root/dotnet-install.sh" - local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" + # local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" + # Pre-flight install script + local install_script_url="https://raw.githubusercontent.com/dotnet/install-scripts/fe7622c52c1ed67871a8d2ad9e794be9be7eea01/src/dotnet-install.sh" if [[ ! -a "$install_script" ]]; then mkdir -p "$root" diff --git a/global.json b/global.json index baad32e3573..b485cfeef9d 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ "version": "10.0.100-alpha.1.24573.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24617.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24622.1", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From e7ea58ac23264b07ba13210ac4a9b555b5d434f7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 27 Dec 2024 14:49:07 +0000 Subject: [PATCH 23/23] Update dependencies from https://github.com/dotnet/arcade build 20241226.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24558.2 -> To Version 10.0.0-beta.24626.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- eng/common/tools.ps1 | 6 ++---- eng/common/tools.sh | 6 ++---- global.json | 2 +- 5 files changed, 13 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c93487994b4..3da8df73602 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ - + https://github.com/dotnet/arcade - 8589bd2a216025d753b5f107081bfa28a2d51bb8 + ae8d2a08f1021624ae37cdd5b65f6c05e58a051b - + https://github.com/dotnet/arcade - 8589bd2a216025d753b5f107081bfa28a2d51bb8 + ae8d2a08f1021624ae37cdd5b65f6c05e58a051b - + https://github.com/dotnet/arcade - 8589bd2a216025d753b5f107081bfa28a2d51bb8 + ae8d2a08f1021624ae37cdd5b65f6c05e58a051b diff --git a/eng/Versions.props b/eng/Versions.props index 04ec3277909..1605e13a68d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,8 @@ - 10.0.0-beta.24622.1 - 10.0.0-beta.24622.1 + 10.0.0-beta.24626.1 + 10.0.0-beta.24626.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index f46b3c692f8..04b02f4fd3c 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -262,9 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { if (!(Test-Path $installScript)) { Create-Directory $dotnetRoot $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit - # $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" - # Pre-flighting new install script - $uri = "https://raw.githubusercontent.com/dotnet/install-scripts/fe7622c52c1ed67871a8d2ad9e794be9be7eea01/src/dotnet-install.ps1" + $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" Retry({ Write-Host "GET $uri" @@ -322,7 +320,7 @@ function InstallDotNet([string] $dotnetRoot, $variations += @($installParameters) $dotnetBuilds = $installParameters.Clone() - $dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public" + $dotnetbuilds.AzureFeed = "https://ci.dot.net/public" $variations += @($dotnetBuilds) if ($runtimeSourceFeed) { diff --git a/eng/common/tools.sh b/eng/common/tools.sh index b4d7b0b4ee9..40485a0f59d 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -232,7 +232,7 @@ function InstallDotNet { local public_location=("${installParameters[@]}") variations+=(public_location) - local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public") + local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://ci.dot.net/public") variations+=(dotnetbuilds) if [[ -n "${6:-}" ]]; then @@ -295,9 +295,7 @@ function with_retries { function GetDotNetInstallScript { local root=$1 local install_script="$root/dotnet-install.sh" - # local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" - # Pre-flight install script - local install_script_url="https://raw.githubusercontent.com/dotnet/install-scripts/fe7622c52c1ed67871a8d2ad9e794be9be7eea01/src/dotnet-install.sh" + local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" if [[ ! -a "$install_script" ]]; then mkdir -p "$root" diff --git a/global.json b/global.json index b485cfeef9d..92cdeb2bbdd 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ "version": "10.0.100-alpha.1.24573.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24622.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24626.1", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } }