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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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/41] 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 bed35212363e55eaa24d673538bc24a11ccb1b15 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Thu, 26 May 2022 17:32:30 -0700 Subject: [PATCH 40/41] Update to dependency packages and trim nuget.config --- NuGet.config | 4 -- build.sh | 16 ++++++++ eng/Versions.props | 20 +++++----- global.json | 8 ++-- src/try-convert/Program.cs | 81 ++++++++++++++++++++++++++------------ test.sh | 16 ++++++++ 6 files changed, 101 insertions(+), 44 deletions(-) create mode 100755 build.sh create mode 100755 test.sh diff --git a/NuGet.config b/NuGet.config index 780fb0ea1..b1204a1ae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,12 +6,8 @@ - - - - diff --git a/build.sh b/build.sh new file mode 100755 index 000000000..32a4b1f03 --- /dev/null +++ b/build.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +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/eng/common/build.sh" --build --restore --pack $@ diff --git a/eng/Versions.props b/eng/Versions.props index 496c1c0d6..002f48b29 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,21 +11,21 @@ --> 1.4.1 - 16.7 - 5.0.0-rc.1.20451.14 - 12.0.3 - 5.8.0-preview.3.6823 - 5.0.0-rc.1.20451.14 - 2.0.0-beta1.20371.2 - 5.0.0-rc.1.20451.14 - 5.0.0-rc.1.20451.14 + 16.10 + 5.0.0 + 13.0.1 + 6.0.0 + 6.0.0 + 2.0.0-beta3.22114.1 + 6.0.0 + 5.0.0 - 1.3.0 - 4.14.6 + 3.1.2 + 4.18.1 true diff --git a/global.json b/global.json index 4b336ae70..79a374b0d 100644 --- a/global.json +++ b/global.json @@ -4,9 +4,9 @@ "runtimes": { "dotnet": [ "6.0.5", - "5.0.14", - "3.1.7", - "2.1.11" + "5.0.17", + "3.1.25", + "2.1.30" ] } }, @@ -18,4 +18,4 @@ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22275.2", "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22275.2" } -} +} \ No newline at end of file diff --git a/src/try-convert/Program.cs b/src/try-convert/Program.cs index 561dc6e55..195f89ebe 100644 --- a/src/try-convert/Program.cs +++ b/src/try-convert/Program.cs @@ -1,7 +1,6 @@ using System; using System.CommandLine; using System.CommandLine.Builder; -using System.CommandLine.Invocation; using System.CommandLine.Parsing; using System.IO; using System.Threading.Tasks; @@ -14,58 +13,88 @@ namespace MSBuild.Conversion { internal class Program { + private static Task ErrorResult => Task.FromResult(-1); + private static Task SuccessResult => Task.FromResult(0); + + private static Option ProjectOption => new Option(new[] { "-p", "--project" }, "The path to a project to convert"); + private static Option WorkspaceOption => new Option(new[] { "-w", "--workspace" }, "The solution or project file to operate on. If a project is not specified, the command will search the current directory for one."); + private static Option MSBuildPathOption => new Option(new[] { "-m", "--msbuild-path" }, "The path to an MSBuild.exe, if you prefer to use that"); + private static Option TargetFrameworkOption => new Option(new[] { "-tfm", "--target-framework" }, "The name of the framework you would like to upgrade to. If unspecified, the default TFM for apps chosen will be the highest available one found on your machine, and the default TFM for libraries will be .NET Standard 2.0."); + private static Option ForceWebConversionOption => new Option(new[] { "--force-web-conversion" }, "Attempt to convert MVC and WebAPI projects even though significant manual work is necessary after migrating such projects."); + private static Option PreviewOption => new Option(new[] { "--preview" }, "Use preview SDKs as part of conversion"); + private static Option DiffOnlyOption => new Option(new[] { "--diff-only" }, "Produces a diff of the project to convert; no conversion is done"); + private static Option NoBackupOption => new Option(new[] { "--no-backup" }, "Converts projects, does not create a backup of the originals and removes packages.config file."); + private static Option KeepCurrentTfmsOption => new Option(new[] { "--keep-current-tfms" }, "Converts project files but does not change any TFMs. If unspecified, TFMs may change."); + private static Option MauiConverionOption => new Option(new[] { "--maui-conversion" }, "Attempt to convert Xamarin.Forms Projects to .NET MAUI projects. There may be additional manual work necessary after migrating such projects."); + private static Option ForceRemoveCustomImportsOption => new Option(new[] { "--force-remove-custom-imports" }, "Force remove custom imports from the project file if set to true."); + private static Option UpdateOption => new Option(new[] { "-u", "--update" }, "Updates the try-convert tool to the latest available version"); + private static async Task Main(string[] args) { var rootCommand = new RootCommand { - Name = "try-convert", - Handler = CommandHandler.Create(typeof(Program).GetMethod(nameof(Run))!) + ProjectOption, + WorkspaceOption, + MSBuildPathOption, + TargetFrameworkOption, + ForceWebConversionOption, + PreviewOption, + DiffOnlyOption, + NoBackupOption, + KeepCurrentTfmsOption, + MauiConverionOption, + ForceRemoveCustomImportsOption, + UpdateOption }; + Func> handler = Run; + + rootCommand.SetHandler( + handler, + ProjectOption, + WorkspaceOption, + MSBuildPathOption, + TargetFrameworkOption, + ForceWebConversionOption, + PreviewOption, + DiffOnlyOption, + NoBackupOption, + KeepCurrentTfmsOption, + MauiConverionOption, + ForceRemoveCustomImportsOption, + UpdateOption); + var parser = new CommandLineBuilder(rootCommand) .UseParseDirective() .UseHelp() - .UseDebugDirective() .UseSuggestDirective() .RegisterWithDotnetSuggest() .UseParseErrorReporting() .UseExceptionHandler() - .AddOption(new Option(new[] { "-p", "--project" }, "The path to a project to convert") { Argument = new Argument(() => null) }) - .AddOption(new Option(new[] { "-w", "--workspace" }, "The solution or project file to operate on. If a project is not specified, the command will search the current directory for one.") { Argument = new Argument(() => null) }) - .AddOption(new Option(new[] { "-m", "--msbuild-path" }, "The path to an MSBuild.exe, if you prefer to use that") { Argument = new Argument(() => null) }) - .AddOption(new Option(new[] { "-tfm", "--target-framework" }, "The name of the framework you would like to upgrade to. If unspecified, the default TFM for apps chosen will be the highest available one found on your machine, and the default TFM for libraries will be .NET Standard 2.0.") { Argument = new Argument(() => null) }) - .AddOption(new Option(new[] { "--force-web-conversion" }, "Attempt to convert MVC and WebAPI projects even though significant manual work is necessary after migrating such projects.") { Argument = new Argument(() => false) }) - .AddOption(new Option(new[] { "--preview" }, "Use preview SDKs as part of conversion") { Argument = new Argument(() => false) }) - .AddOption(new Option(new[] { "--diff-only" }, "Produces a diff of the project to convert; no conversion is done") { Argument = new Argument(() => false) }) - .AddOption(new Option(new[] { "--no-backup" }, "Converts projects, does not create a backup of the originals and removes packages.config file.") { Argument = new Argument(() => false) }) - .AddOption(new Option(new[] { "--keep-current-tfms" }, "Converts project files but does not change any TFMs. If unspecified, TFMs may change.") { Argument = new Argument(() => false) }) - .AddOption(new Option(new[] { "--maui-conversion" }, "Attempt to convert Xamarin.Forms Projects to .NET MAUI projects. There may be additional manual work necessary after migrating such projects.") { Argument = new Argument(() => false) }) - .AddOption(new Option(new[] { "--force-remove-custom-imports" }, "Force remove custom imports from the project file if set to true.") { Argument = new Argument(() => false) }) - .AddOption(new Option(new[] { "-u", "--update" }, "Updates the try-convert tool to the latest available version") { Argument = new Argument(() => false) }) .Build(); return await parser.InvokeAsync(args).ConfigureAwait(false); } - public static int Run(string? project, string? workspace, string? msbuildPath, string? tfm, bool forceWebConversion, bool preview, bool diffOnly, bool noBackup, bool keepCurrentTfms, bool update, bool mauiConversion, bool forceRemoveCustomImports) + public static Task Run(string? project, string? workspace, string? msbuildPath, string? tfm, bool forceWebConversion, bool preview, bool diffOnly, bool noBackup, bool keepCurrentTfms, bool update, bool mauiConversion, bool forceRemoveCustomImports) { if (update) { UpdateTryConvert.Update(); - return 0; + return SuccessResult; } if (!string.IsNullOrWhiteSpace(project) && !string.IsNullOrWhiteSpace(workspace)) { Console.WriteLine("Cannot specify both a project and a workspace."); - return -1; + return ErrorResult; } if (!string.IsNullOrWhiteSpace(tfm) && keepCurrentTfms) { Console.WriteLine($"Both '{nameof(tfm)}' and '{nameof(keepCurrentTfms)}' cannot be specified. Please pick one."); - return -1; + return ErrorResult; } try @@ -86,14 +115,14 @@ public static int Run(string? project, string? workspace, string? msbuildPath, s else { Console.WriteLine("Error locating VS Install Directory. Try setting Environment Variable VSINSTALLDIR."); - return -1; + return ErrorResult; } } if (string.IsNullOrWhiteSpace(msbuildPath)) { Console.WriteLine("Could not find an MSBuild."); - return -1; + return ErrorResult; } if (!string.IsNullOrWhiteSpace(tfm)) @@ -102,7 +131,7 @@ public static int Run(string? project, string? workspace, string? msbuildPath, s if (!TargetFrameworkHelper.IsValidTargetFramework(tfm)) { Console.WriteLine($"Invalid framework specified for --target-framework: '{tfm}'"); - return -1; + return ErrorResult; } } else @@ -133,7 +162,7 @@ public static int Run(string? project, string? workspace, string? msbuildPath, s if (msbuildWorkspace.WorkspaceItems.Length is 0) { Console.WriteLine("No projects converted."); - return 0; + return SuccessResult; } foreach (var item in msbuildWorkspace.WorkspaceItems) @@ -161,11 +190,11 @@ public static int Run(string? project, string? workspace, string? msbuildPath, s catch (Exception e) { Console.WriteLine(e.ToString()); - return -1; + return ErrorResult; } Console.WriteLine("Conversion complete!"); - return 0; + return SuccessResult; } } } diff --git a/test.sh b/test.sh new file mode 100755 index 000000000..637dec360 --- /dev/null +++ b/test.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +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/eng/common/build.sh" --test $@ From 0935349054f9635ba41f24bb135826b34653a3e2 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Mon, 30 May 2022 15:54:26 -0700 Subject: [PATCH 41/41] Publish text results. --- eng/azure-pipelines.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/eng/azure-pipelines.yml b/eng/azure-pipelines.yml index aadc3b880..0c5d4aa79 100644 --- a/eng/azure-pipelines.yml +++ b/eng/azure-pipelines.yml @@ -12,7 +12,7 @@ pr: variables: - name: _TeamName value: DotNetCore - - name: _BuildConfig + - name: _BuildConfig value: Release - name: _PublishUsingPipelines value: true @@ -31,7 +31,7 @@ jobs: helixRepo: dotnet/standard jobs: - job: Windows_NT - pool: + pool: ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: name: NetCore1ESPool-Public demands: ImageOverride -equals build.windows.10.amd64.vs2019.pre.open @@ -50,7 +50,7 @@ jobs: - name: _BuildArgs value: /p:SignType=$(_SignType) /p:DotNetSignType=$(_SignType) - /p:MicroBuild_SigningEnabled=true + /p:MicroBuild_SigningEnabled=true /p:OverridePackageSource=https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json /p:TeamName=$(_TeamName) /p:DotNetPublishBlobFeedKey=$(dotnetfeed-storage-access-key-1) @@ -78,8 +78,15 @@ jobs: - checkout: self clean: true - script: eng\common\cibuild.cmd - -configuration $(_BuildConfig) + -configuration $(_BuildConfig) -prepareMachine -warnaserror:0 $(_BuildArgs) displayName: Windows Build / Publish + - task: PublishBuildArtifacts@1 + displayName: 'Publish Artifact: TestResults' + inputs: + PathtoPublish: '$(Build.SourcesDirectory)\artifacts\TestResults\$(_BuildConfig)' + ArtifactName: 'Windows $(_BuildConfig) Test Logs' + continueOnError: true + condition: always() \ No newline at end of file