From d08fd6d7eccf04b45e8280d764b235da9cf4d5f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Feb 2022 13:35:39 +0000 Subject: [PATCH 01/94] Update dependencies from https://github.com/dotnet/arcade build 20220222.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22122.3 --- eng/Version.Details.xml | 8 ++++---- global.json | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 26b90bf96..3c52c883d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 49750c02e63d0ad3a77d035bba7498a0b1acd218 + 68a9b6dc9c0f375893fcdab74b7dd2538afb1c4b - + https://github.com/dotnet/arcade - 49750c02e63d0ad3a77d035bba7498a0b1acd218 + 68a9b6dc9c0f375893fcdab74b7dd2538afb1c4b diff --git a/global.json b/global.json index 3ab69dbaa..115a05392 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22117.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22117.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22122.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22122.3" } -} \ No newline at end of file +} From afaaa63afb2adc49a623c3dc4b3ac322adeed1ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Feb 2022 13:29:56 +0000 Subject: [PATCH 02/94] Update dependencies from https://github.com/dotnet/arcade build 20220223.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22123.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c52c883d..d68b328f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 68a9b6dc9c0f375893fcdab74b7dd2538afb1c4b + 3bb832ddfb3bb788074c7f8c6528fa0e632e642c - + https://github.com/dotnet/arcade - 68a9b6dc9c0f375893fcdab74b7dd2538afb1c4b + 3bb832ddfb3bb788074c7f8c6528fa0e632e642c diff --git a/global.json b/global.json index 115a05392..b3dd23a85 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22122.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22122.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22123.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22123.1" } } From 23c7ae0b31adcb0a4be7dad7c3096ee4cc258739 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 25 Feb 2022 13:30:52 +0000 Subject: [PATCH 03/94] Update dependencies from https://github.com/dotnet/arcade build 20220224.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22124.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d68b328f3..f9e6f1231 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 3bb832ddfb3bb788074c7f8c6528fa0e632e642c + eac1a3f1eb7404c0438664381b58d7238600aafc - + https://github.com/dotnet/arcade - 3bb832ddfb3bb788074c7f8c6528fa0e632e642c + eac1a3f1eb7404c0438664381b58d7238600aafc diff --git a/global.json b/global.json index b3dd23a85..42ce91298 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22123.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22123.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22124.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22124.1" } } From 37ff34de879970cf0051e5810f081a3dd4eca575 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 27 Feb 2022 13:29:47 +0000 Subject: [PATCH 04/94] Update dependencies from https://github.com/dotnet/arcade build 20220224.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22124.4 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f9e6f1231..4a0b3a87b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - eac1a3f1eb7404c0438664381b58d7238600aafc + f7136626d0109856df867481219eb7366951985d - + https://github.com/dotnet/arcade - eac1a3f1eb7404c0438664381b58d7238600aafc + f7136626d0109856df867481219eb7366951985d diff --git a/global.json b/global.json index 42ce91298..c604ff394 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22124.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22124.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22124.4", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22124.4" } } From 701aa63f6826000f099d92788ff04628b334dc2d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Mar 2022 13:32:16 +0000 Subject: [PATCH 05/94] Update dependencies from https://github.com/dotnet/arcade build 20220301.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22151.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a0b3a87b..259f91c25 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - f7136626d0109856df867481219eb7366951985d + 801ca3a61b946c160070168bf4ba35f5ecaceba6 - + https://github.com/dotnet/arcade - f7136626d0109856df867481219eb7366951985d + 801ca3a61b946c160070168bf4ba35f5ecaceba6 diff --git a/global.json b/global.json index c604ff394..2aff57dea 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22124.4", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22124.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22151.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22151.1" } } From 27a5e9ed985d1b2d10fdcf01afa0cf87f15628cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Mar 2022 13:33:01 +0000 Subject: [PATCH 06/94] Update dependencies from https://github.com/dotnet/arcade build 20220302.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22152.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 259f91c25..57e768567 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 801ca3a61b946c160070168bf4ba35f5ecaceba6 + 566e5fb87e4f84eeb898500fd3b3d2fd96662d13 - + https://github.com/dotnet/arcade - 801ca3a61b946c160070168bf4ba35f5ecaceba6 + 566e5fb87e4f84eeb898500fd3b3d2fd96662d13 diff --git a/global.json b/global.json index 2aff57dea..f80981165 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22151.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22151.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22152.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22152.1" } } From 7367075d8985766f53a94445597f9d40c232abe3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Mar 2022 13:33:38 +0000 Subject: [PATCH 07/94] Update dependencies from https://github.com/dotnet/arcade build 20220303.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22153.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 57e768567..553424cfb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 566e5fb87e4f84eeb898500fd3b3d2fd96662d13 + a19c29a391b292519a08217314bc53de6fb2d12c - + https://github.com/dotnet/arcade - 566e5fb87e4f84eeb898500fd3b3d2fd96662d13 + a19c29a391b292519a08217314bc53de6fb2d12c diff --git a/global.json b/global.json index f80981165..c1fc58121 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22152.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22152.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22153.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22153.1" } } From 5c10d1613b99bd222977928750747ab312d9b582 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Mar 2022 13:33:42 +0000 Subject: [PATCH 08/94] Update dependencies from https://github.com/dotnet/arcade build 20220304.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22154.3 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 553424cfb..f489a9ddf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - a19c29a391b292519a08217314bc53de6fb2d12c + 8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2 - + https://github.com/dotnet/arcade - a19c29a391b292519a08217314bc53de6fb2d12c + 8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2 diff --git a/global.json b/global.json index c1fc58121..d8bcfb9a9 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22153.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22153.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22154.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22154.3" } } From 2a9a21908c6ead96849dedc577fa617eb79950e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Mar 2022 13:36:52 +0000 Subject: [PATCH 09/94] Update dependencies from https://github.com/dotnet/arcade build 20220307.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22157.6 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f489a9ddf..983e46672 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2 + 81001b45bd54f9223905bf55f6ed0125273580fa - + https://github.com/dotnet/arcade - 8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2 + 81001b45bd54f9223905bf55f6ed0125273580fa diff --git a/global.json b/global.json index d8bcfb9a9..f3a2d02e3 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22154.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22154.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22157.6", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22157.6" } } From 7249bd7a7cf67bbe6a64148a5a67d9983af545e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Mar 2022 12:39:37 +0000 Subject: [PATCH 10/94] Update dependencies from https://github.com/dotnet/arcade build 20220316.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22166.1 --- eng/Version.Details.xml | 8 ++++---- eng/common/cross/build-rootfs.sh | 4 ++-- eng/common/cross/toolchain.cmake | 16 +++++++++++++++- eng/common/retain-build.ps1 | 8 +++----- global.json | 4 ++-- 5 files changed, 26 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 983e46672..8210e35f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 81001b45bd54f9223905bf55f6ed0125273580fa + c90e2d9f3d3e2b471a078f949f2a2fea6af2627d - + https://github.com/dotnet/arcade - 81001b45bd54f9223905bf55f6ed0125273580fa + c90e2d9f3d3e2b471a078f949f2a2fea6af2627d diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 7e4be9a0c..e784c9c00 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -194,8 +194,8 @@ while :; do __LLDB_Package="liblldb-6.0-dev" ;; tizen) - if [ "$__BuildArch" != "arm" ] && [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ]; then - echo "Tizen is available only for arm, armel and arm64." + if [ "$__BuildArch" != "arm" ] && [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ] && [ "$__BuildArch" != "x86" ] ; then + echo "Tizen is available only for arm, armel, arm64 and x86." usage; exit 1; fi diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 9fd345bde..eaeeab38f 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -63,6 +63,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "s390x") elseif(TARGET_ARCH_NAME STREQUAL "x86") set(CMAKE_SYSTEM_PROCESSOR i686) set(TOOLCHAIN "i686-linux-gnu") + if(TIZEN) + set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0") + endif() elseif (FREEBSD) set(CMAKE_SYSTEM_PROCESSOR "x86_64") set(triple "x86_64-unknown-freebsd12") @@ -91,6 +94,10 @@ if(TIZEN) 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() endif() if(ANDROID) @@ -197,6 +204,13 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64") endif() elseif(TARGET_ARCH_NAME STREQUAL "x86") add_toolchain_linker_flag(-m32) + + if(TIZEN) + add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + 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}") + endif() elseif(ILLUMOS) add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/amd64/lib") @@ -232,7 +246,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") endif() if(TIZEN) - if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$") + if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64|x86)$") add_compile_options(-Wno-deprecated-declarations) # compile-time option add_compile_options(-D__extern_always_inline=inline) # compile-time option endif() diff --git a/eng/common/retain-build.ps1 b/eng/common/retain-build.ps1 index e08fc227b..e7ba975ad 100644 --- a/eng/common/retain-build.ps1 +++ b/eng/common/retain-build.ps1 @@ -8,8 +8,6 @@ Param( $ErrorActionPreference = 'Stop' Set-StrictMode -Version 2.0 -. $PSScriptRoot\tools.ps1 - function Get-AzDOHeaders( [string] $token) @@ -38,10 +36,10 @@ function Update-BuildRetention( Write-Host "Updated retention settings for build ${buildId}." } catch { - Write-PipelineTelemetryError -Category "Build" -Message "Failed to update retention settings for build: $_.Exception.Response.StatusDescription" - ExitWithExitCode 1 + Write-Error "Failed to update retention settings for build: $_.Exception.Response.StatusDescription" + exit 1 } } Update-BuildRetention -azdoOrgUri $azdoOrgUri -azdoProject $azdoProject -buildId $buildId -token $token -ExitWithExitCode 0 +exit 0 diff --git a/global.json b/global.json index f3a2d02e3..1ccda42be 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22157.6", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22157.6" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22166.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22166.1" } } From 0be0c35abd7122920599fc333cb4e132a5a50a3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Mar 2022 12:37:31 +0000 Subject: [PATCH 11/94] Update dependencies from https://github.com/dotnet/arcade build 20220317.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22167.4 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8210e35f5..15856914e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - c90e2d9f3d3e2b471a078f949f2a2fea6af2627d + 251034e7687335886c3774a0138a8584a782b0eb - + https://github.com/dotnet/arcade - c90e2d9f3d3e2b471a078f949f2a2fea6af2627d + 251034e7687335886c3774a0138a8584a782b0eb diff --git a/global.json b/global.json index 1ccda42be..6b1381d9f 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22166.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22166.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22167.4", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22167.4" } } From dc25261d4538815792eabc72cba5c314894c9fdb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 19 Mar 2022 12:35:18 +0000 Subject: [PATCH 12/94] Update dependencies from https://github.com/dotnet/arcade build 20220318.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22168.2 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15856914e..4ebc084b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 251034e7687335886c3774a0138a8584a782b0eb + bafd55901b50d6fc3507c8ed96a7777fcca1796f - + https://github.com/dotnet/arcade - 251034e7687335886c3774a0138a8584a782b0eb + bafd55901b50d6fc3507c8ed96a7777fcca1796f diff --git a/global.json b/global.json index 6b1381d9f..bd1e3e39c 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22167.4", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22167.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22168.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22168.2" } } From dd078a43b20ea3e012e6d6d27567fa470019e9b4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 22 Mar 2022 12:38:31 +0000 Subject: [PATCH 13/94] Update dependencies from https://github.com/dotnet/arcade build 20220321.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22171.2 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4ebc084b1..9aa3ee213 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - bafd55901b50d6fc3507c8ed96a7777fcca1796f + c8a95297e2622251c125aa5c0ef7c822275a792d - + https://github.com/dotnet/arcade - bafd55901b50d6fc3507c8ed96a7777fcca1796f + c8a95297e2622251c125aa5c0ef7c822275a792d diff --git a/global.json b/global.json index bd1e3e39c..850b3dbe3 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22168.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22168.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22171.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22171.2" } } From 71e1ed6b9a7f8f9488f47fd419bc091dfa3948da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Mar 2022 12:41:11 +0000 Subject: [PATCH 14/94] Update dependencies from https://github.com/dotnet/arcade build 20220329.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22179.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9aa3ee213..cb0cc08f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - c8a95297e2622251c125aa5c0ef7c822275a792d + 1527dc867ccb652def4c0f57fbd2ebbed3a94019 - + https://github.com/dotnet/arcade - c8a95297e2622251c125aa5c0ef7c822275a792d + 1527dc867ccb652def4c0f57fbd2ebbed3a94019 diff --git a/global.json b/global.json index 850b3dbe3..2cf49c029 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22171.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22171.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22179.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22179.1" } } From 7ca4c1a534cd1d9c3b615fa17528b1f7824186cd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Apr 2022 12:43:30 +0000 Subject: [PATCH 15/94] Update dependencies from https://github.com/dotnet/arcade build 20220331.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22181.2 --- eng/Version.Details.xml | 8 ++++---- global.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb0cc08f3..c6684e8ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 1527dc867ccb652def4c0f57fbd2ebbed3a94019 + e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a - + https://github.com/dotnet/arcade - 1527dc867ccb652def4c0f57fbd2ebbed3a94019 + e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a diff --git a/global.json b/global.json index 2cf49c029..b7dc7b139 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.100", + "dotnet": "7.0.100-preview.2.22153.17", "runtimes": { "dotnet": [ "5.0.14", @@ -10,11 +10,11 @@ } }, "sdk": { - "version": "6.0.100", + "version": "7.0.100-preview.2.22153.17", "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22179.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22179.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22181.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22181.2" } } From 2e9a935e9c2d596b03eae22e8f4d9127d9b3d9c8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Apr 2022 12:41:46 +0000 Subject: [PATCH 16/94] Update dependencies from https://github.com/dotnet/arcade build 20220406.10 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22206.10 --- eng/Version.Details.xml | 8 +- eng/common/init-tools-native.ps1 | 137 ++++++++++++------ .../templates/job/publish-build-assets.yml | 50 +++++-- eng/common/templates/jobs/jobs.yml | 11 +- .../templates/post-build/post-build.yml | 76 +++++----- global.json | 4 +- 6 files changed, 188 insertions(+), 98 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c6684e8ef..7c2307350 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a + 549523c3fc8929da1a3073d1a97f298e0d1dc342 - + https://github.com/dotnet/arcade - e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a + 549523c3fc8929da1a3073d1a97f298e0d1dc342 diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index db830c00a..413adea43 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -31,6 +31,10 @@ Wait time between retry attempts in seconds .PARAMETER GlobalJsonFile File path to global.json file +.PARAMETER PathPromotion +Optional switch to enable either promote native tools specified in the global.json to the path (in Azure Pipelines) +or break the build if a native tool is not found on the path (on a local dev machine) + .NOTES #> [CmdletBinding(PositionalBinding=$false)] @@ -41,7 +45,8 @@ Param ( [switch] $Force = $False, [int] $DownloadRetries = 5, [int] $RetryWaitTimeInSeconds = 30, - [string] $GlobalJsonFile + [string] $GlobalJsonFile, + [switch] $PathPromotion ) if (!$GlobalJsonFile) { @@ -77,53 +82,97 @@ try { ConvertFrom-Json | Select-Object -Expand 'native-tools' -ErrorAction SilentlyContinue if ($NativeTools) { - $NativeTools.PSObject.Properties | ForEach-Object { - $ToolName = $_.Name - $ToolVersion = $_.Value - $LocalInstallerArguments = @{ ToolName = "$ToolName" } - $LocalInstallerArguments += @{ InstallPath = "$InstallBin" } - $LocalInstallerArguments += @{ BaseUri = "$BaseUri" } - $LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" } - $LocalInstallerArguments += @{ Version = "$ToolVersion" } - - if ($Verbose) { - $LocalInstallerArguments += @{ Verbose = $True } - } - if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') { - if($Force) { - $LocalInstallerArguments += @{ Force = $True } - } - } - if ($Clean) { - $LocalInstallerArguments += @{ Clean = $True } - } - - Write-Verbose "Installing $ToolName version $ToolVersion" - Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'" - & $InstallerPath @LocalInstallerArguments - if ($LASTEXITCODE -Ne "0") { - $errMsg = "$ToolName installation failed" - if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) { - $showNativeToolsWarning = $true - if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) { - $showNativeToolsWarning = $false + if ($PathPromotion -eq $True) { + if ($env:SYSTEM_TEAMPROJECT) { # check to see if we're in an Azure pipelines build + $NativeTools.PSObject.Properties | ForEach-Object { + $ToolName = $_.Name + $ToolVersion = $_.Value + + if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { + if ($ToolVersion -eq "latest") { + $ToolVersion = "" + } + $ArcadeToolsDirectory = "C:\arcade-tools" + if (Test-Path $ArcadeToolsDirectory -eq $False) { + Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed." + exit 1 } - if ($showNativeToolsWarning) { - Write-Warning $errMsg + $ToolDirectory = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending)[0] + if ([string]::IsNullOrWhiteSpace($ToolDirectory)) { + Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image." + exit 1 } - $toolInstallationFailure = $true - } else { - # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 - Write-Host $errMsg - exit 1 + $BinPathFile = "$($ToolDirectory.FullName)\binpath.txt" + if (Test-Path -Path "$BinPathFile" -eq $False) { + Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool." + exit 1 + } + $BinPath = Get-Content "$BinPathFile" + Write-Host "Adding $ToolName to the path ($(Convert-Path -Path $BinPath))..." + Write-Host "##vso[task.prependpath]$(Convert-Path -Path $BinPath)" + } + } + exit 0 + } else { + $NativeTools.PSObject.Properties | ForEach-Object { + $ToolName = $_.Name + $ToolVersion = $_.Value + + if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { + Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "$ToolName not found on path. Please install $ToolName $ToolVersion before proceeding." + } } + exit 0 + } + } else { + $NativeTools.PSObject.Properties | ForEach-Object { + $ToolName = $_.Name + $ToolVersion = $_.Value + $LocalInstallerArguments = @{ ToolName = "$ToolName" } + $LocalInstallerArguments += @{ InstallPath = "$InstallBin" } + $LocalInstallerArguments += @{ BaseUri = "$BaseUri" } + $LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" } + $LocalInstallerArguments += @{ Version = "$ToolVersion" } + + if ($Verbose) { + $LocalInstallerArguments += @{ Verbose = $True } + } + if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') { + if($Force) { + $LocalInstallerArguments += @{ Force = $True } + } + } + if ($Clean) { + $LocalInstallerArguments += @{ Clean = $True } + } + + Write-Verbose "Installing $ToolName version $ToolVersion" + Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'" + & $InstallerPath @LocalInstallerArguments + if ($LASTEXITCODE -Ne "0") { + $errMsg = "$ToolName installation failed" + if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) { + $showNativeToolsWarning = $true + if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) { + $showNativeToolsWarning = $false + } + if ($showNativeToolsWarning) { + Write-Warning $errMsg + } + $toolInstallationFailure = $true + } else { + # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 + Write-Host $errMsg + exit 1 + } + } + } + + if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) { + # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 + Write-Host 'Native tools bootstrap failed' + exit 1 } - } - - if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) { - # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 - Write-Host 'Native tools bootstrap failed' - exit 1 } } else { diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index d91bf9147..1cbb6a0c5 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -23,23 +23,33 @@ parameters: # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing publishUsingPipelines: false + # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing + publishAssetsImmediately: false + + artifactsPublishingAdditionalParameters: '' + + signingValidationAdditionalParameters: '' + jobs: - job: Asset_Registry_Publish dependsOn: ${{ parameters.dependsOn }} - displayName: Publish to Build Asset Registry + ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + displayName: Publish Assets + ${{ else }}: + displayName: Publish to Build Asset Registry pool: ${{ parameters.pool }} variables: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - name: _BuildConfig - value: ${{ parameters.configuration }} - group: Publish-Build-Assets - group: AzureDevOps-Artifact-Feeds-Pats - name: runCodesignValidationInjection value: false + - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + - template: /eng/common/templates/post-build/common-variables.yml steps: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: @@ -52,14 +62,13 @@ jobs: condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@0 - - task: PowerShell@2 - displayName: Enable cross-org NuGet feed authentication - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-all-orgs-artifact-feeds-rw) + - task: PowerShell@2 + displayName: Enable cross-org NuGet feed authentication + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-all-orgs-artifact-feeds-rw) - task: PowerShell@2 displayName: Publish Build Assets @@ -70,7 +79,6 @@ jobs: /p:BuildAssetRegistryToken=$(MaestroAccessToken) /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:Configuration=$(_BuildConfig) /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} @@ -114,7 +122,25 @@ jobs: PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container ArtifactName: ReleaseConfigs - + + - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + - template: /eng/common/templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: PowerShell@2 + displayName: Publish Using Darc + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: -BuildId $(BARBuildId) + -PublishingInfraVersion 3 + -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -MaestroToken '$(MaestroApiAccessToken)' + -WaitPublishingFinish true + -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' + - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/templates/steps/publish-logs.yml parameters: diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 554e71cfc..2cca53c2d 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -27,6 +27,13 @@ parameters: # Optional: Override automatically derived dependsOn value for "publish build assets" job publishBuildAssetsDependsOn: '' + # Optional: Publish the assets as soon as the publish to BAR stage is complete, rather doing so in a separate stage. + publishAssetsImmediately: false + + # Optional: If using publishAssetsImmediately and additional parameters are needed, can be used to send along additional parameters (normally sent to post-build.yml) + artifactsPublishingAdditionalParameters: '' + signingValidationAdditionalParameters: '' + # Optional: should run as a public build even in the internal project # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. runAsPublic: false @@ -68,7 +75,6 @@ jobs: ${{ parameter.key }}: ${{ parameter.value }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: - template: ../job/publish-build-assets.yml parameters: @@ -94,4 +100,7 @@ jobs: runAsPublic: ${{ parameters.runAsPublic }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} + publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }} enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 2f176571f..5a9056f6b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -82,6 +82,11 @@ parameters: default: - Validate + # Optional: Call asset publishing rather than running in a separate stage + - name: publishAssetsImmediately + type: boolean + default: false + stages: - ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: - stage: Validate @@ -99,7 +104,7 @@ stages: name: VSEngSS-MicroBuild2022-1ES demands: Cmd # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + ${{ else }}: name: NetCore1ESPool-Internal demands: ImageOverride -equals Build.Server.Amd64.VS2019 @@ -136,7 +141,7 @@ stages: name: VSEngSS-MicroBuild2022-1ES demands: Cmd # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + ${{ else }}: name: NetCore1ESPool-Internal demands: ImageOverride -equals Build.Server.Amd64.VS2019 steps: @@ -196,7 +201,7 @@ stages: name: VSEngSS-MicroBuild2022-1ES demands: Cmd # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + ${{ else }}: name: NetCore1ESPool-Internal demands: ImageOverride -equals Build.Server.Amd64.VS2019 steps: @@ -235,43 +240,44 @@ stages: artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} downloadArtifacts: ${{ parameters.SDLValidationParameters.downloadArtifacts }} -- stage: publish_using_darc - ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: - dependsOn: ${{ parameters.publishDependsOn }} - ${{ if and(ne(parameters.enableNugetValidation, 'true'), ne(parameters.enableSigningValidation, 'true'), ne(parameters.enableSourceLinkValidation, 'true'), ne(parameters.SDLValidationParameters.enable, 'true')) }}: - dependsOn: ${{ parameters.validateDependsOn }} - displayName: Publish using Darc - variables: - - template: common-variables.yml - jobs: - - job: - displayName: Publish Using Darc - timeoutInMinutes: 120 - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) +- ${{ if ne(parameters.publishAssetsImmediately, 'true') }}: + - stage: publish_using_darc + ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: + dependsOn: ${{ parameters.publishDependsOn }} + ${{ else }}: + dependsOn: ${{ parameters.validateDependsOn }} + displayName: Publish using Darc + variables: + - template: common-variables.yml + jobs: + - job: + displayName: Publish Using Darc + timeoutInMinutes: 120 + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: name: VSEngSS-MicroBuild2022-1ES demands: Cmd # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + ${{ else }}: name: NetCore1ESPool-Internal demands: ImageOverride -equals Build.Server.Amd64.VS2019 - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@0 - - task: PowerShell@2 - displayName: Publish Using Darc - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) - -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' - -WaitPublishingFinish true - -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' \ No newline at end of file + - task: PowerShell@2 + displayName: Publish Using Darc + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: -BuildId $(BARBuildId) + -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} + -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -MaestroToken '$(MaestroApiAccessToken)' + -WaitPublishingFinish true + -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' \ No newline at end of file diff --git a/global.json b/global.json index b7dc7b139..a22d31c88 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22181.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22181.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22206.10", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22206.10" } } From 2e77d9eafadec01a6e3794984a65018364b83472 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Apr 2022 12:46:04 +0000 Subject: [PATCH 17/94] Update dependencies from https://github.com/dotnet/arcade build 20220411.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22211.6 --- eng/Version.Details.xml | 8 ++++---- eng/common/dotnet-install.sh | 4 ++-- global.json | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c2307350..e84b46866 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 549523c3fc8929da1a3073d1a97f298e0d1dc342 + d2715c6ef2c3e2847925250f0a8012344fbb9846 - + https://github.com/dotnet/arcade - 549523c3fc8929da1a3073d1a97f298e0d1dc342 + d2715c6ef2c3e2847925250f0a8012344fbb9846 diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index 5c94e9863..abd045a32 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -52,7 +52,7 @@ done # Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples cpuname=$(uname -m) case $cpuname in - aarch64) + arm64|aarch64) buildarch=arm64 ;; loongarch64) @@ -64,7 +64,7 @@ case $cpuname in armv*l) buildarch=arm ;; - i686) + i[3-6]86) buildarch=x86 ;; *) diff --git a/global.json b/global.json index a22d31c88..603a08b79 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22206.10", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22206.10" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22211.6", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22211.6" } } From f6c2e7408d4c296a663e25065a3deed618f676b4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Apr 2022 12:49:41 +0000 Subject: [PATCH 18/94] Update dependencies from https://github.com/dotnet/arcade build 20220412.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22212.2 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e84b46866..c31143e72 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - d2715c6ef2c3e2847925250f0a8012344fbb9846 + 2e24ed0bdbd4e3b42c296503955c837bb0b08372 - + https://github.com/dotnet/arcade - d2715c6ef2c3e2847925250f0a8012344fbb9846 + 2e24ed0bdbd4e3b42c296503955c837bb0b08372 diff --git a/global.json b/global.json index 603a08b79..4a7c8657b 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22211.6", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22211.6" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22212.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22212.2" } } From 80e78694030f6b6332a3a2b286f3a44b1f46e98d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Apr 2022 12:46:58 +0000 Subject: [PATCH 19/94] Update dependencies from https://github.com/dotnet/arcade build 20220413.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22213.2 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c31143e72..20f0c22ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 2e24ed0bdbd4e3b42c296503955c837bb0b08372 + 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 - + https://github.com/dotnet/arcade - 2e24ed0bdbd4e3b42c296503955c837bb0b08372 + 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 diff --git a/global.json b/global.json index 4a7c8657b..a0f25ceb5 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22212.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22212.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22213.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22213.2" } } From 5276ef93710293d7a1025dde8365be34d4c0487d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Apr 2022 12:45:10 +0000 Subject: [PATCH 20/94] Update dependencies from https://github.com/dotnet/arcade build 20220414.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22214.3 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 20f0c22ec..41e7cd1e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 + 5ef2983363df5e0d85181b2948e2a5b0c16aa41a - + https://github.com/dotnet/arcade - 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 + 5ef2983363df5e0d85181b2948e2a5b0c16aa41a diff --git a/global.json b/global.json index a0f25ceb5..2c8091681 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22213.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22213.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22214.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22214.3" } } From 0f7611b01cb7b56d43d718462a22c6e3a27ed3ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Apr 2022 12:42:07 +0000 Subject: [PATCH 21/94] Update dependencies from https://github.com/dotnet/arcade build 20220415.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22215.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41e7cd1e8..6a1bd41e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 5ef2983363df5e0d85181b2948e2a5b0c16aa41a + c49ad022e8d39db4bf47197aa4eebfe6428b51a7 - + https://github.com/dotnet/arcade - 5ef2983363df5e0d85181b2948e2a5b0c16aa41a + c49ad022e8d39db4bf47197aa4eebfe6428b51a7 diff --git a/global.json b/global.json index 2c8091681..e39f296ad 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22214.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22214.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22215.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22215.1" } } From d02792673a632de4be6ea5f987a6abb384603aec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 17 Apr 2022 12:38:21 +0000 Subject: [PATCH 22/94] Update dependencies from https://github.com/dotnet/arcade build 20220415.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22215.2 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a1bd41e7..43b4d7e81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - c49ad022e8d39db4bf47197aa4eebfe6428b51a7 + 4000024394df3049886c50e54ad0a2b903221ef0 - + https://github.com/dotnet/arcade - c49ad022e8d39db4bf47197aa4eebfe6428b51a7 + 4000024394df3049886c50e54ad0a2b903221ef0 diff --git a/global.json b/global.json index e39f296ad..c2f489157 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22215.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22215.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22215.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22215.2" } } From a820c817922c4d96fc6926553afef284d3e1c9ca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Apr 2022 12:40:13 +0000 Subject: [PATCH 23/94] Update dependencies from https://github.com/dotnet/arcade build 20220418.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22218.3 --- eng/Version.Details.xml | 8 ++++---- eng/common/templates/job/onelocbuild.yml | 2 +- global.json | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 43b4d7e81..14b24afba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 4000024394df3049886c50e54ad0a2b903221ef0 + 8425453874961a7d7d2379e3f39c104f9ad0a0bd - + https://github.com/dotnet/arcade - 4000024394df3049886c50e54ad0a2b903221ef0 + 8425453874961a7d7d2379e3f39c104f9ad0a0bd diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 9d1e3042d..3bcd243c4 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -72,8 +72,8 @@ jobs: lclSource: ${{ parameters.LclSource }} lclPackageId: ${{ parameters.LclPackageId }} isCreatePrSelected: ${{ parameters.CreatePr }} + isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} ${{ if eq(parameters.CreatePr, true) }}: - isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} ${{ if eq(parameters.RepoType, 'gitHub') }}: isShouldReusePrSelected: ${{ parameters.ReusePr }} diff --git a/global.json b/global.json index c2f489157..7790b8302 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22215.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22215.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22218.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22218.3" } } From 63609f9759c74473133e1bd6d5dee8e9733b0fd3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Apr 2022 12:42:50 +0000 Subject: [PATCH 24/94] Update dependencies from https://github.com/dotnet/arcade build 20220420.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22220.6 --- eng/Version.Details.xml | 8 ++++---- .../templates/job/source-index-stage1.yml | 19 ++++++++++++------- global.json | 4 ++-- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 14b24afba..0121cfa22 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 8425453874961a7d7d2379e3f39c104f9ad0a0bd + 8e2ccde11b70936d8254669a4a74653c580a1340 - + https://github.com/dotnet/arcade - 8425453874961a7d7d2379e3f39c104f9ad0a0bd + 8e2ccde11b70936d8254669a4a74653c580a1340 diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 4af724eb1..c2d51098d 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -7,6 +7,7 @@ parameters: binlogPath: artifacts/log/Debug/Build.binlog condition: '' dependsOn: '' + pool: '' jobs: - job: SourceIndexStage1 @@ -22,13 +23,17 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: source-dot-net stage1 variables - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Public - demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + ${{ if eq(parameters.pool, '') }}: + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore1ESPool-Public + demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Internal + demands: ImageOverride -equals Build.Server.Amd64.VS2019 + steps: - ${{ each preStep in parameters.preSteps }}: - ${{ preStep }} diff --git a/global.json b/global.json index 7790b8302..04b6fc206 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22218.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22218.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22220.6", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22220.6" } } From 464bdfb1802aa29013b1aedbb0f8cf807f819154 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Apr 2022 12:41:15 +0000 Subject: [PATCH 25/94] Update dependencies from https://github.com/dotnet/arcade build 20220421.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22221.2 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0121cfa22..b00bd8b09 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 8e2ccde11b70936d8254669a4a74653c580a1340 + daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 - + https://github.com/dotnet/arcade - 8e2ccde11b70936d8254669a4a74653c580a1340 + daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 diff --git a/global.json b/global.json index 04b6fc206..f55ecc3f8 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22220.6", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22220.6" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22221.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22221.2" } } From b7a6d4bd3ac3ec07be718a7d4f444b5645650e2f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Apr 2022 12:36:46 +0000 Subject: [PATCH 26/94] Update dependencies from https://github.com/dotnet/arcade build 20220422.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22222.4 --- eng/Version.Details.xml | 8 ++++---- eng/common/cross/build-rootfs.sh | 17 ++++++++++++++++- global.json | 4 ++-- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b00bd8b09..792231ced 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 + 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 - + https://github.com/dotnet/arcade - daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 + 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index e784c9c00..5a59dcff2 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -4,12 +4,13 @@ set -e usage() { - echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [--skipunmount] --rootfsdir ]" + echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [llvmx[.y]] [--skipunmount] --rootfsdir ]" echo "BuildArch can be: arm(default), armel, arm64, x86" echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine, alpine3.13 or alpine3.14. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen." echo " for FreeBSD can be: freebsd12, freebsd13" echo " for illumos can be: illumos." echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD" + echo "llvmx[.y] - optional, LLVM version for LLVM related packages." echo "--skipunmount - optional, will skip the unmount of rootfs folder." echo "--use-mirror - optional, use mirror URL to fetch resources, when available." exit 1 @@ -48,6 +49,7 @@ __AlpinePackages+=" gettext-dev" __AlpinePackages+=" icu-dev" __AlpinePackages+=" libunwind-dev" __AlpinePackages+=" lttng-ust-dev" +__AlpinePackages+=" compiler-rt-static" # CoreFX dependencies __UbuntuPackages+=" libcurl4-openssl-dev" @@ -164,6 +166,15 @@ while :; do no-lldb) unset __LLDB_Package ;; + llvm*) + version="$(echo "$lowerI" | tr -d '[:alpha:]-=')" + parts=(${version//./ }) + __LLVM_MajorVersion="${parts[0]}" + __LLVM_MinorVersion="${parts[1]}" + if [[ -z "$__LLVM_MinorVersion" && "$__LLVM_MajorVersion" -le 6 ]]; then + __LLVM_MinorVersion=0; + fi + ;; xenial) # Ubuntu 16.04 if [ "$__CodeName" != "jessie" ]; then __CodeName=xenial @@ -261,6 +272,10 @@ if [ "$__BuildArch" == "armel" ]; then fi __UbuntuPackages+=" ${__LLDB_Package:-}" +if [ ! -z "$__LLVM_MajorVersion" ]; then + __UbuntuPackages+=" libclang-common-${__LLVM_MajorVersion}${__LLVM_MinorVersion:+.$__LLVM_MinorVersion}-dev" +fi + if [ -z "$__RootfsDir" ] && [ ! -z "$ROOTFS_DIR" ]; then __RootfsDir=$ROOTFS_DIR fi diff --git a/global.json b/global.json index f55ecc3f8..770b60549 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22221.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22221.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22222.4", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22222.4" } } From 9df328a7bf9844964cca45ab9f56e771dc870835 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Apr 2022 12:36:41 +0000 Subject: [PATCH 27/94] Update dependencies from https://github.com/dotnet/arcade build 20220425.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22225.6 --- eng/Version.Details.xml | 8 ++++---- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 ++-- global.json | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 792231ced..06765cfa1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 + 5145e86df0c491e082b589aa31d69eea300adc02 - + https://github.com/dotnet/arcade - 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 + 5145e86df0c491e082b589aa31d69eea300adc02 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index b1bca63ab..119a6c660 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 "16.10.0-preview2" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.1.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 f1e1cb539..797f05292 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -365,8 +365,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/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=16.10.0-preview2&view=overview - $defaultXCopyMSBuildVersion = '16.10.0-preview2' + # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.1.0&view=overview + $defaultXCopyMSBuildVersion = '17.1.0' if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } $vsMinVersionStr = if ($vsRequirements.version) { $vsRequirements.version } else { $vsMinVersionReqdStr } diff --git a/global.json b/global.json index 770b60549..0b92526a4 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22222.4", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22222.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22225.6", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22225.6" } } From be6c6c7d850a0047ea01bfb0f5b57bfe65da1f71 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 May 2022 12:40:05 +0000 Subject: [PATCH 28/94] Update dependencies from https://github.com/dotnet/arcade build 20220504.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22254.2 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06765cfa1..991316d6f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 5145e86df0c491e082b589aa31d69eea300adc02 + 9c9de91045b8691364e40426177da2e5c535d3ab - + https://github.com/dotnet/arcade - 5145e86df0c491e082b589aa31d69eea300adc02 + 9c9de91045b8691364e40426177da2e5c535d3ab diff --git a/global.json b/global.json index 0b92526a4..6e34da29d 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22225.6", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22225.6" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22254.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22254.2" } } From 383ef6654e87988d8e5e3846b8a8b88336e57e80 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 7 May 2022 12:40:33 +0000 Subject: [PATCH 29/94] Update dependencies from https://github.com/dotnet/arcade build 20220505.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22255.2 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 991316d6f..5dc2acb37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 9c9de91045b8691364e40426177da2e5c535d3ab + ba1c3aff4be864c493031d989259ef92aaa23fc3 - + https://github.com/dotnet/arcade - 9c9de91045b8691364e40426177da2e5c535d3ab + ba1c3aff4be864c493031d989259ef92aaa23fc3 diff --git a/global.json b/global.json index 6e34da29d..cddc930c1 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22254.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22254.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22255.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22255.2" } } From 36f87b36f8fa770ec35e64e5a990c364ae85b211 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 May 2022 12:41:41 +0000 Subject: [PATCH 30/94] Update dependencies from https://github.com/dotnet/arcade build 20220509.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22259.5 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5dc2acb37..52074feac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - ba1c3aff4be864c493031d989259ef92aaa23fc3 + 6e533ee7a479018586f2314295ad113f6ba1d5b1 - + https://github.com/dotnet/arcade - ba1c3aff4be864c493031d989259ef92aaa23fc3 + 6e533ee7a479018586f2314295ad113f6ba1d5b1 diff --git a/global.json b/global.json index cddc930c1..165df0e10 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22255.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22255.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22259.5", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22259.5" } } From 9bc3a09bb85d2930a5ce241d9d1dd5c81a35fa96 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 May 2022 12:41:44 +0000 Subject: [PATCH 31/94] Update dependencies from https://github.com/dotnet/arcade build 20220510.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22260.2 --- eng/Version.Details.xml | 8 ++++---- eng/common/internal/Tools.csproj | 3 +++ global.json | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 52074feac..e641344ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 6e533ee7a479018586f2314295ad113f6ba1d5b1 + 6baad99219dda29b3c8efd7d627393cda4b38372 - + https://github.com/dotnet/arcade - 6e533ee7a479018586f2314295ad113f6ba1d5b1 + 6baad99219dda29b3c8efd7d627393cda4b38372 diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index beb9c4648..7f5ce6d60 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -8,6 +8,9 @@ + + + diff --git a/global.json b/global.json index 165df0e10..8e6ee5c60 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22259.5", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22259.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22260.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22260.2" } } From 9c9555cefa4e355632ecceda9b2951ef48d55c5e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 May 2022 12:40:51 +0000 Subject: [PATCH 32/94] Update dependencies from https://github.com/dotnet/arcade build 20220511.14 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22261.14 --- eng/Version.Details.xml | 8 ++++---- eng/common/init-tools-native.ps1 | 11 ++++++----- global.json | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e641344ee..91f0144b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 6baad99219dda29b3c8efd7d627393cda4b38372 + 666b83fa183306e9adec817c903ec93da2a4703c - + https://github.com/dotnet/arcade - 6baad99219dda29b3c8efd7d627393cda4b38372 + 666b83fa183306e9adec817c903ec93da2a4703c diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index 413adea43..24a5e65de 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -93,7 +93,7 @@ try { $ToolVersion = "" } $ArcadeToolsDirectory = "C:\arcade-tools" - if (Test-Path $ArcadeToolsDirectory -eq $False) { + if (-not (Test-Path $ArcadeToolsDirectory)) { Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed." exit 1 } @@ -103,13 +103,14 @@ try { exit 1 } $BinPathFile = "$($ToolDirectory.FullName)\binpath.txt" - if (Test-Path -Path "$BinPathFile" -eq $False) { + if (-not (Test-Path -Path "$BinPathFile")) { Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool." exit 1 } $BinPath = Get-Content "$BinPathFile" - Write-Host "Adding $ToolName to the path ($(Convert-Path -Path $BinPath))..." - Write-Host "##vso[task.prependpath]$(Convert-Path -Path $BinPath)" + $ToolPath = Convert-Path -Path $BinPath + Write-Host "Adding $ToolName to the path ($ToolPath)..." + Write-Host "##vso[task.prependpath]$ToolPath" } } exit 0 @@ -188,7 +189,7 @@ try { Write-Host "##vso[task.prependpath]$(Convert-Path -Path $InstallBin)" return $InstallBin } - else { + elseif (-not ($PathPromotion)) { Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message 'Native tools install directory does not exist, installation failed' exit 1 } diff --git a/global.json b/global.json index 8e6ee5c60..3a3ecfb98 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22260.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22260.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22261.14", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22261.14" } } From 5f3cde5e6349bf77591eada9997aa19833e617a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 May 2022 12:38:21 +0000 Subject: [PATCH 33/94] Update dependencies from https://github.com/dotnet/arcade build 20220512.8 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22262.8 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 91f0144b6..575a2e330 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 666b83fa183306e9adec817c903ec93da2a4703c + b7796f653e48e001123963f17387c052891b48e6 - + https://github.com/dotnet/arcade - 666b83fa183306e9adec817c903ec93da2a4703c + b7796f653e48e001123963f17387c052891b48e6 diff --git a/global.json b/global.json index 3a3ecfb98..3956bc536 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22261.14", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22261.14" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22262.8", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22262.8" } } From 0bfa0a87f2eb8b6a70086e44c3e5b40e52003a52 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 May 2022 12:42:59 +0000 Subject: [PATCH 34/94] Update dependencies from https://github.com/dotnet/arcade build 20220516.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22266.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 575a2e330..9b4cffc1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - b7796f653e48e001123963f17387c052891b48e6 + 70d269dfe645525adb6836d25d8a97d7960eda1a - + https://github.com/dotnet/arcade - b7796f653e48e001123963f17387c052891b48e6 + 70d269dfe645525adb6836d25d8a97d7960eda1a diff --git a/global.json b/global.json index 3956bc536..13db7f183 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22262.8", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22262.8" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22266.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22266.1" } } From 79f56389569ecd4113af7986b1dbe57f081dfe29 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 21 May 2022 12:39:02 +0000 Subject: [PATCH 35/94] Update dependencies from https://github.com/dotnet/arcade build 20220519.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22269.3 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b4cffc1f..e809d37d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 70d269dfe645525adb6836d25d8a97d7960eda1a + 0403b0d07aff1b103256cfbe082c97a5c8846d20 - + https://github.com/dotnet/arcade - 70d269dfe645525adb6836d25d8a97d7960eda1a + 0403b0d07aff1b103256cfbe082c97a5c8846d20 diff --git a/global.json b/global.json index 13db7f183..5a0ec18b8 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22266.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22266.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22269.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22269.3" } } From d6cbcf6b50f3d77b02c23426424b557f927b302a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 24 May 2022 12:39:30 +0000 Subject: [PATCH 36/94] Update dependencies from https://github.com/dotnet/arcade build 20220523.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22273.1 --- eng/Version.Details.xml | 8 ++++---- eng/common/tools.ps1 | 4 ++++ global.json | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e809d37d7..fc0a479ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 0403b0d07aff1b103256cfbe082c97a5c8846d20 + ad55f9b957b9539613ecff82649d17650e4624d2 - + https://github.com/dotnet/arcade - 0403b0d07aff1b103256cfbe082c97a5c8846d20 + ad55f9b957b9539613ecff82649d17650e4624d2 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 797f05292..423bd962e 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -635,6 +635,10 @@ function InitializeNativeTools() { InstallDirectory = "$ToolsDir" } } + if (Test-Path variable:NativeToolsOnMachine) { + Write-Host "Variable NativeToolsOnMachine detected, enabling native tool path promotion..." + $nativeArgs += @{ PathPromotion = $true } + } & "$PSScriptRoot/init-tools-native.ps1" @nativeArgs } } diff --git a/global.json b/global.json index 5a0ec18b8..5fc3b9778 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22269.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22269.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22273.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22273.1" } } From 5a74dccf685d9857d482e2eab2e94218f565eaf6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 25 May 2022 12:39:58 +0000 Subject: [PATCH 37/94] Update dependencies from https://github.com/dotnet/arcade build 20220524.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22274.7 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc0a479ec..6ada48b03 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - ad55f9b957b9539613ecff82649d17650e4624d2 + 007adcd66f519c3c96fa0ecc21ed197a6da9e015 - + https://github.com/dotnet/arcade - ad55f9b957b9539613ecff82649d17650e4624d2 + 007adcd66f519c3c96fa0ecc21ed197a6da9e015 diff --git a/global.json b/global.json index 5fc3b9778..89dc2b5de 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22273.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22273.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22274.7", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22274.7" } } From 290fe5c8ed1682f063535bfca09b730b8cc0e5c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 26 May 2022 12:44:41 +0000 Subject: [PATCH 38/94] Update dependencies from https://github.com/dotnet/arcade build 20220525.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22275.2 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ada48b03..d21c8a00d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 007adcd66f519c3c96fa0ecc21ed197a6da9e015 + a8aae93d709533604b73c619268415c6ccc71292 - + https://github.com/dotnet/arcade - 007adcd66f519c3c96fa0ecc21ed197a6da9e015 + a8aae93d709533604b73c619268415c6ccc71292 diff --git a/global.json b/global.json index 89dc2b5de..2a96dcf55 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22274.7", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22274.7" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22275.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22275.2" } } From 69525da86ed5467fd6e49b2b747132d60e3124f0 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Thu, 26 May 2022 16:17:59 -0700 Subject: [PATCH 39/94] Install a .NET 6 runtime for CI --- global.json | 1 + 1 file changed, 1 insertion(+) diff --git a/global.json b/global.json index 2a96dcf55..4b336ae70 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,7 @@ "dotnet": "7.0.100-preview.2.22153.17", "runtimes": { "dotnet": [ + "6.0.5", "5.0.14", "3.1.7", "2.1.11" From d2e5ffaa165db5aaa3fe4b43b74e90a2b2c6db3e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 27 May 2022 12:40:47 +0000 Subject: [PATCH 40/94] Update dependencies from https://github.com/dotnet/arcade build 20220526.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22276.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d21c8a00d..cd1619408 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - a8aae93d709533604b73c619268415c6ccc71292 + b8b67b243ba93bf9b89390c85b4dee034d3c5609 - + https://github.com/dotnet/arcade - a8aae93d709533604b73c619268415c6ccc71292 + b8b67b243ba93bf9b89390c85b4dee034d3c5609 diff --git a/global.json b/global.json index 4b336ae70..95317f342 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22275.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22275.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22276.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22276.1" } } From 4f9567e625e44d575ed8e1918181d012c778f9f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 31 May 2022 12:40:23 +0000 Subject: [PATCH 41/94] Update dependencies from https://github.com/dotnet/arcade build 20220530.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22280.2 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd1619408..9fc94b356 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - b8b67b243ba93bf9b89390c85b4dee034d3c5609 + 08693ec7238902569631ccacdb004e3af9f147c4 - + https://github.com/dotnet/arcade - b8b67b243ba93bf9b89390c85b4dee034d3c5609 + 08693ec7238902569631ccacdb004e3af9f147c4 diff --git a/global.json b/global.json index 95317f342..27e7f8b2c 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22276.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22276.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22280.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22280.2" } } From 56e89ca53df891f6c0350512d7f0136077198bae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 1 Jun 2022 12:42:22 +0000 Subject: [PATCH 42/94] Update dependencies from https://github.com/dotnet/arcade build 20220531.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22281.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9fc94b356..5a4f81e49 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 08693ec7238902569631ccacdb004e3af9f147c4 + 8137eb745128ca78602a16c63d6b4090a5409785 - + https://github.com/dotnet/arcade - 08693ec7238902569631ccacdb004e3af9f147c4 + 8137eb745128ca78602a16c63d6b4090a5409785 diff --git a/global.json b/global.json index 27e7f8b2c..5047922af 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22280.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22280.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22281.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22281.1" } } From ddfc18d03a7d12f8f7f3f99dbb0ccb4ec68d8952 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 2 Jun 2022 12:38:10 +0000 Subject: [PATCH 43/94] Update dependencies from https://github.com/dotnet/arcade build 20220601.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22301.2 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a4f81e49..ff56f5c00 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 8137eb745128ca78602a16c63d6b4090a5409785 + 7ffde50ec98dbe3584bef2375165ec9a6b39cb35 - + https://github.com/dotnet/arcade - 8137eb745128ca78602a16c63d6b4090a5409785 + 7ffde50ec98dbe3584bef2375165ec9a6b39cb35 diff --git a/global.json b/global.json index 5047922af..77da970c1 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22281.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22281.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22301.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22301.2" } } From 817a95f61f13b69724a0a0d6e241a8bd1d296291 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Jun 2022 12:41:34 +0000 Subject: [PATCH 44/94] Update dependencies from https://github.com/dotnet/arcade build 20220606.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22306.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff56f5c00..1d9d4b087 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 7ffde50ec98dbe3584bef2375165ec9a6b39cb35 + 7f522f2e42fd8c2064afb45eac34a1773ce6a1cc - + https://github.com/dotnet/arcade - 7ffde50ec98dbe3584bef2375165ec9a6b39cb35 + 7f522f2e42fd8c2064afb45eac34a1773ce6a1cc diff --git a/global.json b/global.json index 77da970c1..ff507fe78 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22301.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22301.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22306.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22306.1" } } From 254ba617cafe6b7ba583184fb2c834f24b2b8cb1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Jun 2022 12:41:40 +0000 Subject: [PATCH 45/94] Update dependencies from https://github.com/dotnet/arcade build 20220606.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22306.2 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d9d4b087..7b83fcf35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 7f522f2e42fd8c2064afb45eac34a1773ce6a1cc + 8f311fed1f2acf0ecfdfcecbc7a9fa871ed634cc - + https://github.com/dotnet/arcade - 7f522f2e42fd8c2064afb45eac34a1773ce6a1cc + 8f311fed1f2acf0ecfdfcecbc7a9fa871ed634cc diff --git a/global.json b/global.json index ff507fe78..d42d49091 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22306.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22306.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22306.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22306.2" } } From d5f46e8653e832a87e8104057fdb019cafec0bfd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Jun 2022 12:41:19 +0000 Subject: [PATCH 46/94] Update dependencies from https://github.com/dotnet/arcade build 20220608.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22308.5 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b83fcf35..40ece8cd7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 8f311fed1f2acf0ecfdfcecbc7a9fa871ed634cc + d681cd3568168a97aa4cf50a61af9ec74d307eb8 - + https://github.com/dotnet/arcade - 8f311fed1f2acf0ecfdfcecbc7a9fa871ed634cc + d681cd3568168a97aa4cf50a61af9ec74d307eb8 diff --git a/global.json b/global.json index d42d49091..a10f1f2fb 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22306.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22306.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22308.5", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22308.5" } } From 5b193581a7856ccf1e11b83d7b85b431faf11c65 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 11 Jun 2022 12:44:50 +0000 Subject: [PATCH 47/94] Update dependencies from https://github.com/dotnet/arcade build 20220610.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22310.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 40ece8cd7..8f2ad124b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - d681cd3568168a97aa4cf50a61af9ec74d307eb8 + 64c91380e3a363632470cacc667fe1dc0693b675 - + https://github.com/dotnet/arcade - d681cd3568168a97aa4cf50a61af9ec74d307eb8 + 64c91380e3a363632470cacc667fe1dc0693b675 diff --git a/global.json b/global.json index a10f1f2fb..df3cb58f0 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22308.5", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22308.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22310.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22310.1" } } From 47c5838f2a7415e298334b5f59b9de2368829509 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Jun 2022 12:44:10 +0000 Subject: [PATCH 48/94] Update dependencies from https://github.com/dotnet/arcade build 20220613.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22313.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8f2ad124b..c0c801bcb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 64c91380e3a363632470cacc667fe1dc0693b675 + 569a3f07467a9ebf55b78bbf92ab10b85e597819 - + https://github.com/dotnet/arcade - 64c91380e3a363632470cacc667fe1dc0693b675 + 569a3f07467a9ebf55b78bbf92ab10b85e597819 diff --git a/global.json b/global.json index df3cb58f0..e252d64c9 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22310.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22310.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22313.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22313.1" } } From 6c01206ee6cb7f39e1d237be222592c1e38adabd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Jun 2022 12:47:09 +0000 Subject: [PATCH 49/94] Update dependencies from https://github.com/dotnet/arcade build 20220614.8 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22314.8 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0c801bcb..4ae6fae66 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 569a3f07467a9ebf55b78bbf92ab10b85e597819 + 696eeede14b91aebe0069dc2e4a91cf594d2073e - + https://github.com/dotnet/arcade - 569a3f07467a9ebf55b78bbf92ab10b85e597819 + 696eeede14b91aebe0069dc2e4a91cf594d2073e diff --git a/global.json b/global.json index e252d64c9..dfcff7d95 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22313.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22313.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22314.8", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22314.8" } } From cf48086cdcbc121d0a113f577fea25ec1afc08f7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Jun 2022 12:46:45 +0000 Subject: [PATCH 50/94] Update dependencies from https://github.com/dotnet/arcade build 20220616.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22316.2 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4ae6fae66..24300a5ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 696eeede14b91aebe0069dc2e4a91cf594d2073e + ccfe6da198c5f05534863bbb1bff66e830e0c6ab - + https://github.com/dotnet/arcade - 696eeede14b91aebe0069dc2e4a91cf594d2073e + ccfe6da198c5f05534863bbb1bff66e830e0c6ab diff --git a/global.json b/global.json index dfcff7d95..921aa740b 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22314.8", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22314.8" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22316.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22316.2" } } From f8e4fe02e13d090b4c14dfa2b353e95a21fd5a4c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Jun 2022 12:45:49 +0000 Subject: [PATCH 51/94] Update dependencies from https://github.com/dotnet/arcade build 20220620.8 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22320.8 --- eng/Version.Details.xml | 8 ++++---- eng/common/templates/steps/send-to-helix.yml | 10 +++++----- global.json | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24300a5ac..6b46ed45c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - ccfe6da198c5f05534863bbb1bff66e830e0c6ab + 0429934b0c13fc3e6a990b482a7892bac0b76708 - + https://github.com/dotnet/arcade - ccfe6da198c5f05534863bbb1bff66e830e0c6ab + 0429934b0c13fc3e6a990b482a7892bac0b76708 diff --git a/eng/common/templates/steps/send-to-helix.yml b/eng/common/templates/steps/send-to-helix.yml index 09a223989..3eb7e2d5f 100644 --- a/eng/common/templates/steps/send-to-helix.yml +++ b/eng/common/templates/steps/send-to-helix.yml @@ -3,7 +3,7 @@ parameters: HelixSource: 'pr/default' # required -- sources must start with pr/, official/, prodcon/, or agent/ HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/' HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number - HelixTargetQueues: '' # required -- semicolon delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues + HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group HelixConfiguration: '' # optional -- additional property attached to a job HelixPreCommands: '' # optional -- commands to run before Helix work item execution @@ -12,7 +12,7 @@ parameters: WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload - XUnitProjects: '' # optional -- semicolon delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true + XUnitProjects: '' # optional -- semicolon-delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true XUnitWorkItemTimeout: '' # optional -- the workitem timeout in seconds for all workitems created from the xUnit projects specified by XUnitProjects XUnitPublishTargetFramework: '' # optional -- framework to use to publish your xUnit projects XUnitRuntimeTargetFramework: '' # optional -- framework to use for the xUnit console runner @@ -22,14 +22,14 @@ parameters: DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget." IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set - HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting int) + HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net ) Creator: '' # optional -- if the build is external, use this to specify who is sending the job DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO condition: succeeded() # optional -- condition for step to execute; defaults to succeeded() continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false steps: - - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' + - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' displayName: ${{ parameters.DisplayNamePrefix }} (Windows) env: BuildConfig: $(_BuildConfig) @@ -59,7 +59,7 @@ steps: SYSTEM_ACCESSTOKEN: $(System.AccessToken) condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) continueOnError: ${{ parameters.continueOnError }} - - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog + - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog displayName: ${{ parameters.DisplayNamePrefix }} (Unix) env: BuildConfig: $(_BuildConfig) diff --git a/global.json b/global.json index 921aa740b..701d05667 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22316.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22316.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22320.8", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22320.8" } } From 7467d45e41a2b59974411bfd5b4a95ab5f643768 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Jun 2022 12:48:49 +0000 Subject: [PATCH 52/94] Update dependencies from https://github.com/dotnet/arcade build 20220622.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22322.3 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6b46ed45c..0c50f7845 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 0429934b0c13fc3e6a990b482a7892bac0b76708 + eaa4673f2a82355f7cd2f1c1243578be2e961d0f - + https://github.com/dotnet/arcade - 0429934b0c13fc3e6a990b482a7892bac0b76708 + eaa4673f2a82355f7cd2f1c1243578be2e961d0f diff --git a/global.json b/global.json index 701d05667..a35f70929 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22320.8", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22320.8" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22322.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22322.3" } } From 5ba787b2a358fa1c4c11ad6e49113a59fd4187e5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Jun 2022 12:49:00 +0000 Subject: [PATCH 53/94] Update dependencies from https://github.com/dotnet/arcade build 20220623.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22323.2 --- eng/Version.Details.xml | 8 ++++---- eng/common/tools.ps1 | 2 +- eng/common/tools.sh | 2 +- global.json | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c50f7845..5fa760adf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - eaa4673f2a82355f7cd2f1c1243578be2e961d0f + 9dbd4ef3347980e68875996239f3272efb85dd04 - + https://github.com/dotnet/arcade - eaa4673f2a82355f7cd2f1c1243578be2e961d0f + 9dbd4ef3347980e68875996239f3272efb85dd04 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 423bd962e..395b43eeb 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -573,7 +573,7 @@ function InitializeBuildTool() { ExitWithExitCode 1 } $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet') - $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'netcoreapp3.1' } + $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net7.0' } } elseif ($msbuildEngine -eq "vs") { try { $msbuildPath = InitializeVisualStudioMSBuild -install:$restore diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 17f0a3658..c110d0ed4 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -312,7 +312,7 @@ function InitializeBuildTool { # return values _InitializeBuildTool="$_InitializeDotNetCli/dotnet" _InitializeBuildToolCommand="msbuild" - _InitializeBuildToolFramework="netcoreapp3.1" + _InitializeBuildToolFramework="net7.0" } # Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116 diff --git a/global.json b/global.json index a35f70929..92213a2e5 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22322.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22322.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22323.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22323.2" } } From 935926ecb04e16d59b672f6284b4f68058108799 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Jun 2022 12:41:31 +0000 Subject: [PATCH 54/94] Update dependencies from https://github.com/dotnet/arcade build 20220624.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22324.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5fa760adf..5288f092d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 9dbd4ef3347980e68875996239f3272efb85dd04 + d4623961318d0d6e013389bb9f1269492b5384b0 - + https://github.com/dotnet/arcade - 9dbd4ef3347980e68875996239f3272efb85dd04 + d4623961318d0d6e013389bb9f1269492b5384b0 diff --git a/global.json b/global.json index 92213a2e5..1048874e8 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22323.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22323.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22324.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22324.1" } } From 2cecd86ee1eff880c390a7b94ee63cae2183b767 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Jun 2022 12:45:30 +0000 Subject: [PATCH 55/94] Update dependencies from https://github.com/dotnet/arcade build 20220627.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22327.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5288f092d..987f51819 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - d4623961318d0d6e013389bb9f1269492b5384b0 + 640c1cc2a140b322c4f30f6d6b85f35f0c4c7313 - + https://github.com/dotnet/arcade - d4623961318d0d6e013389bb9f1269492b5384b0 + 640c1cc2a140b322c4f30f6d6b85f35f0c4c7313 diff --git a/global.json b/global.json index 1048874e8..5fb4f8dfb 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22324.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22324.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22327.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22327.1" } } From 3eb0be47c528bce7b1a5bb2374b795ad4504afdf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Jun 2022 12:45:07 +0000 Subject: [PATCH 56/94] Update dependencies from https://github.com/dotnet/arcade build 20220627.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22327.2 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 987f51819..345db29dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 640c1cc2a140b322c4f30f6d6b85f35f0c4c7313 + a264eb13fea14125f3ef8d4056586cd66fa55309 - + https://github.com/dotnet/arcade - 640c1cc2a140b322c4f30f6d6b85f35f0c4c7313 + a264eb13fea14125f3ef8d4056586cd66fa55309 diff --git a/global.json b/global.json index 5fb4f8dfb..59cd7d50e 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22327.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22327.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22327.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22327.2" } } From 033934226bb68b16524eb08649da1ef29abf6d0a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Jul 2022 12:46:04 +0000 Subject: [PATCH 57/94] Update dependencies from https://github.com/dotnet/arcade build 20220704.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22354.1 --- eng/Version.Details.xml | 8 ++++---- eng/common/init-tools-native.ps1 | 4 +++- eng/common/tools.ps1 | 2 +- global.json | 8 ++++---- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 345db29dd..3248e857c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - a264eb13fea14125f3ef8d4056586cd66fa55309 + 66cb5f1f50059cbafe25d1b75a1adbbced840d85 - + https://github.com/dotnet/arcade - a264eb13fea14125f3ef8d4056586cd66fa55309 + 66cb5f1f50059cbafe25d1b75a1adbbced840d85 diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index 24a5e65de..8d48ec568 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -87,6 +87,7 @@ try { $NativeTools.PSObject.Properties | ForEach-Object { $ToolName = $_.Name $ToolVersion = $_.Value + $InstalledTools = @{} if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { if ($ToolVersion -eq "latest") { @@ -111,9 +112,10 @@ try { $ToolPath = Convert-Path -Path $BinPath Write-Host "Adding $ToolName to the path ($ToolPath)..." Write-Host "##vso[task.prependpath]$ToolPath" + $InstalledTools += @{ $ToolName = $ToolDirectory.FullName } } } - exit 0 + return $InstalledTools } else { $NativeTools.PSObject.Properties | ForEach-Object { $ToolName = $_.Name diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 395b43eeb..9638c63c7 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -635,7 +635,7 @@ function InitializeNativeTools() { InstallDirectory = "$ToolsDir" } } - if (Test-Path variable:NativeToolsOnMachine) { + if ($env:NativeToolsOnMachine) { Write-Host "Variable NativeToolsOnMachine detected, enabling native tool path promotion..." $nativeArgs += @{ PathPromotion = $true } } diff --git a/global.json b/global.json index 59cd7d50e..e50a92974 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100-preview.2.22153.17", + "dotnet": "7.0.100-preview.5.22307.18", "runtimes": { "dotnet": [ "6.0.5", @@ -11,11 +11,11 @@ } }, "sdk": { - "version": "7.0.100-preview.2.22153.17", + "version": "7.0.100-preview.5.22307.18", "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22327.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22327.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22354.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22354.1" } } From e93805dbe2b8f5801dde909456edd462232e072f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Jul 2022 12:45:25 +0000 Subject: [PATCH 58/94] Update dependencies from https://github.com/dotnet/arcade build 20220705.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22355.4 --- eng/Version.Details.xml | 8 ++++---- eng/common/native/init-compiler.sh | 2 +- global.json | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3248e857c..727fb0df5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 66cb5f1f50059cbafe25d1b75a1adbbced840d85 + 9f45238c23d89cf44a10705db1217e66a441ba5a - + https://github.com/dotnet/arcade - 66cb5f1f50059cbafe25d1b75a1adbbced840d85 + 9f45238c23d89cf44a10705db1217e66a441ba5a diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 6d7ba15e5..4b99a9cad 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then # Set default versions if [[ -z "$majorVersion" ]]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [[ "$compiler" == "clang" ]]; then versions=( 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) + if [[ "$compiler" == "clang" ]]; then versions=( 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do diff --git a/global.json b/global.json index e50a92974..6f254e02d 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22354.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22354.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22355.4", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22355.4" } } From a18653a69a43aafa56ab7087a781f7e0fa7747f3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Jul 2022 12:46:37 +0000 Subject: [PATCH 59/94] Update dependencies from https://github.com/dotnet/arcade build 20220706.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22356.3 --- eng/Version.Details.xml | 8 ++++---- eng/common/generate-locproject.ps1 | 14 ++++++-------- global.json | 4 ++-- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 727fb0df5..83145b9db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 9f45238c23d89cf44a10705db1217e66a441ba5a + 78adce7e3545bf5a5252fd9963969d8950fadea6 - + https://github.com/dotnet/arcade - 9f45238c23d89cf44a10705db1217e66a441ba5a + 78adce7e3545bf5a5252fd9963969d8950fadea6 diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index 25e97ac00..afdd17502 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -10,9 +10,7 @@ Param( Set-StrictMode -Version 2.0 $ErrorActionPreference = "Stop" -. $PSScriptRoot\tools.ps1 - -Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1') +. $PSScriptRoot\pipeline-logging-functions.ps1 $exclusionsFilePath = "$SourcesDirectory\eng\Localize\LocExclusions.json" $exclusions = @{ Exclusions = @() } @@ -28,7 +26,7 @@ $jsonFiles = @() $jsonTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\.+\.en\.json" } # .NET templating pattern $jsonTemplateFiles | ForEach-Object { $null = $_.Name -Match "(.+)\.[\w-]+\.json" # matches '[filename].[langcode].json - + $destinationFile = "$($_.Directory.FullName)\$($Matches.1).json" $jsonFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru } @@ -46,7 +44,7 @@ if ($allXlfFiles) { } $langXlfFiles | ForEach-Object { $null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf - + $destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf" $xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru } @@ -59,7 +57,7 @@ $locJson = @{ LanguageSet = $LanguageSet LocItems = @( $locFiles | ForEach-Object { - $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")" + $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")" $continue = $true foreach ($exclusion in $exclusions.Exclusions) { if ($outputPath.Contains($exclusion)) @@ -108,10 +106,10 @@ else { if ((Get-FileHash "$SourcesDirectory\eng\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\eng\Localize\LocProject.json").Hash) { Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them." - + exit 1 } else { Write-Host "Generated LocProject.json and current LocProject.json are identical." } -} \ No newline at end of file +} diff --git a/global.json b/global.json index 6f254e02d..73d74cd57 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22355.4", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22355.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22356.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22356.3" } } From 2e3c4260b5d78088ab516efb976d5e39459dfe5e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Jul 2022 12:43:32 +0000 Subject: [PATCH 60/94] Update dependencies from https://github.com/dotnet/arcade build 20220708.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22358.3 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83145b9db..daec2447c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 78adce7e3545bf5a5252fd9963969d8950fadea6 + 54a00a84b53b63a74d232498a9d1476ff2000b7f - + https://github.com/dotnet/arcade - 78adce7e3545bf5a5252fd9963969d8950fadea6 + 54a00a84b53b63a74d232498a9d1476ff2000b7f diff --git a/global.json b/global.json index 73d74cd57..43a1add47 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22356.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22356.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22358.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22358.3" } } From f58f00f60dff57e59e1a729c9524cb3a1970eb53 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Jul 2022 12:46:42 +0000 Subject: [PATCH 61/94] Update dependencies from https://github.com/dotnet/arcade build 20220712.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22362.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index daec2447c..f09d765c3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 54a00a84b53b63a74d232498a9d1476ff2000b7f + bd18f30f71daf7eaaf1d70363c303bd7dfac65a2 - + https://github.com/dotnet/arcade - 54a00a84b53b63a74d232498a9d1476ff2000b7f + bd18f30f71daf7eaaf1d70363c303bd7dfac65a2 diff --git a/global.json b/global.json index 43a1add47..b5a663845 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22358.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22358.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22362.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22362.1" } } From abe4ea107512402db73d05329aba2e30914facc9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Jul 2022 12:44:45 +0000 Subject: [PATCH 62/94] Update dependencies from https://github.com/dotnet/arcade build 20220713.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22363.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f09d765c3..646a6d38c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - bd18f30f71daf7eaaf1d70363c303bd7dfac65a2 + 3895dfc219f7cea2c028164db691389d0b1a73a8 - + https://github.com/dotnet/arcade - bd18f30f71daf7eaaf1d70363c303bd7dfac65a2 + 3895dfc219f7cea2c028164db691389d0b1a73a8 diff --git a/global.json b/global.json index b5a663845..5efea389c 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22362.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22362.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22363.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22363.1" } } From 5b3152162b5bfe4e0983864a5c4fad73cae99a65 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Jul 2022 12:45:18 +0000 Subject: [PATCH 63/94] Update dependencies from https://github.com/dotnet/arcade build 20220714.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22364.1 --- eng/Version.Details.xml | 8 ++++---- eng/common/cross/build-rootfs.sh | 33 ++++++++++++++++++-------------- eng/common/cross/toolchain.cmake | 30 ++++++++++++++++++----------- global.json | 4 ++-- 4 files changed, 44 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 646a6d38c..fb2b0373e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 3895dfc219f7cea2c028164db691389d0b1a73a8 + 22e05f347f297e09e9ee58c22e139d2f5f5ec297 - + https://github.com/dotnet/arcade - 3895dfc219f7cea2c028164db691389d0b1a73a8 + 22e05f347f297e09e9ee58c22e139d2f5f5ec297 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 5a59dcff2..c8540474a 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -5,7 +5,7 @@ set -e usage() { echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [llvmx[.y]] [--skipunmount] --rootfsdir ]" - echo "BuildArch can be: arm(default), armel, arm64, x86" + echo "BuildArch can be: arm(default), armel, arm64, x86, x64" echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine, alpine3.13 or alpine3.14. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen." echo " for FreeBSD can be: freebsd12, freebsd13" echo " for illumos can be: illumos." @@ -21,6 +21,9 @@ __CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) __InitialDir=$PWD __BuildArch=arm __AlpineArch=armv7 +__FreeBSDArch=arm +__FreeBSDMachineArch=armv7 +__IllumosArch=arm7 __QEMUArch=arm __UbuntuArch=armhf __UbuntuRepo="http://ports.ubuntu.com/" @@ -115,6 +118,8 @@ while :; do __UbuntuArch=arm64 __AlpineArch=aarch64 __QEMUArch=aarch64 + __FreeBSDArch=arm64 + __FreeBSDMachineArch=aarch64 ;; armel) __BuildArch=armel @@ -140,6 +145,14 @@ while :; do __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//') unset __LLDB_Package ;; + x64) + __BuildArch=x64 + __UbuntuArch=amd64 + __FreeBSDArch=amd64 + __FreeBSDMachineArch=amd64 + __illumosArch=x86_64 + __UbuntuRepo= + ;; x86) __BuildArch=x86 __UbuntuArch=i386 @@ -205,11 +218,6 @@ while :; do __LLDB_Package="liblldb-6.0-dev" ;; tizen) - if [ "$__BuildArch" != "arm" ] && [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ] && [ "$__BuildArch" != "x86" ] ; then - echo "Tizen is available only for arm, armel, arm64 and x86." - usage; - exit 1; - fi __CodeName= __UbuntuRepo= __Tizen=tizen @@ -228,19 +236,16 @@ while :; do ;; freebsd12) __CodeName=freebsd - __BuildArch=x64 __SkipUnmount=1 ;; freebsd13) __CodeName=freebsd __FreeBSDBase="13.0-RELEASE" __FreeBSDABI="13" - __BuildArch=x64 __SkipUnmount=1 ;; illumos) __CodeName=illumos - __BuildArch=x64 __SkipUnmount=1 ;; --skipunmount) @@ -312,8 +317,8 @@ if [[ "$__CodeName" == "alpine" ]]; then elif [[ "$__CodeName" == "freebsd" ]]; then mkdir -p $__RootfsDir/usr/local/etc JOBS="$(getconf _NPROCESSORS_ONLN)" - wget -O - https://download.freebsd.org/ftp/releases/amd64/${__FreeBSDBase}/base.txz | tar -C $__RootfsDir -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version - echo "ABI = \"FreeBSD:${__FreeBSDABI}:amd64\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > ${__RootfsDir}/usr/local/etc/pkg.conf + wget -O - 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 + 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 mkdir -p $__RootfsDir/tmp # get and build package manager @@ -335,7 +340,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then echo "Building binutils. Please wait.." wget -O - https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.bz2 | tar -xjf - mkdir build-binutils && cd build-binutils - ../binutils-2.33.1/configure --prefix="$__RootfsDir" --target="x86_64-sun-solaris2.10" --program-prefix="x86_64-illumos-" --with-sysroot="$__RootfsDir" + ../binutils-2.33.1/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.10" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" make -j "$JOBS" && make install && cd .. echo "Building gcc. Please wait.." wget -O - https://ftp.gnu.org/gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz | tar -xJf - @@ -345,7 +350,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then CFLAGS_FOR_TARGET="-fPIC" export CFLAGS CXXFLAGS CXXFLAGS_FOR_TARGET CFLAGS_FOR_TARGET mkdir build-gcc && cd build-gcc - ../gcc-8.4.0/configure --prefix="$__RootfsDir" --target="x86_64-sun-solaris2.10" --program-prefix="x86_64-illumos-" --with-sysroot="$__RootfsDir" --with-gnu-as \ + ../gcc-8.4.0/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.10" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" --with-gnu-as \ --with-gnu-ld --disable-nls --disable-libgomp --disable-libquadmath --disable-libssp --disable-libvtv --disable-libcilkrts --disable-libada --disable-libsanitizer \ --disable-libquadmath-support --disable-shared --enable-tls make -j "$JOBS" && make install && cd .. @@ -353,7 +358,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then if [[ "$__UseMirror" == 1 ]]; then BaseUrl=http://pkgsrc.smartos.skylime.net fi - BaseUrl="$BaseUrl"/packages/SmartOS/2020Q1/x86_64/All + BaseUrl="$BaseUrl"/packages/SmartOS/2020Q1/${__illumosArch}/All echo "Downloading dependencies." read -ra array <<<"$__IllumosPackages" for package in "${array[@]}"; do diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index eaeeab38f..d5dfc1350 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -48,11 +48,13 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64") set(CMAKE_SYSTEM_PROCESSOR aarch64) if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/aarch64-alpine-linux-musl) set(TOOLCHAIN "aarch64-alpine-linux-musl") - else() + elseif(LINUX) set(TOOLCHAIN "aarch64-linux-gnu") - endif() - if(TIZEN) - set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0") + if(TIZEN) + set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0") + endif() + elseif(FREEBSD) + set(triple "aarch64-unknown-freebsd12") endif() elseif(TARGET_ARCH_NAME STREQUAL "ppc64le") set(CMAKE_SYSTEM_PROCESSOR ppc64le) @@ -66,12 +68,18 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") if(TIZEN) set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0") endif() -elseif (FREEBSD) - set(CMAKE_SYSTEM_PROCESSOR "x86_64") - set(triple "x86_64-unknown-freebsd12") -elseif (ILLUMOS) - set(CMAKE_SYSTEM_PROCESSOR "x86_64") - set(TOOLCHAIN "x86_64-illumos") +elseif(TARGET_ARCH_NAME STREQUAL "x64") + set(CMAKE_SYSTEM_PROCESSOR x86_64) + if(LINUX) + set(TOOLCHAIN "x86_64-linux-gnu") + if(TIZEN) + set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0") + endif() + elseif(FREEBSD) + set(triple "x86_64-unknown-freebsd12") + elseif(ILLUMOS) + set(TOOLCHAIN "x86_64-illumos") + endif() else() message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, armv6, arm64, ppc64le, s390x and x86 are supported!") endif() @@ -218,7 +226,7 @@ endif() # Specify compile options -if((TARGET_ARCH_NAME MATCHES "^(arm|armv6|armel|arm64|ppc64le|s390x)$" AND NOT ANDROID) OR ILLUMOS) +if((TARGET_ARCH_NAME MATCHES "^(arm|armv6|armel|arm64|ppc64le|s390x)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS) 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 5efea389c..de5a7a951 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22363.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22363.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22364.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22364.1" } } From 079cd0996129cdae59d194aa860a77df36938fb1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Jul 2022 12:35:24 +0000 Subject: [PATCH 64/94] Update dependencies from https://github.com/dotnet/arcade build 20220715.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22365.4 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb2b0373e..4e8413762 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 22e05f347f297e09e9ee58c22e139d2f5f5ec297 + f7951a64db920ea599bd6819065b661d88d26b23 - + https://github.com/dotnet/arcade - 22e05f347f297e09e9ee58c22e139d2f5f5ec297 + f7951a64db920ea599bd6819065b661d88d26b23 diff --git a/global.json b/global.json index de5a7a951..5230a818a 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22364.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22364.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22365.4", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22365.4" } } From 8f0b239eb5337c64f30382c6972385fb51421aac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Jul 2022 12:45:25 +0000 Subject: [PATCH 65/94] Update dependencies from https://github.com/dotnet/arcade build 20220717.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22367.1 --- eng/Version.Details.xml | 4 ++-- global.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4e8413762..e1da87964 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ - + https://github.com/dotnet/arcade f7951a64db920ea599bd6819065b661d88d26b23 - + https://github.com/dotnet/arcade f7951a64db920ea599bd6819065b661d88d26b23 diff --git a/global.json b/global.json index 5230a818a..220ea6998 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22365.4", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22365.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22367.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22367.1" } } From 5dd9f2cd7d918f7e7de75805426c28101a96e7da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Jul 2022 12:46:49 +0000 Subject: [PATCH 66/94] Update dependencies from https://github.com/dotnet/arcade build 20220718.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22368.5 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e1da87964..b17eacb80 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - f7951a64db920ea599bd6819065b661d88d26b23 + 6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0 - + https://github.com/dotnet/arcade - f7951a64db920ea599bd6819065b661d88d26b23 + 6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0 diff --git a/global.json b/global.json index 220ea6998..3df63b854 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22367.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22367.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22368.5", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22368.5" } } From 6ce9a2a2bf900186d6c27d0bcee910e7a6a666f1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Jul 2022 12:47:46 +0000 Subject: [PATCH 67/94] Update dependencies from https://github.com/dotnet/arcade build 20220719.9 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22369.9 --- eng/Version.Details.xml | 8 ++++---- eng/common/generate-sbom-prep.ps1 | 2 ++ eng/common/generate-sbom-prep.sh | 12 ++++++++++++ global.json | 4 ++-- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b17eacb80..b24cff83a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0 + cda764613f89280de6d5c5383ebded9ac01ebd00 - + https://github.com/dotnet/arcade - 6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0 + cda764613f89280de6d5c5383ebded9ac01ebd00 diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1 index a733a8885..3e5c1c74a 100644 --- a/eng/common/generate-sbom-prep.ps1 +++ b/eng/common/generate-sbom-prep.ps1 @@ -2,6 +2,8 @@ Param( [Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed ) +. $PSScriptRoot\pipeline-logging-functions.ps1 + Write-Host "Creating dir $ManifestDirPath" # create directory for sbom manifest to be placed if (!(Test-Path -path $ManifestDirPath)) diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh index f6c774531..d5c76dc82 100644 --- a/eng/common/generate-sbom-prep.sh +++ b/eng/common/generate-sbom-prep.sh @@ -2,6 +2,18 @@ source="${BASH_SOURCE[0]}" +# resolve $SOURCE until the file is no longer a symlink +while [[ -h $source ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" +. $scriptroot/pipeline-logging-functions.sh + manifest_dir=$1 if [ ! -d "$manifest_dir" ] ; then diff --git a/global.json b/global.json index 3df63b854..f1c8aa02b 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22368.5", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22368.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22369.9", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22369.9" } } From 8bd94e5d6b4c950812469d469988e28f76ec0236 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Jul 2022 12:46:48 +0000 Subject: [PATCH 68/94] Update dependencies from https://github.com/dotnet/arcade build 20220720.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22370.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b24cff83a..fe62dc8c2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - cda764613f89280de6d5c5383ebded9ac01ebd00 + 2da4f9da491ecf07fe08d8a117f3265a0433fc23 - + https://github.com/dotnet/arcade - cda764613f89280de6d5c5383ebded9ac01ebd00 + 2da4f9da491ecf07fe08d8a117f3265a0433fc23 diff --git a/global.json b/global.json index f1c8aa02b..7c7eaf213 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22369.9", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22369.9" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22370.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22370.1" } } From ab33ef1a4646edec7326f7694a0bf44775f99c30 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Jul 2022 12:45:48 +0000 Subject: [PATCH 69/94] Update dependencies from https://github.com/dotnet/arcade build 20220722.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22372.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe62dc8c2..9ca734b8b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 2da4f9da491ecf07fe08d8a117f3265a0433fc23 + 11672d906390046e77a34b6406d9e02229fd7e45 - + https://github.com/dotnet/arcade - 2da4f9da491ecf07fe08d8a117f3265a0433fc23 + 11672d906390046e77a34b6406d9e02229fd7e45 diff --git a/global.json b/global.json index 7c7eaf213..b4ae47c52 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22370.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22370.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22372.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22372.1" } } From f54edaa4b9a7d1c4968629fb6823630e1d84ea16 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Jul 2022 12:49:18 +0000 Subject: [PATCH 70/94] Update dependencies from https://github.com/dotnet/arcade build 20220725.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22375.4 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ca734b8b..c5ab13f8f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 11672d906390046e77a34b6406d9e02229fd7e45 + 5d3e421833a18b48eed5bda24f4d5f65a75cf970 - + https://github.com/dotnet/arcade - 11672d906390046e77a34b6406d9e02229fd7e45 + 5d3e421833a18b48eed5bda24f4d5f65a75cf970 diff --git a/global.json b/global.json index b4ae47c52..be788ef10 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22372.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22372.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22375.4", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22375.4" } } From d743d6513f9fc0212767955e0e6aff4263cbfdc1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Jul 2022 12:41:02 +0000 Subject: [PATCH 71/94] Update dependencies from https://github.com/dotnet/arcade build 20220726.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22376.3 --- eng/Version.Details.xml | 8 ++++---- eng/common/build.sh | 17 ++++++++++++++++- global.json | 4 ++-- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c5ab13f8f..3b360cc06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 5d3e421833a18b48eed5bda24f4d5f65a75cf970 + 37e6d5179448c5255f1517834463210dcc45963a - + https://github.com/dotnet/arcade - 5d3e421833a18b48eed5bda24f4d5f65a75cf970 + 37e6d5179448c5255f1517834463210dcc45963a diff --git a/eng/common/build.sh b/eng/common/build.sh index 55b298f16..9031d41ea 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -19,6 +19,9 @@ usage() echo "Actions:" echo " --restore Restore dependencies (short: -r)" echo " --build Build solution (short: -b)" + echo " --source-build Source-build the solution (short: -sb)" + echo " Will additionally trigger the following actions: --restore, --build, --pack" + echo " If --configuration is not set explicitly, will also set it to 'Release'" echo " --rebuild Rebuild solution" echo " --test Run all unit tests in the solution (short: -t)" echo " --integrationTest Run all integration tests in the solution" @@ -55,6 +58,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" restore=false build=false +source_build=false rebuild=false test=false integration_test=false @@ -73,7 +77,7 @@ exclude_ci_binary_log=false pipelines_log=false projects='' -configuration='Debug' +configuration='' prepare_machine=false verbosity='minimal' runtime_source_feed='' @@ -119,6 +123,12 @@ while [[ $# > 0 ]]; do -pack) pack=true ;; + -sourcebuild|-sb) + build=true + source_build=true + restore=true + pack=true + ;; -test|-t) test=true ;; @@ -168,6 +178,10 @@ while [[ $# > 0 ]]; do shift done +if [[ -z "$configuration" ]]; then + if [[ "$source_build" = true ]]; then configuration="Release"; else configuration="Debug"; fi +fi + if [[ "$ci" == true ]]; then pipelines_log=true node_reuse=false @@ -205,6 +219,7 @@ function Build { /p:RepoRoot="$repo_root" \ /p:Restore=$restore \ /p:Build=$build \ + /p:ArcadeBuildFromSource=$source_build \ /p:Rebuild=$rebuild \ /p:Test=$test \ /p:Pack=$pack \ diff --git a/global.json b/global.json index be788ef10..06acdd381 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22375.4", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22375.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22376.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22376.3" } } From 7a02e19d77493c72fce11d5b9d6090d9bea6adb4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Jul 2022 12:44:59 +0000 Subject: [PATCH 72/94] Update dependencies from https://github.com/dotnet/arcade build 20220727.15 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22377.15 --- eng/Version.Details.xml | 8 +- eng/common/cross/build-rootfs.sh | 121 +++++++++++++++---------------- global.json | 4 +- 3 files changed, 64 insertions(+), 69 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b360cc06..2ea3cd4bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 37e6d5179448c5255f1517834463210dcc45963a + 7df67590fb080663ada77f269a8b132ef127a039 - + https://github.com/dotnet/arcade - 37e6d5179448c5255f1517834463210dcc45963a + 7df67590fb080663ada77f269a8b132ef127a039 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index c8540474a..77eaac60c 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -18,7 +18,6 @@ usage() __CodeName=xenial __CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -__InitialDir=$PWD __BuildArch=arm __AlpineArch=armv7 __FreeBSDArch=arm @@ -43,7 +42,7 @@ __AlpinePackages+=" libedit" # symlinks fixer __UbuntuPackages+=" symlinks" -# CoreCLR and CoreFX dependencies +# runtime dependencies __UbuntuPackages+=" libicu-dev" __UbuntuPackages+=" liblttng-ust-dev" __UbuntuPackages+=" libunwind8-dev" @@ -54,7 +53,7 @@ __AlpinePackages+=" libunwind-dev" __AlpinePackages+=" lttng-ust-dev" __AlpinePackages+=" compiler-rt-static" -# CoreFX dependencies +# runtime libraries' dependencies __UbuntuPackages+=" libcurl4-openssl-dev" __UbuntuPackages+=" libkrb5-dev" __UbuntuPackages+=" libssl-dev" @@ -84,17 +83,18 @@ __IllumosPackages+=" zlib-1.2.11" __UbuntuPackages+=" libomp5" __UbuntuPackages+=" libomp-dev" +__Keyring= __UseMirror=0 __UnprocessedBuildArgs= while :; do - if [ $# -le 0 ]; then + if [[ "$#" -le 0 ]]; then break fi - lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")" + lowerI="$(echo "$1" | tr "[:upper:]" "[:lower:]")" case $lowerI in - -?|-h|--help) + -\?|-h|--help) usage exit 1 ;; @@ -111,7 +111,7 @@ while :; do __UbuntuRepo="http://raspbian.raspberrypi.org/raspbian/" __CodeName=buster __LLDB_Package="liblldb-6.0-dev" - __Keyring="/usr/share/keyrings/raspbian-archive-keyring.gpg" + __Keyring="--keyring /usr/share/keyrings/raspbian-archive-keyring.gpg" ;; arm64) __BuildArch=arm64 @@ -189,17 +189,17 @@ while :; do fi ;; xenial) # Ubuntu 16.04 - if [ "$__CodeName" != "jessie" ]; then + if [[ "$__CodeName" != "jessie" ]]; then __CodeName=xenial fi ;; zesty) # Ubuntu 17.04 - if [ "$__CodeName" != "jessie" ]; then + if [[ "$__CodeName" != "jessie" ]]; then __CodeName=zesty fi ;; bionic) # Ubuntu 18.04 - if [ "$__CodeName" != "jessie" ]; then + if [[ "$__CodeName" != "jessie" ]]; then __CodeName=bionic fi ;; @@ -253,7 +253,7 @@ while :; do ;; --rootfsdir|-rootfsdir) shift - __RootfsDir=$1 + __RootfsDir="$1" ;; --use-mirror) __UseMirror=1 @@ -266,71 +266,66 @@ while :; do shift done -if [ -e "$__Keyring" ]; then - __Keyring="--keyring=$__Keyring" -else - __Keyring="" -fi - -if [ "$__BuildArch" == "armel" ]; then +if [[ "$__BuildArch" == "armel" ]]; then __LLDB_Package="lldb-3.5-dev" fi + __UbuntuPackages+=" ${__LLDB_Package:-}" -if [ ! -z "$__LLVM_MajorVersion" ]; then +if [[ -n "$__LLVM_MajorVersion" ]]; then __UbuntuPackages+=" libclang-common-${__LLVM_MajorVersion}${__LLVM_MinorVersion:+.$__LLVM_MinorVersion}-dev" fi -if [ -z "$__RootfsDir" ] && [ ! -z "$ROOTFS_DIR" ]; then - __RootfsDir=$ROOTFS_DIR +if [[ -z "$__RootfsDir" && -n "$ROOTFS_DIR" ]]; then + __RootfsDir="$ROOTFS_DIR" fi -if [ -z "$__RootfsDir" ]; then +if [[ -z "$__RootfsDir" ]]; then __RootfsDir="$__CrossDir/../../../.tools/rootfs/$__BuildArch" fi -if [ -d "$__RootfsDir" ]; then - if [ $__SkipUnmount == 0 ]; then - umount $__RootfsDir/* || true +if [[ -d "$__RootfsDir" ]]; then + if [[ "$__SkipUnmount" == "0" ]]; then + umount "$__RootfsDir"/* || true fi - rm -rf $__RootfsDir + rm -rf "$__RootfsDir" fi -mkdir -p $__RootfsDir +mkdir -p "$__RootfsDir" __RootfsDir="$( cd "$__RootfsDir" && pwd )" if [[ "$__CodeName" == "alpine" ]]; then __ApkToolsVersion=2.9.1 - __ApkToolsDir=$(mktemp -d) - wget https://github.com/alpinelinux/apk-tools/releases/download/v$__ApkToolsVersion/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz -P $__ApkToolsDir - tar -xf $__ApkToolsDir/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz -C $__ApkToolsDir - mkdir -p $__RootfsDir/usr/bin - cp -v /usr/bin/qemu-$__QEMUArch-static $__RootfsDir/usr/bin + __ApkToolsDir="$(mktemp -d)" + wget "https://github.com/alpinelinux/apk-tools/releases/download/v$__ApkToolsVersion/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz" -P "$__ApkToolsDir" + tar -xf "$__ApkToolsDir/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz" -C "$__ApkToolsDir" + mkdir -p "$__RootfsDir"/usr/bin + cp -v "/usr/bin/qemu-$__QEMUArch-static" "$__RootfsDir/usr/bin" - $__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \ - -X http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/main \ - -X http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/community \ - -U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \ + "$__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk" \ + -X "http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/main" \ + -X "http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/community" \ + -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" --initdb \ add $__AlpinePackages - rm -r $__ApkToolsDir + rm -r "$__ApkToolsDir" elif [[ "$__CodeName" == "freebsd" ]]; then - mkdir -p $__RootfsDir/usr/local/etc + mkdir -p "$__RootfsDir"/usr/local/etc JOBS="$(getconf _NPROCESSORS_ONLN)" - wget -O - 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 - 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 - mkdir -p $__RootfsDir/tmp + wget -O - "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 + 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 + mkdir -p "$__RootfsDir"/tmp # get and build package manager - wget -O - https://github.com/freebsd/pkg/archive/${__FreeBSDPkg}.tar.gz | tar -C $__RootfsDir/tmp -zxf - - cd $__RootfsDir/tmp/pkg-${__FreeBSDPkg} + wget -O - "https://github.com/freebsd/pkg/archive/${__FreeBSDPkg}.tar.gz" | tar -C "$__RootfsDir"/tmp -zxf - + cd "$__RootfsDir/tmp/pkg-${__FreeBSDPkg}" # needed for install to succeed - mkdir -p $__RootfsDir/host/etc - ./autogen.sh && ./configure --prefix=$__RootfsDir/host && make -j "$JOBS" && make install - rm -rf $__RootfsDir/tmp/pkg-${__FreeBSDPkg} + mkdir -p "$__RootfsDir"/host/etc + ./autogen.sh && ./configure --prefix="$__RootfsDir"/host && make -j "$JOBS" && make install + rm -rf "$__RootfsDir/tmp/pkg-${__FreeBSDPkg}" # install packages we need. - INSTALL_AS_USER=$(whoami) $__RootfsDir/host/sbin/pkg -r $__RootfsDir -C $__RootfsDir/usr/local/etc/pkg.conf update - INSTALL_AS_USER=$(whoami) $__RootfsDir/host/sbin/pkg -r $__RootfsDir -C $__RootfsDir/usr/local/etc/pkg.conf install --yes $__FreeBSDPackages + INSTALL_AS_USER=$(whoami) "$__RootfsDir"/host/sbin/pkg -r "$__RootfsDir" -C "$__RootfsDir"/usr/local/etc/pkg.conf update + INSTALL_AS_USER=$(whoami) "$__RootfsDir"/host/sbin/pkg -r "$__RootfsDir" -C "$__RootfsDir"/usr/local/etc/pkg.conf install --yes $__FreeBSDPackages elif [[ "$__CodeName" == "illumos" ]]; then mkdir "$__RootfsDir/tmp" pushd "$__RootfsDir/tmp" @@ -358,7 +353,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then if [[ "$__UseMirror" == 1 ]]; then BaseUrl=http://pkgsrc.smartos.skylime.net fi - BaseUrl="$BaseUrl"/packages/SmartOS/2020Q1/${__illumosArch}/All + BaseUrl="$BaseUrl/packages/SmartOS/2020Q1/${__illumosArch}/All" echo "Downloading dependencies." read -ra array <<<"$__IllumosPackages" for package in "${array[@]}"; do @@ -376,26 +371,26 @@ elif [[ "$__CodeName" == "illumos" ]]; then wget -P "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/dlt.h wget -P "$__RootfsDir"/usr/include/netpacket https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/inet/sockmods/netpacket/packet.h wget -P "$__RootfsDir"/usr/include/sys https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/sys/sdt.h -elif [[ -n $__CodeName ]]; then - qemu-debootstrap $__Keyring --arch $__UbuntuArch $__CodeName $__RootfsDir $__UbuntuRepo - cp $__CrossDir/$__BuildArch/sources.list.$__CodeName $__RootfsDir/etc/apt/sources.list - chroot $__RootfsDir apt-get update - chroot $__RootfsDir apt-get -f -y install - chroot $__RootfsDir apt-get -y install $__UbuntuPackages - chroot $__RootfsDir symlinks -cr /usr - chroot $__RootfsDir apt-get clean +elif [[ -n "$__CodeName" ]]; then + qemu-debootstrap $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo" + cp "$__CrossDir/$__BuildArch/sources.list.$__CodeName" "$__RootfsDir/etc/apt/sources.list" + chroot "$__RootfsDir" apt-get update + chroot "$__RootfsDir" apt-get -f -y install + chroot "$__RootfsDir" apt-get -y install $__UbuntuPackages + chroot "$__RootfsDir" symlinks -cr /usr + chroot "$__RootfsDir" apt-get clean - if [ $__SkipUnmount == 0 ]; then - umount $__RootfsDir/* || true + if [[ "$__SkipUnmount" == "0" ]]; then + umount "$__RootfsDir"/* || true fi if [[ "$__BuildArch" == "armel" && "$__CodeName" == "jessie" ]]; then - pushd $__RootfsDir - patch -p1 < $__CrossDir/$__BuildArch/armel.jessie.patch + pushd "$__RootfsDir" + patch -p1 < "$__CrossDir/$__BuildArch/armel.jessie.patch" popd fi elif [[ "$__Tizen" == "tizen" ]]; then - ROOTFS_DIR=$__RootfsDir $__CrossDir/$__BuildArch/tizen-build-rootfs.sh + ROOTFS_DIR="$__RootfsDir $__CrossDir/$__BuildArch/tizen-build-rootfs.sh" else echo "Unsupported target platform." usage; diff --git a/global.json b/global.json index 06acdd381..8d3077887 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22376.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22376.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22377.15", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22377.15" } } From 0bd9b0b56f491407811e66419a168e4d82397ca7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 29 Jul 2022 12:43:19 +0000 Subject: [PATCH 73/94] Update dependencies from https://github.com/dotnet/arcade build 20220728.16 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22378.16 --- eng/Version.Details.xml | 8 ++-- eng/common/build.sh | 2 +- eng/common/cross/build-rootfs.sh | 37 ++++++++++++------ eng/common/cross/riscv64/sources.list.sid | 1 + eng/common/cross/toolchain.cmake | 47 ++++++++++++----------- global.json | 4 +- 6 files changed, 59 insertions(+), 40 deletions(-) create mode 100644 eng/common/cross/riscv64/sources.list.sid diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ea3cd4bb..1d951774d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 7df67590fb080663ada77f269a8b132ef127a039 + 6f93ec8da69a42fbe9a702a33e104f94773c3f03 - + https://github.com/dotnet/arcade - 7df67590fb080663ada77f269a8b132ef127a039 + 6f93ec8da69a42fbe9a702a33e104f94773c3f03 diff --git a/eng/common/build.sh b/eng/common/build.sh index 9031d41ea..50af40cdd 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -19,7 +19,7 @@ usage() echo "Actions:" echo " --restore Restore dependencies (short: -r)" echo " --build Build solution (short: -b)" - echo " --source-build Source-build the solution (short: -sb)" + echo " --sourceBuild Source-build the solution (short: -sb)" echo " Will additionally trigger the following actions: --restore, --build, --pack" echo " If --configuration is not set explicitly, will also set it to 'Release'" echo " --rebuild Rebuild solution" diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 77eaac60c..f058c9876 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -5,7 +5,7 @@ set -e usage() { echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [llvmx[.y]] [--skipunmount] --rootfsdir ]" - echo "BuildArch can be: arm(default), armel, arm64, x86, x64" + echo "BuildArch can be: arm(default), arm64, armel, armv6, ppc64le, riscv64, s390x, x64, x86" echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine, alpine3.13 or alpine3.14. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen." echo " for FreeBSD can be: freebsd12, freebsd13" echo " for illumos can be: illumos." @@ -104,15 +104,6 @@ while :; do __AlpineArch=armv7 __QEMUArch=arm ;; - armv6) - __BuildArch=armv6 - __UbuntuArch=armhf - __QEMUArch=arm - __UbuntuRepo="http://raspbian.raspberrypi.org/raspbian/" - __CodeName=buster - __LLDB_Package="liblldb-6.0-dev" - __Keyring="--keyring /usr/share/keyrings/raspbian-archive-keyring.gpg" - ;; arm64) __BuildArch=arm64 __UbuntuArch=arm64 @@ -127,6 +118,18 @@ while :; do __UbuntuRepo="http://ftp.debian.org/debian/" __CodeName=jessie ;; + armv6) + __BuildArch=armv6 + __UbuntuArch=armhf + __QEMUArch=arm + __UbuntuRepo="http://raspbian.raspberrypi.org/raspbian/" + __CodeName=buster + __LLDB_Package="liblldb-6.0-dev" + + if [[ -e "/usr/share/keyrings/raspbian-archive-keyring.gpg" ]]; then + __Keyring="--keyring /usr/share/keyrings/raspbian-archive-keyring.gpg" + fi + ;; ppc64le) __BuildArch=ppc64le __UbuntuArch=ppc64el @@ -136,6 +139,18 @@ while :; do __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//') unset __LLDB_Package ;; + riscv64) + __BuildArch=riscv64 + __UbuntuArch=riscv64 + __UbuntuRepo="http://deb.debian.org/debian-ports" + __CodeName=sid + __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//') + unset __LLDB_Package + + if [[ -e "/usr/share/keyrings/debian-ports-archive-keyring.gpg" ]]; then + __Keyring="--keyring /usr/share/keyrings/debian-ports-archive-keyring.gpg --include=debian-ports-archive-keyring" + fi + ;; s390x) __BuildArch=s390x __UbuntuArch=s390x @@ -390,7 +405,7 @@ elif [[ -n "$__CodeName" ]]; then popd fi elif [[ "$__Tizen" == "tizen" ]]; then - ROOTFS_DIR="$__RootfsDir $__CrossDir/$__BuildArch/tizen-build-rootfs.sh" + ROOTFS_DIR="$__RootfsDir" "$__CrossDir/$__BuildArch/tizen-build-rootfs.sh" else echo "Unsupported target platform." usage; diff --git a/eng/common/cross/riscv64/sources.list.sid b/eng/common/cross/riscv64/sources.list.sid new file mode 100644 index 000000000..65f730d22 --- /dev/null +++ b/eng/common/cross/riscv64/sources.list.sid @@ -0,0 +1 @@ +deb http://deb.debian.org/debian-ports sid main diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index d5dfc1350..909117759 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -19,13 +19,7 @@ elseif(EXISTS ${CROSS_ROOTFS}/android_platform) set(ANDROID 1) endif() -if(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") - endif() -elseif(TARGET_ARCH_NAME STREQUAL "arm") +if(TARGET_ARCH_NAME STREQUAL "arm") set(CMAKE_SYSTEM_PROCESSOR armv7l) if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv7-alpine-linux-musleabihf) set(TOOLCHAIN "armv7-alpine-linux-musleabihf") @@ -37,13 +31,6 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm") if(TIZEN) set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0") endif() -elseif(TARGET_ARCH_NAME STREQUAL "armv6") - set(CMAKE_SYSTEM_PROCESSOR armv6l) - if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf) - set(TOOLCHAIN "armv6-alpine-linux-musleabihf") - else() - set(TOOLCHAIN "arm-linux-gnueabihf") - endif() elseif(TARGET_ARCH_NAME STREQUAL "arm64") set(CMAKE_SYSTEM_PROCESSOR aarch64) if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/aarch64-alpine-linux-musl) @@ -56,18 +43,28 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64") elseif(FREEBSD) set(triple "aarch64-unknown-freebsd12") endif() +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") + endif() +elseif(TARGET_ARCH_NAME STREQUAL "armv6") + set(CMAKE_SYSTEM_PROCESSOR armv6l) + if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf) + set(TOOLCHAIN "armv6-alpine-linux-musleabihf") + else() + set(TOOLCHAIN "arm-linux-gnueabihf") + endif() elseif(TARGET_ARCH_NAME STREQUAL "ppc64le") set(CMAKE_SYSTEM_PROCESSOR ppc64le) set(TOOLCHAIN "powerpc64le-linux-gnu") +elseif(TARGET_ARCH_NAME STREQUAL "riscv64") + set(CMAKE_SYSTEM_PROCESSOR riscv64) + set(TOOLCHAIN "riscv64-linux-gnu") elseif(TARGET_ARCH_NAME STREQUAL "s390x") set(CMAKE_SYSTEM_PROCESSOR s390x) set(TOOLCHAIN "s390x-linux-gnu") -elseif(TARGET_ARCH_NAME STREQUAL "x86") - set(CMAKE_SYSTEM_PROCESSOR i686) - set(TOOLCHAIN "i686-linux-gnu") - if(TIZEN) - set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0") - endif() elseif(TARGET_ARCH_NAME STREQUAL "x64") set(CMAKE_SYSTEM_PROCESSOR x86_64) if(LINUX) @@ -80,8 +77,14 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64") elseif(ILLUMOS) set(TOOLCHAIN "x86_64-illumos") endif() +elseif(TARGET_ARCH_NAME STREQUAL "x86") + set(CMAKE_SYSTEM_PROCESSOR i686) + set(TOOLCHAIN "i686-linux-gnu") + if(TIZEN) + set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0") + endif() else() - message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, armv6, arm64, ppc64le, s390x and x86 are supported!") + message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!") endif() if(DEFINED ENV{TOOLCHAIN}) @@ -226,7 +229,7 @@ endif() # Specify compile options -if((TARGET_ARCH_NAME MATCHES "^(arm|armv6|armel|arm64|ppc64le|s390x)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS) +if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|ppc64le|riscv64|s390x)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS) 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 8d3077887..3c02d9aae 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22377.15", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22377.15" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22378.16", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22378.16" } } From e766397fddd2de7945bf1e98f3a46cc705478146 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 30 Jul 2022 12:45:03 +0000 Subject: [PATCH 74/94] Update dependencies from https://github.com/dotnet/arcade build 20220729.10 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22379.10 --- eng/Version.Details.xml | 8 +-- eng/common/SetupNugetSources.ps1 | 18 ++--- eng/common/SetupNugetSources.sh | 68 +++++++------------ .../templates/post-build/post-build.yml | 2 + eng/common/templates/steps/execute-sdl.yml | 21 ++++++ global.json | 4 +- 6 files changed, 62 insertions(+), 59 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d951774d..1970971bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 6f93ec8da69a42fbe9a702a33e104f94773c3f03 + 1e73f4ab4c172aa55614f24b2d5c319e1efb8813 - + https://github.com/dotnet/arcade - 6f93ec8da69a42fbe9a702a33e104f94773c3f03 + 1e73f4ab4c172aa55614f24b2d5c319e1efb8813 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 18823840b..6e9972394 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -146,22 +146,22 @@ $userName = "dn-bot" # Insert credential nodes for Maestro's private feeds InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password +# 3.1 uses a different feed url format so it's handled differently here $dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") if ($dotnet31Source -ne $null) { AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password } -$dotnet5Source = $sources.SelectSingleNode("add[@key='dotnet5']") -if ($dotnet5Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet5-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password -} +$dotnetVersions = @('5','6','7') -$dotnet6Source = $sources.SelectSingleNode("add[@key='dotnet6']") -if ($dotnet6Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet6-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet6-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password +foreach ($dotnetVersion in $dotnetVersions) { + $feedPrefix = "dotnet" + $dotnetVersion; + $dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']") + if ($dotnetSource -ne $null) { + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password + } } $doc.Save($filename) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index ad3fb74fd..8af7d899d 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -105,53 +105,33 @@ if [ "$?" == "0" ]; then PackageSources+=('dotnet3.1-internal-transport') fi -# Ensure dotnet5-internal and dotnet5-internal-transport are in the packageSources if the public dotnet5 feeds are present -grep -i "" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=('dotnet5-internal') - - grep -i "" $ConfigFile - if [ "$?" != "0" ]; then - echo "Adding dotnet5-internal-transport to the packageSources." - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=('dotnet5-internal-transport') -fi - -# Ensure dotnet6-internal and dotnet6-internal-transport are in the packageSources if the public dotnet6 feeds are present -grep -i "" +DotNetVersions=('5' '6' '7') + +for DotNetVersion in ${DotNetVersions[@]} ; do + FeedPrefix="dotnet${DotNetVersion}"; + grep -i "" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=("$FeedPrefix-internal") - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=('dotnet6-internal') + grep -i "" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding $FeedPrefix-internal-transport to the packageSources." + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" - grep -i "" $ConfigFile - if [ "$?" != "0" ]; then - echo "Adding dotnet6-internal-transport to the packageSources." - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=("$FeedPrefix-internal-transport") fi - PackageSources+=('dotnet6-internal-transport') -fi +done # I want things split line by line PrevIFS=$IFS diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 5a9056f6b..e0beb25d4 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -49,6 +49,7 @@ parameters: type: object default: enable: false + publishGdn: false continueOnError: false params: '' artifactNames: '' @@ -235,6 +236,7 @@ stages: - template: /eng/common/templates/job/execute-sdl.yml parameters: enable: ${{ parameters.SDLValidationParameters.enable }} + publishGuardianDirectoryToPipeline: ${{ parameters.SDLValidationParameters.publishGdn }} additionalParameters: ${{ parameters.SDLValidationParameters.params }} continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }} artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml index 7b8ee18a2..73245593c 100644 --- a/eng/common/templates/steps/execute-sdl.yml +++ b/eng/common/templates/steps/execute-sdl.yml @@ -62,7 +62,28 @@ steps: c i condition: succeededOrFailed() + - publish: $(Agent.BuildDirectory)/.gdn artifact: GuardianConfiguration displayName: Publish GuardianConfiguration + condition: succeededOrFailed() + + # Publish the SARIF files in a container named CodeAnalysisLogs to enable integration + # with the "SARIF SAST Scans Tab" Azure DevOps extension + - task: CopyFiles@2 + displayName: Copy SARIF files + inputs: + flattenFolders: true + sourceFolder: $(Agent.BuildDirectory)/.gdn/rc/ + contents: '**/*.sarif' + targetFolder: $(Build.SourcesDirectory)/CodeAnalysisLogs + condition: succeededOrFailed() + + # Use PublishBuildArtifacts because the SARIF extension only checks this case + # see microsoft/sarif-azuredevops-extension#4 + - task: PublishBuildArtifacts@1 + displayName: Publish SARIF files to CodeAnalysisLogs container + inputs: + pathToPublish: $(Build.SourcesDirectory)/CodeAnalysisLogs + artifactName: CodeAnalysisLogs condition: succeededOrFailed() \ No newline at end of file diff --git a/global.json b/global.json index 3c02d9aae..e8fa36388 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22378.16", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22378.16" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22379.10", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22379.10" } } From ef27c37ed9aa23f70e1109c710a2eebfed1e3b90 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 31 Jul 2022 12:27:13 +0000 Subject: [PATCH 75/94] Update dependencies from https://github.com/dotnet/arcade build 20220729.10 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22379.10 --- eng/common/native/init-compiler.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 4b99a9cad..41a26d802 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then # Set default versions if [[ -z "$majorVersion" ]]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [[ "$compiler" == "clang" ]]; then versions=( 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) + if [[ "$compiler" == "clang" ]]; then versions=( 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do From 273bbcf15188b1293f06d49a172b5010789a1638 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 2 Aug 2022 12:48:18 +0000 Subject: [PATCH 76/94] Update dependencies from https://github.com/dotnet/arcade build 20220801.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22401.3 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1970971bd..da964520b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 1e73f4ab4c172aa55614f24b2d5c319e1efb8813 + aa90e21c63248b4d6d61e8de14a0d8e7a9275130 - + https://github.com/dotnet/arcade - 1e73f4ab4c172aa55614f24b2d5c319e1efb8813 + aa90e21c63248b4d6d61e8de14a0d8e7a9275130 diff --git a/global.json b/global.json index e8fa36388..c2703da67 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22379.10", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22379.10" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22401.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22401.3" } } From 3393433327380429a0a10af4d6ec21fb29b9c5e4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 3 Aug 2022 12:45:30 +0000 Subject: [PATCH 77/94] Update dependencies from https://github.com/dotnet/arcade build 20220802.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22402.4 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da964520b..79557b544 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - aa90e21c63248b4d6d61e8de14a0d8e7a9275130 + f7e668c691281e5ba69447e938627522e7be852e - + https://github.com/dotnet/arcade - aa90e21c63248b4d6d61e8de14a0d8e7a9275130 + f7e668c691281e5ba69447e938627522e7be852e diff --git a/global.json b/global.json index c2703da67..eaa09f69c 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22401.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22401.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22402.4", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22402.4" } } From 16b9bb23d564c2c86f98cccae79e7dec710527f1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 4 Aug 2022 12:46:50 +0000 Subject: [PATCH 78/94] Update dependencies from https://github.com/dotnet/arcade build 20220803.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22403.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 79557b544..80871530c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - f7e668c691281e5ba69447e938627522e7be852e + 4ee620cc1b57da45d93135e064d43a83e65bbb6e - + https://github.com/dotnet/arcade - f7e668c691281e5ba69447e938627522e7be852e + 4ee620cc1b57da45d93135e064d43a83e65bbb6e diff --git a/global.json b/global.json index eaa09f69c..c9d5bf362 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22402.4", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22402.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22403.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22403.1" } } From 95fef097ab61697060bdd720f5f6eab0e9bb8e14 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 6 Aug 2022 12:42:17 +0000 Subject: [PATCH 79/94] Update dependencies from https://github.com/dotnet/arcade build 20220805.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22405.2 --- eng/Version.Details.xml | 8 ++++---- eng/common/templates/job/source-index-stage1.yml | 2 +- global.json | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 80871530c..5ee1a8641 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 4ee620cc1b57da45d93135e064d43a83e65bbb6e + be709269603a9a3e90b189e6145b8450969ab067 - + https://github.com/dotnet/arcade - 4ee620cc1b57da45d93135e064d43a83e65bbb6e + be709269603a9a3e90b189e6145b8450969ab067 diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index c2d51098d..4e3721085 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,6 +1,6 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20210614.1 + sourceIndexPackageVersion: 1.0.1-20220804.1 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] diff --git a/global.json b/global.json index c9d5bf362..28ad75ea2 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22403.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22403.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22405.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22405.2" } } From 70fc47327dbf1847d03fae2f319e1bf7b9e105e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 7 Aug 2022 12:42:36 +0000 Subject: [PATCH 80/94] Update dependencies from https://github.com/dotnet/arcade build 20220805.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22405.6 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5ee1a8641..f5fb509ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - be709269603a9a3e90b189e6145b8450969ab067 + 58aed6cc9fde5155c79cf706eeccf31b03e9a8a7 - + https://github.com/dotnet/arcade - be709269603a9a3e90b189e6145b8450969ab067 + 58aed6cc9fde5155c79cf706eeccf31b03e9a8a7 diff --git a/global.json b/global.json index 28ad75ea2..c3514e1ad 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22405.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22405.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22405.6", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22405.6" } } From b4f59adcc5ce6134703e3f039f6ded45d9c9cf3f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Aug 2022 12:49:10 +0000 Subject: [PATCH 81/94] Update dependencies from https://github.com/dotnet/arcade build 20220808.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22408.3 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f5fb509ff..30d76b0e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 58aed6cc9fde5155c79cf706eeccf31b03e9a8a7 + 13b342360ba81ca3fdf911fda985dc8420d51627 - + https://github.com/dotnet/arcade - 58aed6cc9fde5155c79cf706eeccf31b03e9a8a7 + 13b342360ba81ca3fdf911fda985dc8420d51627 diff --git a/global.json b/global.json index c3514e1ad..bcbbce43c 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22405.6", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22405.6" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22408.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22408.3" } } From a67149c85a84d8be2942f626f5ff1fea1869d0b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 11 Aug 2022 12:46:58 +0000 Subject: [PATCH 82/94] Update dependencies from https://github.com/dotnet/arcade build 20220810.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22410.3 --- eng/Version.Details.xml | 8 +- eng/common/cross/build-rootfs.sh | 92 ++++++++++++++++++- eng/common/cross/toolchain.cmake | 41 ++++++++- eng/common/templates/job/execute-sdl.yml | 2 +- eng/common/templates/job/onelocbuild.yml | 2 +- .../templates/job/source-index-stage1.yml | 4 +- eng/common/templates/jobs/jobs.yml | 2 +- .../templates/post-build/post-build.yml | 8 +- eng/common/tools.ps1 | 9 +- global.json | 4 +- 10 files changed, 152 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 30d76b0e8..648d215b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 13b342360ba81ca3fdf911fda985dc8420d51627 + fd9941799bb6983a7d00ed72682378b46a45f396 - + https://github.com/dotnet/arcade - 13b342360ba81ca3fdf911fda985dc8420d51627 + fd9941799bb6983a7d00ed72682378b46a45f396 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index f058c9876..d3b0ac3ba 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -8,11 +8,13 @@ usage() echo "BuildArch can be: arm(default), arm64, armel, armv6, ppc64le, riscv64, s390x, x64, x86" echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine, alpine3.13 or alpine3.14. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen." echo " for FreeBSD can be: freebsd12, freebsd13" - echo " for illumos can be: illumos." + echo " for illumos can be: illumos" + echo " for Haiku can be: haiku." echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD" echo "llvmx[.y] - optional, LLVM version for LLVM related packages." echo "--skipunmount - optional, will skip the unmount of rootfs folder." echo "--use-mirror - optional, use mirror URL to fetch resources, when available." + echo "--jobs N - optional, restrict to N jobs." exit 1 } @@ -79,6 +81,17 @@ __IllumosPackages+=" mit-krb5-1.16.2nb4" __IllumosPackages+=" openssl-1.1.1e" __IllumosPackages+=" zlib-1.2.11" +__HaikuPackages="gmp" +__HaikuPackages+=" gmp_devel" +__HaikuPackages+=" krb5" +__HaikuPackages+=" krb5_devel" +__HaikuPackages+=" libiconv" +__HaikuPackages+=" libiconv_devel" +__HaikuPackages+=" llvm12_libunwind" +__HaikuPackages+=" llvm12_libunwind_devel" +__HaikuPackages+=" mpfr" +__HaikuPackages+=" mpfr_devel" + # ML.NET dependencies __UbuntuPackages+=" libomp5" __UbuntuPackages+=" libomp-dev" @@ -263,6 +276,11 @@ while :; do __CodeName=illumos __SkipUnmount=1 ;; + haiku) + __CodeName=haiku + __BuildArch=x64 + __SkipUnmount=1 + ;; --skipunmount) __SkipUnmount=1 ;; @@ -273,6 +291,10 @@ while :; do --use-mirror) __UseMirror=1 ;; + --use-jobs) + shift + MAXJOBS=$1 + ;; *) __UnprocessedBuildArgs="$__UnprocessedBuildArgs $1" ;; @@ -326,7 +348,7 @@ if [[ "$__CodeName" == "alpine" ]]; then rm -r "$__ApkToolsDir" elif [[ "$__CodeName" == "freebsd" ]]; then mkdir -p "$__RootfsDir"/usr/local/etc - JOBS="$(getconf _NPROCESSORS_ONLN)" + JOBS=${MAXJOBS:="$(getconf _NPROCESSORS_ONLN)"} wget -O - "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 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 @@ -344,7 +366,7 @@ elif [[ "$__CodeName" == "freebsd" ]]; then elif [[ "$__CodeName" == "illumos" ]]; then mkdir "$__RootfsDir/tmp" pushd "$__RootfsDir/tmp" - JOBS="$(getconf _NPROCESSORS_ONLN)" + JOBS=${MAXJOBS:="$(getconf _NPROCESSORS_ONLN)"} echo "Downloading sysroot." wget -O - https://github.com/illumos/sysroot/releases/download/20181213-de6af22ae73b-v1/illumos-sysroot-i386-20181213-de6af22ae73b-v1.tar.gz | tar -C "$__RootfsDir" -xzf - echo "Building binutils. Please wait.." @@ -386,6 +408,70 @@ elif [[ "$__CodeName" == "illumos" ]]; then wget -P "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/dlt.h wget -P "$__RootfsDir"/usr/include/netpacket https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/inet/sockmods/netpacket/packet.h wget -P "$__RootfsDir"/usr/include/sys https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/sys/sdt.h +elif [[ "$__CodeName" == "haiku" ]]; then + JOBS=${MAXJOBS:="$(getconf _NPROCESSORS_ONLN)"} + + echo "Building Haiku sysroot for x86_64" + mkdir -p "$__RootfsDir/tmp" + cd "$__RootfsDir/tmp" + git clone -b hrev56235 https://review.haiku-os.org/haiku + git clone -b btrev43195 https://review.haiku-os.org/buildtools + cd "$__RootfsDir/tmp/buildtools" && git checkout 7487388f5110021d400b9f3b88e1a7f310dc066d + + # Fetch some unmerged patches + cd "$__RootfsDir/tmp/haiku" + ## Add development build profile (slimmer than nightly) + git fetch origin refs/changes/64/4164/1 && git -c commit.gpgsign=false cherry-pick FETCH_HEAD + + # Build jam + cd "$__RootfsDir/tmp/buildtools/jam" + make + + # Configure cross tools + echo "Building cross-compiler" + mkdir -p "$__RootfsDir/generated" + cd "$__RootfsDir/generated" + "$__RootfsDir/tmp/haiku/configure" -j"$JOBS" --sysroot "$__RootfsDir" --cross-tools-source "$__RootfsDir/tmp/buildtools" --build-cross-tools x86_64 + + # Build Haiku packages + echo "Building Haiku" + echo 'HAIKU_BUILD_PROFILE = "development-raw" ;' > UserProfileConfig + "$__RootfsDir/tmp/buildtools/jam/jam0" -j"$JOBS" -q 'package' 'Haiku' + + BaseUrl="https://depot.haiku-os.org/__api/v2/pkg/get-pkg" + + # Download additional packages + echo "Downloading additional required packages" + read -ra array <<<"$__HaikuPackages" + for package in "${array[@]}"; do + echo "Downloading $package..." + # API documented here: https://github.com/haiku/haikudepotserver/blob/master/haikudepotserver-api2/src/main/resources/api2/pkg.yaml#L60 + # The schema here: https://github.com/haiku/haikudepotserver/blob/master/haikudepotserver-api2/src/main/resources/api2/pkg.yaml#L598 + hpkgDownloadUrl="$(wget -qO- --post-data='{"name":"'"$package"'","repositorySourceCode":"haikuports_x86_64","versionType":"LATEST","naturalLanguageCode":"en"}' \ + --header='Content-Type:application/json' "$BaseUrl" | jq -r '.result.versions[].hpkgDownloadURL')" + wget -P "$__RootfsDir/generated/download" "$hpkgDownloadUrl" + done + + # Setup the sysroot + echo "Setting up sysroot and extracting needed packages" + mkdir -p "$__RootfsDir/boot/system" + for file in "$__RootfsDir/generated/objects/haiku/x86_64/packaging/packages/"*.hpkg; do + "$__RootfsDir/generated/objects/linux/x86_64/release/tools/package/package" extract -C "$__RootfsDir/boot/system" "$file" + done + for file in "$__RootfsDir/generated/download/"*.hpkg; do + "$__RootfsDir/generated/objects/linux/x86_64/release/tools/package/package" extract -C "$__RootfsDir/boot/system" "$file" + done + + # Cleaning up temporary files + echo "Cleaning up temporary files" + rm -rf "$__RootfsDir/tmp" + for name in "$__RootfsDir/generated/"*; do + if [[ "$name" =~ "cross-tools-" ]]; then + : # Keep the cross-compiler + else + rm -rf "$name" + fi + done elif [[ -n "$__CodeName" ]]; then qemu-debootstrap $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo" cp "$__CrossDir/$__BuildArch/sources.list.$__CodeName" "$__RootfsDir/etc/apt/sources.list" diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 909117759..561576be9 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -7,6 +7,8 @@ if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version) elseif(EXISTS ${CROSS_ROOTFS}/usr/platform/i86pc) set(CMAKE_SYSTEM_NAME SunOS) set(ILLUMOS 1) +elseif(EXISTS ${CROSS_ROOTFS}/boot/system/develop/headers/config/HaikuConfig.h) + set(CMAKE_SYSTEM_NAME Haiku) else() set(CMAKE_SYSTEM_NAME Linux) set(LINUX 1) @@ -76,6 +78,8 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64") set(triple "x86_64-unknown-freebsd12") elseif(ILLUMOS) set(TOOLCHAIN "x86_64-illumos") + elseif(HAIKU) + set(TOOLCHAIN "x64_64-unknown-haiku") endif() elseif(TARGET_ARCH_NAME STREQUAL "x86") set(CMAKE_SYSTEM_PROCESSOR i686) @@ -170,6 +174,41 @@ elseif(ILLUMOS) 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(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() + + set(SEARCH_PATH "${CROSS_ROOTFS}/generated/cross-tools-x86_64/bin") + + find_program(EXEC_LOCATION_${exec} + PATHS ${SEARCH_PATH} + 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") + + # let CMake set up the correct search paths + include(Platform/Haiku) else() set(CMAKE_SYSROOT "${CROSS_ROOTFS}") @@ -229,7 +268,7 @@ endif() # Specify compile options -if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|ppc64le|riscv64|s390x)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS) +if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|ppc64le|riscv64|s390x)$" 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/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 24cec0424..9ff6a10a6 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -54,7 +54,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - checkout: self clean: true diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 3bcd243c4..6c523b714 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -41,7 +41,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 variables: - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 4e3721085..c85044a68 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -29,10 +29,10 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCore1ESPool-Public - demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open + demands: ImageOverride -equals windows.vs2019.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - ${{ each preStep in parameters.preSteps }}: diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 2cca53c2d..64e5929f2 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -96,7 +96,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 runAsPublic: ${{ parameters.runAsPublic }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index e0beb25d4..87fcae940 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -107,7 +107,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -144,7 +144,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml parameters: @@ -204,7 +204,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml parameters: @@ -263,7 +263,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml parameters: diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9638c63c7..f83a748c3 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -368,7 +368,14 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.1.0&view=overview $defaultXCopyMSBuildVersion = '17.1.0' - if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } + if (!$vsRequirements) { + if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { + $vsRequirements = $GlobalJson.tools.vs + } + else { + $vsRequirements = New-Object PSObject -Property @{ version = $vsMinVersionReqdStr } + } + } $vsMinVersionStr = if ($vsRequirements.version) { $vsRequirements.version } else { $vsMinVersionReqdStr } $vsMinVersion = [Version]::new($vsMinVersionStr) diff --git a/global.json b/global.json index bcbbce43c..a07e32778 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22408.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22408.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22410.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22410.3" } } From 4b54d272ccf9560e17a9cf57ded77546c9278a81 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Aug 2022 12:44:03 +0000 Subject: [PATCH 83/94] Update dependencies from https://github.com/dotnet/arcade build 20220811.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22411.2 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 648d215b2..2dd517e5c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - fd9941799bb6983a7d00ed72682378b46a45f396 + 6a638cd0c13962ab2a1943cb1c878be5a41dd82e - + https://github.com/dotnet/arcade - fd9941799bb6983a7d00ed72682378b46a45f396 + 6a638cd0c13962ab2a1943cb1c878be5a41dd82e diff --git a/global.json b/global.json index a07e32778..7890f3cd7 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22410.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22410.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22411.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22411.2" } } From 65f6faa8a753ffae668e75b5574ad42d834367aa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Aug 2022 12:49:19 +0000 Subject: [PATCH 84/94] Update dependencies from https://github.com/dotnet/arcade build 20220816.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22416.5 --- eng/Version.Details.xml | 8 ++--- eng/common/cross/build-rootfs.sh | 18 +++++++---- eng/common/generate-locproject.ps1 | 31 ++++++++++++++++-- eng/common/sdk-task.ps1 | 2 +- eng/common/sdl/sdl.ps1 | 37 ++++++++++++++++++++++ eng/common/templates/steps/execute-sdl.yml | 37 ++++++++++------------ eng/common/tools.ps1 | 4 +-- global.json | 8 ++--- 8 files changed, 105 insertions(+), 40 deletions(-) create mode 100644 eng/common/sdl/sdl.ps1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2dd517e5c..620f95382 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 6a638cd0c13962ab2a1943cb1c878be5a41dd82e + 5b838a3ed7f8e53c3082724605e5237fa614a43c - + https://github.com/dotnet/arcade - 6a638cd0c13962ab2a1943cb1c878be5a41dd82e + 5b838a3ed7f8e53c3082724605e5237fa614a43c diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index d3b0ac3ba..032f5f193 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -76,10 +76,10 @@ __FreeBSDPackages+=" openssl" __FreeBSDPackages+=" krb5" __FreeBSDPackages+=" terminfo-db" -__IllumosPackages="icu-64.2nb2" -__IllumosPackages+=" mit-krb5-1.16.2nb4" -__IllumosPackages+=" openssl-1.1.1e" -__IllumosPackages+=" zlib-1.2.11" +__IllumosPackages="icu" +__IllumosPackages+=" mit-krb5" +__IllumosPackages+=" openssl" +__IllumosPackages+=" zlib" __HaikuPackages="gmp" __HaikuPackages+=" gmp_devel" @@ -390,14 +390,18 @@ elif [[ "$__CodeName" == "illumos" ]]; then if [[ "$__UseMirror" == 1 ]]; then BaseUrl=http://pkgsrc.smartos.skylime.net fi - BaseUrl="$BaseUrl/packages/SmartOS/2020Q1/${__illumosArch}/All" + BaseUrl="$BaseUrl/packages/SmartOS/trunk/${__illumosArch}/All" + echo "Downloading manifest" + wget "$BaseUrl" echo "Downloading dependencies." read -ra array <<<"$__IllumosPackages" for package in "${array[@]}"; do - echo "Installing $package..." + echo "Installing '$package'" + package="$(grep ">$package-[0-9]" All | sed -En 's/.*href="(.*)\.tgz".*/\1/p')" + echo "Resolved name '$package'" wget "$BaseUrl"/"$package".tgz ar -x "$package".tgz - tar --skip-old-files -xzf "$package".tmp.tgz -C "$__RootfsDir" 2>/dev/null + tar --skip-old-files -xzf "$package".tmp.tg* -C "$__RootfsDir" 2>/dev/null done echo "Cleaning up temporary files." popd diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index afdd17502..846e7950c 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -33,6 +33,8 @@ $jsonTemplateFiles | ForEach-Object { $jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern +$wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them + $xlfFiles = @() $allXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.xlf" @@ -77,8 +79,7 @@ $locJson = @{ CopyOption = "LangIDOnPath" OutputPath = "$($_.Directory.Parent.FullName | Resolve-Path -Relative)\" } - } - else { + } else { return @{ SourceFile = $sourceFile CopyOption = "LangIDOnName" @@ -88,6 +89,32 @@ $locJson = @{ } } ) + }, + @{ + CloneLanguageSet = "WiX_CloneLanguages" + LssFiles = @( "wxl_loc.lss" ) + LocItems = @( + $wxlFiles | ForEach-Object { + $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" + $continue = $true + foreach ($exclusion in $exclusions.Exclusions) { + if ($outputPath.Contains($exclusion)) + { + $continue = $false + } + } + $sourceFile = ($_.FullName | Resolve-Path -Relative) + if ($continue) + { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnPath" + OutputPath = $outputPath + Languages = "cs-CZ;de-DE;es-ES;fr-FR;it-IT;ja-JP;ko-KR;pl-PL;pt-BR;ru-RU;tr-TR;zh-CN;zh-TW" + } + } + } + ) } ) } diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 119a6c660..c35087a06 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.1.0" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.2.1" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/sdl/sdl.ps1 b/eng/common/sdl/sdl.ps1 new file mode 100644 index 000000000..ac196e164 --- /dev/null +++ b/eng/common/sdl/sdl.ps1 @@ -0,0 +1,37 @@ + +function Install-Gdn { + param( + [string]$Path, + + # If omitted, install the latest version of Guardian, otherwise install that specific version. + [string]$Version + ) + + $ErrorActionPreference = 'Stop' + Set-StrictMode -Version 2.0 + $disableConfigureToolsetImport = $true + $global:LASTEXITCODE = 0 + + # `tools.ps1` checks $ci to perform some actions. Since the SDL + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + . $PSScriptRoot\..\tools.ps1 + + $argumentList = @("install", "Microsoft.Guardian.Cli", "-Source https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json", "-OutputDirectory $Path", "-NonInteractive", "-NoCache") + + if ($Version) { + $argumentList += "-Version $Version" + } + + Start-Process nuget -Verbose -ArgumentList $argumentList -NoNewWindow -Wait + + $gdnCliPath = Get-ChildItem -Filter guardian.cmd -Recurse -Path $Path + + if (!$gdnCliPath) + { + Write-PipelineTelemetryError -Category 'Sdl' -Message 'Failure installing Guardian' + } + + return $gdnCliPath.FullName +} \ No newline at end of file diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml index 73245593c..86cf578c4 100644 --- a/eng/common/templates/steps/execute-sdl.yml +++ b/eng/common/templates/steps/execute-sdl.yml @@ -8,29 +8,26 @@ parameters: condition: '' steps: -- ${{ if ne(parameters.overrideGuardianVersion, '') }}: - - powershell: | - $content = Get-Content $(GuardianPackagesConfigFile) - - Write-Host "packages.config content was:`n$content" - - $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)') - $content | Set-Content $(GuardianPackagesConfigFile) - - Write-Host "packages.config content updated to:`n$content" - displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }} +- task: NuGetAuthenticate@1 + inputs: + nuGetServiceConnections: GuardianConnect - task: NuGetToolInstaller@1 displayName: 'Install NuGet.exe' -- task: NuGetCommand@2 - displayName: 'Install Guardian' - inputs: - restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config - feedsToUse: config - nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config - externalFeedCredentials: GuardianConnect - restoreDirectory: $(Build.SourcesDirectory)\.packages +- ${{ if ne(parameters.overrideGuardianVersion, '') }}: + - pwsh: | + . $(Build.SourcesDirectory)\eng\common\sdl\sdl.ps1 + $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }} + Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" + displayName: Install Guardian (Overridden) + +- ${{ if eq(parameters.overrideGuardianVersion, '') }}: + - pwsh: | + . $(Build.SourcesDirectory)\eng\common\sdl\sdl.ps1 + $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts + Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" + displayName: Install Guardian - ${{ if ne(parameters.overrideParameters, '') }}: - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} @@ -40,7 +37,7 @@ steps: - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: ${{ parameters.executeAllSdlToolsScript }} - -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion) + -GuardianCliLocation $(GuardianCliLocation) -NugetPackageDirectory $(Build.SourcesDirectory)\.packages -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index f83a748c3..aba6308ad 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -365,8 +365,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/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.1.0&view=overview - $defaultXCopyMSBuildVersion = '17.1.0' + # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.2.1&view=overview + $defaultXCopyMSBuildVersion = '17.2.1' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 7890f3cd7..8224651a5 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100-preview.5.22307.18", + "dotnet": "7.0.100-preview.7.22377.5", "runtimes": { "dotnet": [ "6.0.5", @@ -11,11 +11,11 @@ } }, "sdk": { - "version": "7.0.100-preview.5.22307.18", + "version": "7.0.100-preview.7.22377.5", "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22411.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22411.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22416.5", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22416.5" } } From 1b6f46008c41223820aaaca2cb4ba5c0c3c3e1df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Aug 2022 12:45:10 +0000 Subject: [PATCH 85/94] Update dependencies from https://github.com/dotnet/arcade build 20220817.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22417.2 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 620f95382..8400a9a8f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 5b838a3ed7f8e53c3082724605e5237fa614a43c + 21a53708b4645c64259b3883dac7709ddfa19fe8 - + https://github.com/dotnet/arcade - 5b838a3ed7f8e53c3082724605e5237fa614a43c + 21a53708b4645c64259b3883dac7709ddfa19fe8 diff --git a/global.json b/global.json index 8224651a5..795d147ef 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22416.5", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22416.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22417.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22417.2" } } From 9d08706defea8e9a8a3d4a8a95895dece0f7af74 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Aug 2022 15:14:21 +0000 Subject: [PATCH 86/94] Update dependencies from https://github.com/dotnet/arcade build 20220818.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22418.4 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8400a9a8f..ef3f541cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 21a53708b4645c64259b3883dac7709ddfa19fe8 + 0c027eede69ba22bafca9a1955f1e00848655ece - + https://github.com/dotnet/arcade - 21a53708b4645c64259b3883dac7709ddfa19fe8 + 0c027eede69ba22bafca9a1955f1e00848655ece diff --git a/global.json b/global.json index 795d147ef..6fdb38894 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22417.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22417.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22418.4", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22418.4" } } From 786a1736b3460fdfb0c1b176a503619c52388db8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 20 Aug 2022 12:39:20 +0000 Subject: [PATCH 87/94] Update dependencies from https://github.com/dotnet/arcade build 20220819.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22419.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef3f541cc..c9793c212 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 0c027eede69ba22bafca9a1955f1e00848655ece + 34dff939b4a91e4693f78a856e0e055c1a3f3fba - + https://github.com/dotnet/arcade - 0c027eede69ba22bafca9a1955f1e00848655ece + 34dff939b4a91e4693f78a856e0e055c1a3f3fba diff --git a/global.json b/global.json index 6fdb38894..d4b4f4553 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22418.4", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22418.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22419.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22419.1" } } From c0e7229a95badf07078f1dfbe6d3e48cc36c001a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 24 Aug 2022 12:37:59 +0000 Subject: [PATCH 88/94] Update dependencies from https://github.com/dotnet/arcade build 20220823.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22423.2 --- eng/Version.Details.xml | 8 ++++---- eng/common/generate-locproject.ps1 | 4 ++-- global.json | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9793c212..5d7ee7486 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 34dff939b4a91e4693f78a856e0e055c1a3f3fba + 0db07252ccb18afdf94820ba6125da6de729ec04 - + https://github.com/dotnet/arcade - 34dff939b4a91e4693f78a856e0e055c1a3f3fba + 0db07252ccb18afdf94820ba6125da6de729ec04 diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index 846e7950c..bab18543d 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -62,7 +62,7 @@ $locJson = @{ $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")" $continue = $true foreach ($exclusion in $exclusions.Exclusions) { - if ($outputPath.Contains($exclusion)) + if ($_.FullName.Contains($exclusion)) { $continue = $false } @@ -98,7 +98,7 @@ $locJson = @{ $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" $continue = $true foreach ($exclusion in $exclusions.Exclusions) { - if ($outputPath.Contains($exclusion)) + if ($_.FullName.Contains($exclusion)) { $continue = $false } diff --git a/global.json b/global.json index d4b4f4553..ec5074148 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22419.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22419.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22423.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22423.2" } } From ba1a3a52c3f673c6449a533d8f432264ba25d68b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Aug 2022 12:40:54 +0000 Subject: [PATCH 89/94] Update dependencies from https://github.com/dotnet/arcade build 20220824.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22424.3 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d7ee7486..9cf94484c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 0db07252ccb18afdf94820ba6125da6de729ec04 + 258a37cd6a7884f771d0f991d9f24d29e292abd0 - + https://github.com/dotnet/arcade - 0db07252ccb18afdf94820ba6125da6de729ec04 + 258a37cd6a7884f771d0f991d9f24d29e292abd0 diff --git a/global.json b/global.json index ec5074148..808df4f25 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22423.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22423.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22424.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22424.3" } } From 3d39d45cd7b9c65664b74f148884639a14aee5aa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 Aug 2022 12:39:39 +0000 Subject: [PATCH 90/94] Update dependencies from https://github.com/dotnet/arcade build 20220825.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22425.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9cf94484c..74342709b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 258a37cd6a7884f771d0f991d9f24d29e292abd0 + 78805162979a2e31d8df1aa962c5657f988116a4 - + https://github.com/dotnet/arcade - 258a37cd6a7884f771d0f991d9f24d29e292abd0 + 78805162979a2e31d8df1aa962c5657f988116a4 diff --git a/global.json b/global.json index 808df4f25..8d0f367b2 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22424.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22424.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22425.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22425.1" } } From c719dd19628e7d37ae05b15f8e8ad841e26f1487 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 27 Aug 2022 12:35:42 +0000 Subject: [PATCH 91/94] Update dependencies from https://github.com/dotnet/arcade build 20220826.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22426.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 74342709b..4c2f6f1bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 78805162979a2e31d8df1aa962c5657f988116a4 + 692746db3f08766bc29e91e826ff15e5e8a82b44 - + https://github.com/dotnet/arcade - 78805162979a2e31d8df1aa962c5657f988116a4 + 692746db3f08766bc29e91e826ff15e5e8a82b44 diff --git a/global.json b/global.json index 8d0f367b2..64bfe7838 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22425.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22425.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22426.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22426.1" } } From 039103c24f6f75db284373db85c428dcb5e7e142 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 29 Aug 2022 12:30:31 +0000 Subject: [PATCH 92/94] Update dependencies from https://github.com/dotnet/arcade build 20220826.8 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 7.0.0-beta.22426.8 --- eng/Version.Details.xml | 8 +++---- eng/common/cross/build-rootfs.sh | 41 ++++++++++++++++++-------------- global.json | 4 ++-- 3 files changed, 29 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c2f6f1bc..fc8a89ee3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 692746db3f08766bc29e91e826ff15e5e8a82b44 + 14df52bae2c74fc850a8c40fe68ea5be5cd30116 - + https://github.com/dotnet/arcade - 692746db3f08766bc29e91e826ff15e5e8a82b44 + 14df52bae2c74fc850a8c40fe68ea5be5cd30116 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 032f5f193..5680980fa 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -186,32 +186,27 @@ while :; do __UbuntuArch=i386 __UbuntuRepo="http://archive.ubuntu.com/ubuntu/" ;; - lldb3.6) - __LLDB_Package="lldb-3.6-dev" - ;; - lldb3.8) - __LLDB_Package="lldb-3.8-dev" - ;; - lldb3.9) - __LLDB_Package="liblldb-3.9-dev" - ;; - lldb4.0) - __LLDB_Package="liblldb-4.0-dev" - ;; - lldb5.0) - __LLDB_Package="liblldb-5.0-dev" - ;; - lldb6.0) - __LLDB_Package="liblldb-6.0-dev" + lldb*) + version="${lowerI/lldb/}" + parts=(${version//./ }) + + # for versions > 6.0, lldb has dropped the minor version + if [[ "${parts[0]}" -gt 6 ]]; then + version="${parts[0]}" + fi + + __LLDB_Package="liblldb-${version}-dev" ;; no-lldb) unset __LLDB_Package ;; llvm*) - version="$(echo "$lowerI" | tr -d '[:alpha:]-=')" + version="${lowerI/llvm/}" parts=(${version//./ }) __LLVM_MajorVersion="${parts[0]}" __LLVM_MinorVersion="${parts[1]}" + + # for versions > 6.0, llvm has dropped the minor version if [[ -z "$__LLVM_MinorVersion" && "$__LLVM_MajorVersion" -le 6 ]]; then __LLVM_MinorVersion=0; fi @@ -231,6 +226,16 @@ while :; do __CodeName=bionic fi ;; + focal) # Ubuntu 20.04 + if [[ "$__CodeName" != "jessie" ]]; then + __CodeName=focal + fi + ;; + jammy) # Ubuntu 22.04 + if [[ "$__CodeName" != "jessie" ]]; then + __CodeName=jammy + fi + ;; jessie) # Debian 8 __CodeName=jessie __UbuntuRepo="http://ftp.debian.org/debian/" diff --git a/global.json b/global.json index 64bfe7838..88b51df19 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22426.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22426.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22426.8", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22426.8" } } From 87408fa2814a14a31a9603c36b4879aa51dd1966 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 31 Aug 2022 12:39:33 +0000 Subject: [PATCH 93/94] Update dependencies from https://github.com/dotnet/arcade build 20220830.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 8.0.0-beta.22430.3 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc8a89ee3..fd71fcaca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 14df52bae2c74fc850a8c40fe68ea5be5cd30116 + ca202ec5e84706c6a90a0d85516608a43b374d54 - + https://github.com/dotnet/arcade - 14df52bae2c74fc850a8c40fe68ea5be5cd30116 + ca202ec5e84706c6a90a0d85516608a43b374d54 diff --git a/global.json b/global.json index 88b51df19..da38930b1 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22426.8", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22426.8" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22430.3", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22430.3" } } From bffbfd127f0ff4e25e276ed618e737bcb944bd51 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Sep 2022 12:32:51 +0000 Subject: [PATCH 94/94] Update dependencies from https://github.com/dotnet/arcade build 20220831.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22117.2 -> To Version 8.0.0-beta.22431.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd71fcaca..9de31fc30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - ca202ec5e84706c6a90a0d85516608a43b374d54 + 00a270bc27455470fac06f5704aa0d7a5a31489d - + https://github.com/dotnet/arcade - ca202ec5e84706c6a90a0d85516608a43b374d54 + 00a270bc27455470fac06f5704aa0d7a5a31489d diff --git a/global.json b/global.json index da38930b1..b26945ca5 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22430.3", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22430.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22431.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22431.1" } }