From 019b5b9c39927251dfcdd940ac7c38d3aeffd39a Mon Sep 17 00:00:00 2001
From: Antoine Martin <dev@ayakael.net>
Date: Wed, 16 Mar 2022 23:35:17 +0000
Subject: [PATCH] testing/dotnet6-build: add testsuite, patch update
---
testing/dotnet6-build/APKBUILD | 129 +++-
.../dotnet6-build/build_musl-build-fix.patch | 76 +-
.../dotnet6-build/check_alpine-support.patch | 661 ++++++++++++++++++
.../command-line-api_fix-musl-build.patch | 42 +-
.../installer_musl-build-fix.patch | 110 ++-
.../installer_portable-runtime-id.patch | 23 +
...netcoreilasmpackageruntimeid-as-musl.patch | 30 -
...hf-lld-fix.patch => runtime_lld-fix.patch} | 0
.../runtime_x86-64-use-system-libunwind.patch | 29 +
.../sdk_portable-runtime-id.patch | 23 +
.../dotnet6-build/sdk_telemetry-optout.patch | 31 +-
11 files changed, 1043 insertions(+), 111 deletions(-)
create mode 100644 testing/dotnet6-build/check_alpine-support.patch
create mode 100644 testing/dotnet6-build/installer_portable-runtime-id.patch
delete mode 100644 testing/dotnet6-build/runtime_force-microsoftnetcoreilasmpackageruntimeid-as-musl.patch
rename testing/dotnet6-build/{runtime_aarch64-armv7-armhf-lld-fix.patch => runtime_lld-fix.patch} (100%)
create mode 100644 testing/dotnet6-build/runtime_x86-64-use-system-libunwind.patch
create mode 100644 testing/dotnet6-build/sdk_portable-runtime-id.patch
diff --git a/testing/dotnet6-build/APKBUILD b/testing/dotnet6-build/APKBUILD
index f31aed7e496b..9d6fa986530c 100644
--- a/testing/dotnet6-build/APKBUILD
+++ b/testing/dotnet6-build/APKBUILD
@@ -9,11 +9,37 @@
pkgname=dotnet6-build
pkgver=6.0.103
-pkgrel=1
+pkgrel=2
# Tag of tarball generator. This may change from usual due to mistakes from upstream
_installertag=v$pkgver-source-build
+# Test suite tags
+_testtag=6207e217336d4f9c92add85b310c8a4b1ac0e6b1
+_turkeytag=v11
+
+# Test suite disable flags
+# following tests can only work after packaging step
+_disabled_tests="man-pages distribution-package bash-completion"
+# test broken: no musl release for omnisharp
+_disabled_tests="$_disabled_tests omnisharp"
+# test broken: permission issue on lxc / pipelines
+_disabled_tests="$_disabled_tests createdump-aspnet workload"
+# liblttng-ust_sys-sdt.h: no 'NT_STAPSDT' on Alpine's lttng-ust package
+# lttng: known issue, see https://github.com/dotnet/runtime/issues/57784
+_disabled_tests="$_disabled_tests liblttng-ust_sys-sdt.h lttng"
+# {bundled,system}-libunwind: use system version on all but aarch64/armv7, as broken
+# see https://github.com/redhat-developer/dotnet-regular-tests/issues/113
+case $CARCH in
+ aarch64|armv7)_disabled_tests="$_disabled_tests system-libunwind";;
+ *)_disabled_tests="$_disabled_tests bundled-libunwind";;
+esac
+# publish-ready-to-run: broken due to crossgen2 nupkg on musl-arm64 / musl-arm platform being broken
+# should be fixed with https://github.com/dotnet/runtime/pull/66814
+case $CARCH in
+ aarch64|armv7)_disabled_tests="$_disabled_tests publish-ready-to-run publish-ready-to-run-linux";;
+esac
+
# this should match what is sourced by source-build's ./prep.sh script
# and, at the very least, the artifacts version sourced, as defined in
# eng/Version.Details.xml by var PrivateSourceBuiltArtifactsPackageVersion
@@ -29,21 +55,24 @@ _patches="
build_arm-build.patch
build_copy-sbrp.patch
build_musl-build-fix.patch
+ check_alpine-support.patch
command-line-api_fix-musl-build.patch
command-line-api_use-work-tree-with-git.patch
fsharp_use-work-tree-with-git.patch
installer_arm-build.patch
installer_forgotten-MicrosoftAspNetCoreAppRuntimePac.patch
installer_musl-build-fix.patch
+ installer_portable-runtime-id.patch
installer_reprodicible-tarball.patch
- runtime_aarch64-armv7-armhf-lld-fix.patch
runtime_detect-armv8.patch
runtime_disable-package-validation.patch
- runtime_force-microsoftnetcoreilasmpackageruntimeid-as-musl.patch
+ runtime_lld-fix.patch
runtime_non-portable-distrorid-fix-alpine.patch
runtime_rid-alpine-316.patch
- sdk_telemetry-optout.patch
+ runtime_x86-64-use-system-libunwind.patch
sdk_add-zsh-compdef-completion-script.patch
+ sdk_portable-runtime-id.patch
+ sdk_telemetry-optout.patch
vstest_use-work-tree-with-git.patch
xliff-tasks_use-work-tree-with.git.patch
"
@@ -62,6 +91,21 @@ arch="x86_64 aarch64 armv7"
url=https://www.microsoft.com/net/core
license="MIT"
_bootstrappkg="bootstrap"
+checkdepends="
+ babeltrace
+ binutils
+ coreutils
+ file
+ gawk
+ jq
+ lttng-tools
+ npm
+ procps
+ sed
+ strace
+ util-linux-misc
+ which
+"
makedepends="
bash
clang
@@ -80,7 +124,9 @@ makedepends="
libxml2-dev
libxml2-utils
linux-headers
+ lldb
lldb-dev
+ lld
lld-dev
llvm-dev
lttng-ust-dev
@@ -91,10 +137,16 @@ makedepends="
# packages artifacts if building bootstrap
[ "$_bootstrappkg" = "stage0" ] && subpackages="$pkgname-artifacts:artifacts:noarch"
-options="!check" # No test suite
-source="source-build-tarball-$pkgver.tar.gz::https://tarball $_patches"
+source="
+ source-build-tarball-$pkgver.tar.gz::https://tarball
+ source-build-testssuite.tar.gz::https://github.com/redhat-developer/dotnet-regular-tests/archive/$_testtag.tar.gz
+ source-build-turkey.tar.gz::https://github.com/redhat-developer/dotnet-bunny/archive/refs/tags/$_turkeytag.tar.gz
+ $_patches
+ "
builddir="$srcdir"/source-build-tarball-$pkgver
_artifactsdir="/usr/share/dotnet/artifacts/${_bootstrapver%-*}"
+_checkdir="$srcdir/dotnet-bunny-${_turkeytag/v}"
+_testdir="$srcdir"/dotnet-regular-tests-$_testtag
_cli_root="$srcdir"/bootstrap
# custom function that converts Alpine arch syntax to dotnet arch syntax
@@ -129,12 +181,17 @@ _patch() {
unset arch_spec
for j in ${arch/_/-}; do [ -z "${i##*"$j"*}" ] && local arch_spec=true; done
# if arch specific, checks if patch is applicable to this exact arch
- if [ -n "${i##*"$CARCH"*}" ] && [ "$arch_spec" ]; then continue; fi
+ if [ -n "${i##*"${CARCH/_/-}"*}" ] && [ "$arch_spec" ]; then continue; fi
msg "Applying $i to $package"
cd "$builddir"
- [ "$package" = "build" ] || { cd src/$package.* || { echo "$package does not exist for patch"; failed=$failed $i; continue; }; }
+ case $package in
+ check*)cd "$_testdir" || { echo "$_testdir does not exist"; failed=$failed $i; continue; };;
+ build*)cd "$builddir";;
+ *) cd src/$package.* || { echo "$package does not exist for patch"; failed=$failed $i; continue; };;
+ esac
patch -Np1 -i "$srcdir/$(filename_from_uri $i)" || failed="$failed $i"
+ cd "$builddir"
;;
esac
done
@@ -323,6 +380,45 @@ build() {
-- $args | tee -a "$builddir"/build.log
}
+check() {
+ msg "Unpacking produced dotnet"
+ export DOTNET_ROOT="$_checkdir/release"
+ if [ ! -d "$DOTNET_ROOT" ]; then
+ mkdir -p "$DOTNET_ROOT"
+ tar -xzf "$builddir"/artifacts/$_dotnet_arch/Release/dotnet-sdk-$_pkgver_macro*.tar.gz -C "$DOTNET_ROOT" --no-same-owner
+ fi
+ export PATH="$DOTNET_ROOT:$PATH"
+ # some files either should or should not have executable bits
+ # (done again during packaging - this is for tests)
+ _fix_executable "$DOTNET_ROOT"
+
+ msg "Building turkey test suite"
+ if [ ! -d "$_checkdir"/turkey ]; then
+ cd "$_checkdir"/Turkey
+ dotnet publish \
+ -f netcoreapp3.1 \
+ -c Release \
+ -p:VersionPrefix=${_turkeytag/v} \
+ -p:VersionSuffix="$(git rev-parse --short HEAD)" \
+ -o "$_checkdir"/turkey
+ fi
+
+ msg "Running test suite"
+ cd "$_testdir"
+ for i in $_disabled_tests; do
+ [ -d "$i" ] && sed -i 's|"enabled": true|"enabled": false|' $i/test.json
+ done
+ dotnet "$_checkdir"/turkey/Turkey.dll || local ERROR=true
+ if [ $ERROR ]; then
+ msg "Check error reported, dumping logs"
+ for i in *.log; do
+ msg "Dumping $i"
+ cat "$i"
+ done
+ return 1
+ fi
+}
+
package() {
local subdir=${pkgname/*-}
local targetdir="$pkgdir"/usr/share/dotnet/$subdir/$pkgver
@@ -369,25 +465,30 @@ artifacts() {
sha512sums="
a64dd7ff11e1f757320c6f59aaef9f0d2025da8dd4e701aded988d3bcbb01ad7130373b9307a194b3a180330a0daa07f7f2b7947d3411a57c3c5ad22a5351e73 source-build-tarball-6.0.103.tar.gz
+b5072009d5d1639645a78fef61643ed7db981fdc9e1c99f8bdcdabb49a9210c64c67a3cb02af4eaded4bf92fce4e418c50c4d5567cedbe7773d27307905e210c source-build-testssuite.tar.gz
+5890ef0edc5b6f5e020cedc71be438039c8a2e19c5e71aa538c7fe4046560eea521a621d52638ff1312a398847414fefe311f2f9ac520765472517fab542c419 source-build-turkey.tar.gz
a2b21c38ed739f9bd18b39a28ef21b940ae32beeb2c8f99575289111e5ecaae40e017a500b3b452ef5df7c7e12dff2f8385acada92ca7507d1ed351c6aa9e311 aspnetcore_musl-build-fix.patch
e81cd08bd87bcacb9037959c29cb8457ce010a3bce3127eaeaabbd56552d5817b824949320ad4f9bdc582f5edf9e0f8072017b94e40f7606181c51bc93298190 build_arm-build.patch
bbb72fd61156611c0dd87f3d46e7cb36e0d506da84ea466c5e26513e49abf6b5523c87421bcdef85f06a50488cfed5d73b618e1212b35aad82fe2d43b19da3d9 build_copy-sbrp.patch
-731003042fa864227520126d617b867e7ccfc89ae468fde5563d429b93f46e791ef1c7fd785a72fe739ec3c09c8f7a8fd20dbdc3e4a12f1857eacde376dd0520 build_musl-build-fix.patch
-7806bc888295dbc127b43384511719ef19b0a9b032b4efdd6ea619c0ba105eb7aadf6fa35ba0cb43a4cd98f2267e9f0905f9d574fa3666b634efd5591b6e8212 command-line-api_fix-musl-build.patch
+8812aa5c60d20737a5b2a808e6ac7f72bcb3c7810bb28c6c1714b62c286f8ceb24c2ab5745b09367208850feb600edf94a22a2288d5b5a1d1aca9575fb63aefc build_musl-build-fix.patch
+c2e4f232f049e3e29b11f751b59bb2750be9d265f3cd93be5a767cdd1c35cc9630a4ca77cfc0c8d23deb913f1d16f2668dde40c5ae6f5e22e41da317aaf045fb check_alpine-support.patch
+ce36d0233d33cdc96888a64ab83a4099f877413269bcb5602704cedfb6aa89bf6d86157545f6f6243c226b2d714acf66a2bcfb65576afd0c6cda345b76bb5c07 command-line-api_fix-musl-build.patch
71612ac1d9933335583cf722dc5ecfb37739f662a165cd2afb62bf342e83946955269370da57d3295fa4f781683a2fb6027068584b996efcb33d71e18f7191e2 command-line-api_use-work-tree-with-git.patch
06ed5091e461c160930746768a1f296bdf7f876b0578cdeb93077e623212c0c535b24e406f9408c402e83eac361a33dba2d7dda7ce7140dd23061ebd8a4a466d fsharp_use-work-tree-with-git.patch
f198924d1c9cf22288fb99072e06bc5ce1eccac5cb7361e8f7b3973e6399db50f141aaa8a2dda07c0153208e74819c082a7a74d58785caa0cb2c1efcef28f21b installer_arm-build.patch
9724b8b4cb52ac41e7d7a49a0dd2c9937ecf5dc096a123f8cbc5302bbb256ccf440cfa12bfba8295070d7eaac25406fa054e2dce8023257da4d2aeb3c54fe6f3 installer_forgotten-MicrosoftAspNetCoreAppRuntimePac.patch
-d4ab53d241163e83986895f9abd0faf5a35182791057074b3bc446004aa67845aaf1952a69f7f40a835a5858d6018d30418237d29bc2df7ff02da9bf603655b8 installer_musl-build-fix.patch
+f1f10017830e941ff42c28c2f764e489ab02800b528ec89c23c7cf5145225e2956a8db044bc7bac08fc87fa5bd3700ba49df952df09d3e46705dec6bcecb40f5 installer_musl-build-fix.patch
+f4c164256adab18dad187243041416ab612af566501db96069a4c14e4a35ae2fe81f07ec8535b4ff132625423b03ab4dfe3892aefa59fa0494eba6723ba72929 installer_portable-runtime-id.patch
fe85d6ee786b74c90d69fe3fed03352570f96613ab03cf15d12530da6b98dffaff8cc9ece3044679486b97841481ece4359b80f81b82e7c96fe1dfc8fb6e2945 installer_reprodicible-tarball.patch
-dda6b463af8e0c8342b9c0d1a584f6d6410fb48df9fb0ef3c07d5ee7eb4abf2a29a01bf7a39fc70c2f5986c0b24c7bfe602cbfbeb1157cb0e0fb0eaa7fb03d1c runtime_aarch64-armv7-armhf-lld-fix.patch
2e79e27b201a3e4423d63666b3dd575d0cb5ddbe258af24d9a2d0f9eb4cc8d177070249cfd08536fa7c3c6debdf939239a7e2c1aadd692d3e903bbb168f241b5 runtime_detect-armv8.patch
79dacbaeb9af252e515028f800efc5c1628be9290007418bf4a219f49d4264b2abab2a89af6cd9ff3c74451fe40d6811f7d3c13b9237da187c419295f4ba1280 runtime_disable-package-validation.patch
-cb946dfb27eace2cd5204c77fc7e459c40fac8af364635f543284819856b479470839fa0da8e175c0c75268f219e1dfc4d9fb3d0f707553b67d8b80bbe18d3c4 runtime_force-microsoftnetcoreilasmpackageruntimeid-as-musl.patch
+dda6b463af8e0c8342b9c0d1a584f6d6410fb48df9fb0ef3c07d5ee7eb4abf2a29a01bf7a39fc70c2f5986c0b24c7bfe602cbfbeb1157cb0e0fb0eaa7fb03d1c runtime_lld-fix.patch
adb7537feb742f9b838323336e891b6e92c017215628ab2742841b6ec5945987d76082c6d42746f84062f0e537bb1d74cfa3989866fb105b9608af23abf17753 runtime_non-portable-distrorid-fix-alpine.patch
1c737579bbc8152cb376632781188e543f4b64920adfa537d313366d55f23c896ecd61e366b5e801cd85441aadab8e61b9b775532e829cb347749279c8028902 runtime_rid-alpine-316.patch
-678d13b75a4839a6bfbfd9cdfa057b724fd82c28561b015dfba0d34509b32ad9a2d0946e6b657d7e5d4d1bcea96aafc51f91a4749186895f50d3aba34a4c4954 sdk_telemetry-optout.patch
+e8fba8748c600696a529dd9b861b2e4bffed9f6a56c1e6ec58c1444b567b92a00e6c310f835eb7915db5f924409782d6ec3d7ae98082bde22401ce7836ee7acb runtime_x86-64-use-system-libunwind.patch
55afa9c74be6f5a87f1ff5aa44caad094cf620eb4388f6407218acf3d58a878f5565a0e875e95c3dbe0efca1879c120ee4b8076c521bfc9d6069a652c4a4fdd8 sdk_add-zsh-compdef-completion-script.patch
+532534ed88fda70b5088b655af00a7218c72f99a65b35194ebcd960b354b24f043c4b63e72b915aaf69ba847f7befa7d650495a0741d7526accb58b425f74a26 sdk_portable-runtime-id.patch
+2d651813c6a46e885636fe141d90a33c92d0fa450611cadd944b45ec6929a169e49a6cba18afdd708e3359d5ee204f1c1f6e3bfce2ba9d1bdb083edf78d0337e sdk_telemetry-optout.patch
d41ed2c7f4b81be2770d1c6b4bba17cea0772131bee994ebce9ca7acc302b2c15cc1adac6a814b866af04728cd4beb0ca411d218d113922fe32001c485b89c67 vstest_use-work-tree-with-git.patch
4d85a411c4add10072c8b411e05b9ece4696c9409c9a363a0f5ecf2adc6ccb815d868c96941da31a6c4e9d981cede144222155eadac1fbed851989086835d101 xliff-tasks_use-work-tree-with.git.patch
"
diff --git a/testing/dotnet6-build/build_musl-build-fix.patch b/testing/dotnet6-build/build_musl-build-fix.patch
index 4c5ca0a14b0c..8857b845b8f4 100644
--- a/testing/dotnet6-build/build_musl-build-fix.patch
+++ b/testing/dotnet6-build/build_musl-build-fix.patch
@@ -1,55 +1,87 @@
-From 6118eca9fd0f95e5fe83f6961239979994d35a4d Mon Sep 17 00:00:00 2001
+From 1d18ad3bcbae9ff5e6eff434ee2729e9ff738709 Mon Sep 17 00:00:00 2001
+PatchSource: https://github.com/dotnet/installer/pull/13410
From: Antoine Martin <dev@ayakael.net>
-Date: Sat, 12 Feb 2022 23:36:23 +0000
+Date: Sun, 13 Mar 2022 23:28:21 +0000
Subject: [PATCH 1/1] musl-build-fix
-Various changes for building on musl
+Musl support for dotnet build
---
- Directory.Build.props | 2 +-
- repos/aspnetcore.proj | 1 +
- repos/installer.proj | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
+ Directory.Build.props | 4 ++++
+ Directory.Build.targets | 7 +++++++
+ repos/aspnetcore.proj | 2 ++
+ repos/installer.proj | 3 ++-
+ src/redist/targets/GetRuntimeInformation.targets | 9 +++++++++
+ 5 files changed, 24 insertions(+), 1 deletion(-)
-diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props
-index 51f8e3c5a..2661667b5 100644
+diff --git a/Directory.Build.props b/Directory.Build.props
+index fdc0999af..2c659c200 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
-@@ -190,7 +190,7 @@
- <PropertyGroup Condition="'$(PortableBuild)' == 'true'">
+@@ -171,6 +171,9 @@
+ </PropertyGroup>
+
+ <PropertyGroup>
++ <OSPlatformIsMusl Condition="$(OSPlatformIsMuslCheck) == '0'">true</OSPlatformIsMusl>
++ <OSPlatformIsMusl Condition="$(OSPlatformIsMusl) == ''">true</OSPlatformIsMusl>
++
+ <TargetRid Condition="'$(TargetRid)' == ''">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)</TargetRid>
+
+ <TargetOS Condition="'$(TargetOS)' == '' AND $([MSBuild]::IsOSPlatform('WINDOWS'))">Windows_NT</TargetOS>
+@@ -183,6 +186,7 @@
<TargetRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-$(Platform)</TargetRid>
<TargetRid Condition="'$(TargetOS)' == 'OSX'">osx-$(Platform)</TargetRid>
-- <TargetRid Condition="'$(TargetOS)' == 'Linux'">linux-$(Platform)</TargetRid>
-+ <TargetRid Condition="'$(TargetOS)' == 'Linux'">linux-musl-$(Platform)</TargetRid>
+ <TargetRid Condition="'$(TargetOS)' == 'Linux'">linux-$(Platform)</TargetRid>
++ <TargetRid Condition="'$(TargetOS)' == 'Linux' AND '$(OSPlatformIsMusl)' == 'true'">linux-musl-$(Platform)</TargetRid>
<TargetRid Condition="'$(TargetOS)' == 'Windows_NT'">win-$(Platform)</TargetRid>
</PropertyGroup>
-diff --git a/src/SourceBuild/tarball/content/repos/aspnetcore.proj b/src/SourceBuild/tarball/content/repos/aspnetcore.proj
-index 43fd35d01..ee02b0fa2 100644
+diff --git a/Directory.Build.targets b/Directory.Build.targets
+index 02ff624bc..c7e3bd141 100644
+--- a/Directory.Build.targets
++++ b/Directory.Build.targets
+@@ -10,6 +10,13 @@
+ </ItemGroup>
+ </Target>
+
++ <Target Name="GetOSPlatformIsMuslCheck"
++ BeforeTargets="CollectPackageReferences">
++ <Exec IgnoreExitCode="true" Command="ldd --version 2>&1 | grep -q musl">
++ <Output TaskParameter="ExitCode" PropertyName="OSPlatformIsMuslCheck" />
++ </Exec>
++ </Target>
++
+ <Import Condition="'$(SkipArcadeSdkImport)' != 'true'" Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+
+ </Project>
+diff --git a/repos/aspnetcore.proj b/repos/aspnetcore.proj
+index 480f3c713..04694770d 100644
--- a/repos/aspnetcore.proj
+++ b/repos/aspnetcore.proj
-@@ -15,6 +15,7 @@
+@@ -15,6 +15,8 @@
<!-- https://github.com/dotnet/sdk/pull/20136 has not flowed into our bootstrap SDK yet, which causes file-in-use issues in ASP.NET
due to an interaction with the RemoveSharedFrameworkDependencies task. disable package validation until this is fixed. -->
<BuildCommandArgs>$(BuildCommandArgs) /p:EnablePackageValidation=false</BuildCommandArgs>
-+ <BuildCommandArgs>$(BuildCommandArgs) --os-name linux-musl</BuildCommandArgs>
++ <!-- below is temporary fix till https://github.com/dotnet/aspnetcore/issues/39822 is addressed -->
++ <BuildCommandArgs Condition="'$(OSPlatformIsMusl)' == 'true'">$(BuildCommandArgs) --os-name linux-musl</BuildCommandArgs>
<BuildCommand>$(ProjectDirectory)\eng\build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
<LogVerbosityOptOut>true</LogVerbosityOptOut>
-diff --git a/src/SourceBuild/tarball/content/repos/installer.proj b/src/SourceBuild/tarball/content/repos/installer.proj
-index 712d7cd14..cca5295f9 100644
+diff --git a/repos/installer.proj b/repos/installer.proj
+index 712d7cd14..587384128 100644
--- a/repos/installer.proj
+++ b/repos/installer.proj
-@@ -25,7 +25,7 @@
+@@ -25,7 +25,8 @@
<BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:Rid=$(TargetRid)</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir)</BuildCommandArgs>
- <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=linux-$(Platform)</BuildCommandArgs>
-+ <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=linux-musl-$(Platform)</BuildCommandArgs>
++ <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux' AND '$(OSPlatformIsMusl)' == 'false'">$(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=linux-$(Platform)</BuildCommandArgs>
++ <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux' AND '$(OSPlatformIsMusl)' == 'true'">$(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=linux-musl-$(Platform)</BuildCommandArgs>
<!-- core-sdk always wants to build portable on OSX and FreeBSD -->
<BuildCommandArgs Condition="'$(TargetOS)' == 'FreeBSD'">$(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true</BuildCommandArgs>
<BuildCommandArgs Condition="'$(TargetOS)' == 'OSX'">$(BuildCommandArgs) /p:CoreSetupRid=osx-x64</BuildCommandArgs>
- <!-- Used to detect if ASP.NET Core is built against the same version of Microsoft.NETCore.App. -->
+
--
2.34.1
diff --git a/testing/dotnet6-build/check_alpine-support.patch b/testing/dotnet6-build/check_alpine-support.patch
new file mode 100644
index 000000000000..2e060f03fc8f
--- /dev/null
+++ b/testing/dotnet6-build/check_alpine-support.patch
@@ -0,0 +1,661 @@
+From bee508a96b8b2d4ceedc73c103e12c35239bf769 Mon Sep 17 00:00:00 2001
+PatchSource: https://github.com/redhat-developer/dotnet-regular-tests/pull/192
+From: Antoine Martin <dev@ayakael.net>
+Date: Wed, 16 Mar 2022 19:29:33 +0000
+Subject: [PATCH 1/1] alpine support
+
+Alpine support for regular test suite
+
+---
+ apphost-framework-lookup/test.sh | 2 +-
+ aspnet-same-runtime-version-2x/test.sh | 2 +-
+ aspnet-same-runtime-version/test.sh | 2 +-
+ aspnetpatch-21/test.sh | 2 +-
+ assemblies-valid/AssembliesValid.cs | 6 ++--
+ bash-completion/get-completions.sh | 2 +-
+ bash-completion/test.sh | 2 +-
+ bundled-libunwind/test.sh | 2 +-
+ cgroup-limit/test.sh | 8 ++++-
+ commit-ids-in-binaries/test.sh | 2 +-
+ createdump-aspnet/test.sh | 2 +-
+ curl-certificate-store/test.sh | 2 +-
+ debugging-sos-lldb-via-core-2x/test.sh | 2 +-
+ debugging-sos-lldb-via-core/test.sh | 2 +-
+ distribution-packages/test.sh | 5 ++-
+ dotnet-info-commit-ids/test.sh | 2 +-
+ extract-bundle-dir/test.sh | 2 +-
+ fdd-no-nuget/test.sh | 4 +--
+ file-permissions/test.sh | 2 +-
+ hardened-binaries/test.sh | 4 +--
+ helloworld/test.sh | 2 +-
+ install-location/test.sh | 2 +-
+ liblttng-ust_sys-sdt.h/test.sh | 31 ++++++++++++++++---
+ libuv-kestrel-sample-app-2x/test.sh | 2 +-
+ lttng/test.sh | 7 +++--
+ man-pages/test.sh | 9 ++++--
+ managed-symbols-available/test.sh | 2 +-
+ omnisharp/test.sh | 5 ++-
+ openssl-alpn/test.sh | 2 +-
+ publish-ready-to-run-linux/test.sh | 2 +-
+ publish-ready-to-run/test.sh | 2 +-
+ restore-with-rid/test.sh | 2 +-
+ runtime-id | 7 +++--
+ sdks-are-available/test.sh | 2 +-
+ system-libcurl/test.sh | 2 +-
+ system-libunwind/test.sh | 2 +-
+ system-openssl/test.sh | 2 +-
+ targeting-packs-bad-files/test.sh | 2 +-
+ .../test-telemetry-tcpdump.sh | 2 +-
+ telemetry-is-off-by-default/test.sh | 2 +-
+ template-test/test.sh | 2 +-
+ tool-dev-certs/test.sh | 2 +-
+ use-apphost-from-sdk/test.sh | 2 +-
+ use-current-runtime/test.sh | 2 +-
+ workload/test.sh | 2 +-
+ xunit-smoketest/test.sh | 2 +-
+ 46 files changed, 101 insertions(+), 57 deletions(-)
+
+diff --git a/apphost-framework-lookup/test.sh b/apphost-framework-lookup/test.sh
+index bde3320..771b8b8 100755
+--- a/apphost-framework-lookup/test.sh
++++ b/apphost-framework-lookup/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ if [ -f /etc/profile ]; then
+ source /etc/profile
+diff --git a/aspnet-same-runtime-version-2x/test.sh b/aspnet-same-runtime-version-2x/test.sh
+index 3c0c72f..0d2bedb 100755
+--- a/aspnet-same-runtime-version-2x/test.sh
++++ b/aspnet-same-runtime-version-2x/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+
+diff --git a/aspnet-same-runtime-version/test.sh b/aspnet-same-runtime-version/test.sh
+index 7e8509b..35a091d 100755
+--- a/aspnet-same-runtime-version/test.sh
++++ b/aspnet-same-runtime-version/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+
+diff --git a/aspnetpatch-21/test.sh b/aspnetpatch-21/test.sh
+index ffca7c2..c1be634 100755
+--- a/aspnetpatch-21/test.sh
++++ b/aspnetpatch-21/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+ set -x
+diff --git a/assemblies-valid/AssembliesValid.cs b/assemblies-valid/AssembliesValid.cs
+index 3cf75b1..c9f9588 100644
+--- a/assemblies-valid/AssembliesValid.cs
++++ b/assemblies-valid/AssembliesValid.cs
+@@ -44,7 +44,7 @@ namespace AssembliesValid
+ public void ValidateAssemblies()
+ {
+ string dotnetPath = null;
+- int exitCode = RunProcessAndGetOutput(new string[] { "command", "-v", "dotnet" }, out dotnetPath);
++ int exitCode = RunProcessAndGetOutput(new string[] { "bash", "-c", "\"command", "-v", "dotnet\"" }, out dotnetPath);
+ if (exitCode != 0)
+ {
+ Console.Error.WriteLine("'dotnet' command not found");
+@@ -91,8 +91,8 @@ namespace AssembliesValid
+ if (hasMethods && !hasAot)
+ {
+ #if NET6_0_OR_GREATER
+- // s390x doesn't have aot support, and that's okay for now
+- if (architecture != Architecture.S390x)
++ // s390x (and arm) doesn't have aot support, and that's okay for now
++ if (architecture != Architecture.S390x && architecture != Architecture.Arm)
+ {
+ #endif
+ valid = false;
+diff --git a/bash-completion/get-completions.sh b/bash-completion/get-completions.sh
+index 431dc74..510c2b1 100755
+--- a/bash-completion/get-completions.sh
++++ b/bash-completion/get-completions.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/bash
++#!/usr/bin/env bash
+
+ get_completion_function_name_from_complete_output()
+ {
+diff --git a/bash-completion/test.sh b/bash-completion/test.sh
+index 9010509..3f63a1c 100755
+--- a/bash-completion/test.sh
++++ b/bash-completion/test.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+
+diff --git a/bundled-libunwind/test.sh b/bundled-libunwind/test.sh
+index 8743072..7a34a79 100755
+--- a/bundled-libunwind/test.sh
++++ b/bundled-libunwind/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+
+diff --git a/cgroup-limit/test.sh b/cgroup-limit/test.sh
+index 413ba78..5bbf263 100755
+--- a/cgroup-limit/test.sh
++++ b/cgroup-limit/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+
+@@ -13,6 +13,12 @@ if [[ "$(stat -f -c "%T" /sys/fs/cgroup)" == "cgroup2fs" ]] && [[ $(dotnet --ver
+ exit 0
+ fi
+
++
++if [ -z "$(command -v systemctl)" ]; then
++ echo "Environment does not use systemd"
++ exit 0
++fi
++
+ dotnet publish
+
+ SYSTEMD_RUN="systemd-run"
+diff --git a/commit-ids-in-binaries/test.sh b/commit-ids-in-binaries/test.sh
+index 4ee952a..5f6bfb0 100755
+--- a/commit-ids-in-binaries/test.sh
++++ b/commit-ids-in-binaries/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ # .NET Core native binaries (coreclr.so, System.Native.so) contain a
+ # commit id as text somewhere in the binary. For example
+diff --git a/createdump-aspnet/test.sh b/createdump-aspnet/test.sh
+index e0af909..c14d807 100755
+--- a/createdump-aspnet/test.sh
++++ b/createdump-aspnet/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ # Enable "unofficial bash strict mode"
+ set -euo pipefail
+diff --git a/curl-certificate-store/test.sh b/curl-certificate-store/test.sh
+index a74161f..39cb11c 100755
+--- a/curl-certificate-store/test.sh
++++ b/curl-certificate-store/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+
+diff --git a/debugging-sos-lldb-via-core-2x/test.sh b/debugging-sos-lldb-via-core-2x/test.sh
+index 8d28bdf..8b307af 100755
+--- a/debugging-sos-lldb-via-core-2x/test.sh
++++ b/debugging-sos-lldb-via-core-2x/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ # Check whether coredumps produced by .NET Core can be used by sos
+ # successfully. This test uses the built-in CoreCLR sos support, not
+diff --git a/debugging-sos-lldb-via-core/test.sh b/debugging-sos-lldb-via-core/test.sh
+index 6ee806c..12d2590 100755
+--- a/debugging-sos-lldb-via-core/test.sh
++++ b/debugging-sos-lldb-via-core/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ # Check whether coredumps produced by .NET Core can be used by sos
+ # successfully. This test uses the `dotnet sos` global tool.
+diff --git a/distribution-packages/test.sh b/distribution-packages/test.sh
+index 01a2405..f6b29d0 100755
+--- a/distribution-packages/test.sh
++++ b/distribution-packages/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+
+@@ -8,6 +8,9 @@ runtime_id=$(../runtime-id)
+ # This might be the final/only netstandard version from now on
+ netstandard_version=2.1
+
++# disabled for alpine
++[ -z "${runtime_id##alpine*}" ] && { echo Disabled for Alpine; exit 0; }
++
+ ./test-standard-packages \
+ "${runtime_id}" \
+ "${runtime_version}" "${runtime_version}" \
+diff --git a/dotnet-info-commit-ids/test.sh b/dotnet-info-commit-ids/test.sh
+index 04debe7..7358001 100755
+--- a/dotnet-info-commit-ids/test.sh
++++ b/dotnet-info-commit-ids/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ # unofficial bash strict mode
+ set -euo pipefail
+diff --git a/extract-bundle-dir/test.sh b/extract-bundle-dir/test.sh
+index 0d96031..0733c36 100755
+--- a/extract-bundle-dir/test.sh
++++ b/extract-bundle-dir/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ # The profile file sets DOTNET_BUNDLE_EXTRACT_BASE_DIR to avoid multi-user issues.
+ # see: https://bugzilla.redhat.com/show_bug.cgi?id=1752350.
+diff --git a/fdd-no-nuget/test.sh b/fdd-no-nuget/test.sh
+index d00fd29..b49b0f2 100755
+--- a/fdd-no-nuget/test.sh
++++ b/fdd-no-nuget/test.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/bash
++#!/usr/bin/env bash
+
+ set +x
+
+@@ -21,4 +21,4 @@ if [ $? -eq 1 ]; then
+ exit 1
+ fi
+
+-echo "PASS: successfully published FDD without nuget.org access"
+\ No newline at end of file
++echo "PASS: successfully published FDD without nuget.org access"
+diff --git a/file-permissions/test.sh b/file-permissions/test.sh
+index 7a4b126..cd3c60c 100755
+--- a/file-permissions/test.sh
++++ b/file-permissions/test.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+ IFS=$'\n\t'
+diff --git a/hardened-binaries/test.sh b/hardened-binaries/test.sh
+index 81f8e85..ede89f0 100755
+--- a/hardened-binaries/test.sh
++++ b/hardened-binaries/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+ IFS=$'\n\t'
+@@ -8,7 +8,7 @@ echo ".NET Core base directory: $root"
+
+ # TODO handle more architectures can just x86-64
+
+-file_list=$(find "$root/" -type f -exec file {} \; | grep -E 'ELF 64-bit [LM]SB' | cut -d: -f 1 | sort -u)
++file_list=$(find "$root/" -type f -exec file {} \; | grep -E 'ELF [[:digit:]][[:digit:]]-bit [LM]SB' | cut -d: -f 1 | sort -u)
+ mapfile -t binaries <<< "$file_list"
+ for binary in "${binaries[@]}"; do
+ echo "$binary"
+diff --git a/helloworld/test.sh b/helloworld/test.sh
+index 9de4d32..96458b1 100755
+--- a/helloworld/test.sh
++++ b/helloworld/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+
+diff --git a/install-location/test.sh b/install-location/test.sh
+index 274f734..c89ecc9 100755
+--- a/install-location/test.sh
++++ b/install-location/test.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+ IFS=$'\n\t'
+diff --git a/liblttng-ust_sys-sdt.h/test.sh b/liblttng-ust_sys-sdt.h/test.sh
+index 7ab7597..fcdc07a 100755
+--- a/liblttng-ust_sys-sdt.h/test.sh
++++ b/liblttng-ust_sys-sdt.h/test.sh
+@@ -1,22 +1,43 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+ set -x
+
++RUNTIME_ID=$(../runtime-id)
+ set +e # disable abort-on-error so we can have the pipeline below fail
+-packageName=$(rpm -qa | grep 'dotnet.*lttng-ust')
++case $RUNTIME_ID in
++ alpine*)packageName=$(apk list dotnet*lttng-ust);;
++ *)packageName=$(rpm -qa | grep 'dotnet.*lttng-ust');;
++esac
+ set -e
+ # If a dotnet-specific lttng package doesn't exist, we must be using
+ # the normal system-wide lttng package.
+ if [[ -z "$packageName" ]]; then
+- packageName=$(rpm -qa | grep 'lttng-ust')
++ case $RUNTIME_ID in
++ alpine*)
++ packageName="lttng-ust"
++ ;;
++ *)
++ packageName=$(rpm -qa | grep 'lttng-ust')
++ ;;
++ esac
+ fi
+
+-filePath=$(rpm -ql "$packageName" | grep -E 'liblttng-ust.so.[01]$')
++# If a dotnet-specific lttng package doesn't exist, we must be using
++# the normal system-wide lttng package.
++case $RUNTIME_ID in
++ alpine*)
++ filePath="/$(apk info -L "$packageName" | grep -E 'liblttng-ust.so.[01]$')"
++ ;;
++ *)
++ filePath=$(rpm -ql "$packageName" | grep -E 'liblttng-ust.so.[01]$')
++ ;;
++esac
++
+ readelf -n "$filePath" | grep -F 'NT_STAPSDT (SystemTap probe descriptors)'
+
+ if [[ $? -eq 1 ]]; then
+- echo "NO NT_STAPSDT were found in lttng-ust: FAL"
++ echo "NO NT_STAPSDT were found in lttng-ust: FAIL"
+ exit 1
+ fi
+
+diff --git a/libuv-kestrel-sample-app-2x/test.sh b/libuv-kestrel-sample-app-2x/test.sh
+index 3f8b1f5..24eaacf 100755
+--- a/libuv-kestrel-sample-app-2x/test.sh
++++ b/libuv-kestrel-sample-app-2x/test.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+
+diff --git a/lttng/test.sh b/lttng/test.sh
+index 01c7ac0..7a06aac 100755
+--- a/lttng/test.sh
++++ b/lttng/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+
+@@ -49,8 +49,11 @@ wait $DOTNET_PID
+ echo "== Ending lttng session"
+ end_session
+
++CMD="$(command -v babeltrace || true)"
++[ -z "${CMD}" ] && CMD="$(command -v babeltrace2)"
++
+ # Retrieve trace
+-LTTNG_TRACE=$(babeltrace "$TRACE_FOLDER/ust/uid/$(id -u)/64-bit" | grep "vpid = $DOTNET_PID")
++LTTNG_TRACE=$($CMD "$TRACE_FOLDER/ust/uid/$(id -u)/64-bit" | grep "vpid = $DOTNET_PID")
+
+ # Clean up
+ remove_test_folder
+diff --git a/man-pages/test.sh b/man-pages/test.sh
+index 7a8bba6..b06b41d 100755
+--- a/man-pages/test.sh
++++ b/man-pages/test.sh
+@@ -1,9 +1,14 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+
+ helpPages=$(dotnet --help | grep -A 999 'SDK commands' | grep -E -B 999 'Common options|Additional commands' | awk 'NR>1 {print $1}' | head -n-2)
+-manPages=$(rpm -qd $(rpm -qa | grep 'dotnet') | grep 'man1/dotnet-')
++
++RUNTIME_ID=$(../runtime-id)
++case $RUNTIME_ID in
++ alpine*)manPages=$(apk info -L dotnet-doc);;
++ *)manPages=$(rpm -qd $(rpm -qa | grep 'dotnet') | grep 'man1/dotnet-');;
++esac
+
+ failed=0
+ for page in $helpPages; do
+diff --git a/managed-symbols-available/test.sh b/managed-symbols-available/test.sh
+index b733091..c5d819b 100755
+--- a/managed-symbols-available/test.sh
++++ b/managed-symbols-available/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ # Check that managed symbol files are available
+
+diff --git a/omnisharp/test.sh b/omnisharp/test.sh
+index 741508b..3bf73d7 100755
+--- a/omnisharp/test.sh
++++ b/omnisharp/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+ IFS=$'\n\t'
+@@ -11,6 +11,9 @@ pushd workdir
+
+ runtime_id="$(../../runtime-id --portable)"
+
++# disabled for alpine
++[ -z "${runtime_id##*musl*}" ] && { echo No musl release of omnisharp, disabled; exit 0; }
++
+ wget --no-verbose "https://github.com/OmniSharp/omnisharp-roslyn/releases/latest/download/omnisharp-${runtime_id}.tar.gz"
+
+ mkdir omnisharp
+diff --git a/openssl-alpn/test.sh b/openssl-alpn/test.sh
+index 6511eee..2f92afd 100755
+--- a/openssl-alpn/test.sh
++++ b/openssl-alpn/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ # Make sure .NET Core has linked to SSL_*_alpn_* functions from OpenSSL
+
+diff --git a/publish-ready-to-run-linux/test.sh b/publish-ready-to-run-linux/test.sh
+index f8b6e93..42a044c 100755
+--- a/publish-ready-to-run-linux/test.sh
++++ b/publish-ready-to-run-linux/test.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+ set -x
+diff --git a/publish-ready-to-run/test.sh b/publish-ready-to-run/test.sh
+index d765181..03cacdd 100755
+--- a/publish-ready-to-run/test.sh
++++ b/publish-ready-to-run/test.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+ set -x
+diff --git a/restore-with-rid/test.sh b/restore-with-rid/test.sh
+index 3c08019..d6581e8 100755
+--- a/restore-with-rid/test.sh
++++ b/restore-with-rid/test.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+ set -x
+diff --git a/runtime-id b/runtime-id
+index 3224860..6b21c33 100755
+--- a/runtime-id
++++ b/runtime-id
+@@ -38,11 +38,14 @@ while [[ $# -gt 0 ]]; do
+ done
+
+ if [[ ${portable_rid} == 1 ]]; then
+- echo "linux-${arch}"
++ case "${ID}" in
++ alpine)echo "linux-musl-${arch}" ;;
++ *) echo "linux-${arch}" ;;
++ esac
+ else
+ case "${ID}" in
+ # Remove the RHEL minor version
+- rhel) rid_version=${VERSION_ID%.*} ;;
++ rhel|alpine|rocky) rid_version=${VERSION_ID%.*} ;;
+
+ *) rid_version=${VERSION_ID} ;;
+ esac
+diff --git a/sdks-are-available/test.sh b/sdks-are-available/test.sh
+index 0abdee4..2847b91 100755
+--- a/sdks-are-available/test.sh
++++ b/sdks-are-available/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+ IFS=$'\n\t'
+diff --git a/system-libcurl/test.sh b/system-libcurl/test.sh
+index 1f13dc6..33c7cf9 100755
+--- a/system-libcurl/test.sh
++++ b/system-libcurl/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+
+diff --git a/system-libunwind/test.sh b/system-libunwind/test.sh
+index 7396685..d6239a5 100755
+--- a/system-libunwind/test.sh
++++ b/system-libunwind/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+
+diff --git a/system-openssl/test.sh b/system-openssl/test.sh
+index 00cebc5..b98625d 100755
+--- a/system-openssl/test.sh
++++ b/system-openssl/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ # Make sure .NET has ldd-visible links to OpenSSL. We prefer that over
+ # using OpenSSL via dlopen (which is more likely to fail at runtime).
+diff --git a/targeting-packs-bad-files/test.sh b/targeting-packs-bad-files/test.sh
+index 713a68e..2e20b7c 100755
+--- a/targeting-packs-bad-files/test.sh
++++ b/targeting-packs-bad-files/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+
+diff --git a/telemetry-is-off-by-default/test-telemetry-tcpdump.sh b/telemetry-is-off-by-default/test-telemetry-tcpdump.sh
+index 5c0c360..d391c5d 100755
+--- a/telemetry-is-off-by-default/test-telemetry-tcpdump.sh
++++ b/telemetry-is-off-by-default/test-telemetry-tcpdump.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ # This test is *NOT* executed by default.
+
+diff --git a/telemetry-is-off-by-default/test.sh b/telemetry-is-off-by-default/test.sh
+index b9e42c2..d0bcd65 100755
+--- a/telemetry-is-off-by-default/test.sh
++++ b/telemetry-is-off-by-default/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ # This test ensures telemetry is not being sent for (some) commands by
+ # checking that no network connections are being made when not
+diff --git a/template-test/test.sh b/template-test/test.sh
+index cc21f6c..dc16698 100755
+--- a/template-test/test.sh
++++ b/template-test/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ # this file tests templates created by
+ # dotnet new <template>
+diff --git a/tool-dev-certs/test.sh b/tool-dev-certs/test.sh
+index 0c2eeb7..b2a4ceb 100755
+--- a/tool-dev-certs/test.sh
++++ b/tool-dev-certs/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ if [ -f /etc/profile ]; then
+ source /etc/profile
+diff --git a/use-apphost-from-sdk/test.sh b/use-apphost-from-sdk/test.sh
+index 002aa4c..1b4a266 100755
+--- a/use-apphost-from-sdk/test.sh
++++ b/use-apphost-from-sdk/test.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+ IFS=$'\n\t'
+diff --git a/use-current-runtime/test.sh b/use-current-runtime/test.sh
+index ef22e15..e1d3e85 100755
+--- a/use-current-runtime/test.sh
++++ b/use-current-runtime/test.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+
+diff --git a/workload/test.sh b/workload/test.sh
+index 9363186..4394241 100755
+--- a/workload/test.sh
++++ b/workload/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+
+diff --git a/xunit-smoketest/test.sh b/xunit-smoketest/test.sh
+index 36d48a9..8e8da75 100755
+--- a/xunit-smoketest/test.sh
++++ b/xunit-smoketest/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ set -euo pipefail
+
+--
+2.35.1
+
diff --git a/testing/dotnet6-build/command-line-api_fix-musl-build.patch b/testing/dotnet6-build/command-line-api_fix-musl-build.patch
index 6517ea13ab45..aa4319799f3c 100644
--- a/testing/dotnet6-build/command-line-api_fix-musl-build.patch
+++ b/testing/dotnet6-build/command-line-api_fix-musl-build.patch
@@ -6,25 +6,43 @@ Subject: [PATCH 1/1] musl-build
Various change for build on musl
---
- .../dotnet-suggest.Tests.csproj | 2 +-
- src/System.CommandLine.Suggest/dotnet-suggest.csproj | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ .../dotnet-suggest.Tests.csproj | 13 +++++++++++++
+ .../dotnet-suggest.csproj | 2 +-
+ 2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj b/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj
-index da6abedf..13bbe2df 100644
+index da6abedf..3d738ac9 100644
--- a/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj
+++ b/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj
-@@ -53,7 +53,7 @@
- </PropertyGroup>
+@@ -38,6 +38,15 @@
- <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">
-- <Rid>linux-x64</Rid>
-+ <Rid>linux-musl-x64</Rid>
+ <Target Name="DotnetSuggestIntegrationTestAssets" BeforeTargets="Build" Condition="'$(Configuration)' == 'Release'">
+
++ <Exec IgnoreExitCode="true" Command="ldd --version 2>&1 | grep -q musl">
++ <Output TaskParameter="ExitCode" PropertyName="OSPlatformIsMuslCheck" />
++ </Exec>
++
++ <PropertyGroup>
++ <OSPlatformIsMusl Condition="$(OSPlatformIsMuslCheck) == '0'">true</OSPlatformIsMusl>
++ <OSPlatformIsMusl Condition="$(OSPlatformIsMusl) == ''">false</OSPlatformIsMusl>
++ </PropertyGroup>
++
+ <PropertyGroup>
+ <TestAssetsPath>
+ $([System.IO.Path]::GetFullPath('$(OutputPath)'))/TestAssets
+@@ -56,6 +65,10 @@
+ <Rid>linux-x64</Rid>
</PropertyGroup>
++ <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(OSPlatformIsMusl)' == 'true'">
++ <Rid>linux-musl-x64</Rid>
++ </PropertyGroup>
++
<MSBuild BuildInParallel="False" Projects="../System.CommandLine.Suggest/dotnet-suggest.csproj" Targets="Restore" Properties="UseAppHost=true;SelfContained=false;RuntimeIdentifier=$(Rid);ForceRestoreToEvaluateSeparately=1;Configuration=Release">
+ </MSBuild>
+
diff --git a/src/System.CommandLine.Suggest/dotnet-suggest.csproj b/src/System.CommandLine.Suggest/dotnet-suggest.csproj
-index ae97dfe6..276f0158 100644
+index fd825008..b18096e2 100644
--- a/src/System.CommandLine.Suggest/dotnet-suggest.csproj
+++ b/src/System.CommandLine.Suggest/dotnet-suggest.csproj
@@ -6,7 +6,7 @@
@@ -32,10 +50,10 @@ index ae97dfe6..276f0158 100644
<PackageId>dotnet-suggest</PackageId>
<ToolCommandName>dotnet-suggest</ToolCommandName>
- <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;osx-x64;linux-x64</PackAsToolShimRuntimeIdentifiers>
-+ <PackAsToolShimRuntimeIdentifiers>linux-musl-x64</PackAsToolShimRuntimeIdentifiers>
++ <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;osx-x64;linux-x64;linux-musl-x64</PackAsToolShimRuntimeIdentifiers>
<PackagedShimOutputRootDirectory>$(OutputPath)</PackagedShimOutputRootDirectory>
<DotnetSuggestBuildNumber>.1</DotnetSuggestBuildNumber>
--
-2.34.1
+2.31.1
diff --git a/testing/dotnet6-build/installer_musl-build-fix.patch b/testing/dotnet6-build/installer_musl-build-fix.patch
index e9bbe8900710..5e530dc2db43 100644
--- a/testing/dotnet6-build/installer_musl-build-fix.patch
+++ b/testing/dotnet6-build/installer_musl-build-fix.patch
@@ -1,29 +1,99 @@
-From 821bb1c992674bb23350d2755590d2e358e077d0 Mon Sep 17 00:00:00 2001
+From 4621c5ddc605d0cfa21e2ab8fec12145165bd25e Mon Sep 17 00:00:00 2001
+PatchSource: https://github.com/dotnet/installer/pull/13410
From: Antoine Martin <dev@ayakael.net>
-Date: Sun, 13 Feb 2022 21:59:13 +0000
-Subject: [PATCH 1/2] installer_musl-build-fix
+Date: Sun, 13 Mar 2022 23:28:21 +0000
+Subject: [PATCH 1/1] musl-build-fiox
-Installer lookgs for crossgen2 under RID linux-$ARCH, when it should be
-linux-musl-$ARCH. SharedFrameworkRid is assumed to always show this,
-thus we look for that package now
+Musl build fix for installer
---
- src/redist/targets/Crossgen.targets | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ src/SourceBuild/tarball/content/Directory.Build.props | 8 ++++++++
+ src/SourceBuild/tarball/content/repos/aspnetcore.proj | 2 ++
+ src/SourceBuild/tarball/content/repos/installer.proj | 3 ++-
+ src/redist/targets/GetRuntimeInformation.targets | 9 +++++++++
+ 4 files changed, 21 insertions(+), 1 deletion(-)
-diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets
-index 8949af132..afd2fa49c 100644
---- a/src/redist/targets/Crossgen.targets
-+++ b/src/redist/targets/Crossgen.targets
-@@ -6,7 +6,7 @@
-
+diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props
+index fdc0999af..ec508d8a9 100644
+--- a/src/SourceBuild/tarball/content/Directory.Build.props
++++ b/src/SourceBuild/tarball/content/Directory.Build.props
+@@ -170,7 +170,14 @@
+ <ArmEnvironmentVariables Condition="'$(Platform)' == 'armel'">ROOTFS_DIR=$(BaseIntermediatePath)crossrootfs/armel</ArmEnvironmentVariables>
+ </PropertyGroup>
+
++ <Exec IgnoreExitCode="true" Command="ldd --version 2>&1 | grep -q musl">
++ <Output TaskParameter="ExitCode" PropertyName="OSPlatformIsMuslCheck" />
++ </Exec>
++
+ <PropertyGroup>
++ <OSPlatformIsMusl Condition="$(OSPlatformIsMuslCheck) == '0'">true</OSPlatformIsMusl>
++ <OSPlatformIsMusl Condition="$(OSPlatformIsMusl) == ''">false</OSPlatformIsMusl>
++
+ <TargetRid Condition="'$(TargetRid)' == ''">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)</TargetRid>
+
+ <TargetOS Condition="'$(TargetOS)' == '' AND $([MSBuild]::IsOSPlatform('WINDOWS'))">Windows_NT</TargetOS>
+@@ -183,6 +190,7 @@
+ <TargetRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-$(Platform)</TargetRid>
+ <TargetRid Condition="'$(TargetOS)' == 'OSX'">osx-$(Platform)</TargetRid>
+ <TargetRid Condition="'$(TargetOS)' == 'Linux'">linux-$(Platform)</TargetRid>
++ <TargetRid Condition="'$(TargetOS)' == 'Linux' AND '$(OSPlatformIsMusl)' == 'true'">linux-musl-$(Platform)</TargetRid>
+ <TargetRid Condition="'$(TargetOS)' == 'Windows_NT'">win-$(Platform)</TargetRid>
+ </PropertyGroup>
+
+diff --git a/src/SourceBuild/tarball/content/repos/aspnetcore.proj b/src/SourceBuild/tarball/content/repos/aspnetcore.proj
+index 480f3c713..04694770d 100644
+--- a/src/SourceBuild/tarball/content/repos/aspnetcore.proj
++++ b/src/SourceBuild/tarball/content/repos/aspnetcore.proj
+@@ -15,6 +15,8 @@
+ <!-- https://github.com/dotnet/sdk/pull/20136 has not flowed into our bootstrap SDK yet, which causes file-in-use issues in ASP.NET
+ due to an interaction with the RemoveSharedFrameworkDependencies task. disable package validation until this is fixed. -->
+ <BuildCommandArgs>$(BuildCommandArgs) /p:EnablePackageValidation=false</BuildCommandArgs>
++ <!-- below is temporary fix till https://github.com/dotnet/aspnetcore/issues/39822 is addressed -->
++ <BuildCommandArgs Condition="'$(OSPlatformIsMusl)' == 'true'">$(BuildCommandArgs) --os-name linux-musl</BuildCommandArgs>
+ <BuildCommand>$(ProjectDirectory)\eng\build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
+
+ <LogVerbosityOptOut>true</LogVerbosityOptOut>
+diff --git a/src/SourceBuild/tarball/content/repos/installer.proj b/src/SourceBuild/tarball/content/repos/installer.proj
+index 712d7cd14..587384128 100644
+--- a/src/SourceBuild/tarball/content/repos/installer.proj
++++ b/src/SourceBuild/tarball/content/repos/installer.proj
+@@ -25,7 +25,8 @@
+ <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:Rid=$(TargetRid)</BuildCommandArgs>
+ <BuildCommandArgs>$(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir)</BuildCommandArgs>
+
+- <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=linux-$(Platform)</BuildCommandArgs>
++ <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux' AND '$(OSPlatformIsMusl)' == 'false'">$(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=linux-$(Platform)</BuildCommandArgs>
++ <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux' AND '$(OSPlatformIsMusl)' == 'true'">$(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=linux-musl-$(Platform)</BuildCommandArgs>
+ <!-- core-sdk always wants to build portable on OSX and FreeBSD -->
+ <BuildCommandArgs Condition="'$(TargetOS)' == 'FreeBSD'">$(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true</BuildCommandArgs>
+ <BuildCommandArgs Condition="'$(TargetOS)' == 'OSX'">$(BuildCommandArgs) /p:CoreSetupRid=osx-x64</BuildCommandArgs>
+diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets
+index 5133c3a38..01ac03776 100644
+--- a/src/redist/targets/GetRuntimeInformation.targets
++++ b/src/redist/targets/GetRuntimeInformation.targets
+@@ -1,6 +1,13 @@
+ <Project>
+ <Target Name="GetCurrentRuntimeInformation">
++ <Exec IgnoreExitCode="true" Command="ldd --version 2>&1 | grep -q musl">
++ <Output TaskParameter="ExitCode" PropertyName="OSPlatformIsMuslCheck" />
++ </Exec>
++
<PropertyGroup>
- <RuntimeNETCoreAppPackageName>microsoft.netcore.app.runtime.$(SharedFrameworkRid)</RuntimeNETCoreAppPackageName>
-- <RuntimeNETCrossgenPackageName>microsoft.netcore.app.crossgen2.$(HostOSName)-$(BuildArchitecture)</RuntimeNETCrossgenPackageName>
-+ <RuntimeNETCrossgenPackageName>microsoft.netcore.app.crossgen2.$(SharedFrameworkRid)</RuntimeNETCrossgenPackageName>
- <CrossgenPath>$(NuGetPackageRoot)/$(RuntimeNETCrossgenPackageName)/$(MicrosoftNETCoreAppRuntimePackageVersion)/tools/crossgen2$(ExeExtension)</CrossgenPath>
- <!-- When ingesting stable pgo instrumented binaries, the shared framework will be a non-stable version,
- as will the archive file names themselves. -->
++ <OSPlatformIsMusl Condition="$(OSPlatformIsMuslCheck) == '0'">true</OSPlatformIsMusl>
++ <OSPlatformIsMusl Condition="$(OSPlatformIsMusl) == ''">false</OSPlatformIsMusl>
++
+ <HostRid Condition="'$(HostRid)' == '' and '$(MSBuildRuntimeType)' == 'core'">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)</HostRid>
+ <HostRid Condition="'$(HostRid)' == '' and '$(MSBuildRuntimeType)' != 'core'">win-$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant)</HostRid>
+
+@@ -9,6 +16,8 @@
+ <HostOSName Condition=" '$(HostOSName)' == '' AND $([MSBuild]::IsOSPlatform('OSX')) ">osx</HostOSName>
+ <HostOSName Condition=" '$(HostOSName)' == '' AND $([MSBuild]::IsOSPlatform('FREEBSD')) ">freebsd</HostOSName>
+ <HostOSName Condition=" '$(HostOSName)' == '' AND '$(IsLinux)' == 'True' ">linux</HostOSName>
++ <!-- If platform is musl based, adds information to HostOSName -->
++ <HostOSName Condition="$(OSPlatformIsMusl) == 'true'">$(HostOSName)-musl</HostOSName>
+
+ <OSName Condition=" '$(OSName)' == '' ">$(HostOSName)</OSName>
+
--
2.34.1
diff --git a/testing/dotnet6-build/installer_portable-runtime-id.patch b/testing/dotnet6-build/installer_portable-runtime-id.patch
new file mode 100644
index 000000000000..22594168d4fe
--- /dev/null
+++ b/testing/dotnet6-build/installer_portable-runtime-id.patch
@@ -0,0 +1,23 @@
+From 892222071f73062f969f4f6ed1df8f759b9327b7 Mon Sep 17 00:00:00 2001
+PatchSource: https://github.com/dotnet/installer/pull/12516
+From: Tom Deseyn <tom.deseyn@gmail.com>
+Date: Wed, 3 Nov 2021 15:12:59 +0100
+Subject: [PATCH] GetRuntimeInformation.targets: determine
+ PortableProductMonikerRid based on HostOSName and Architecture.
+
+---
+ src/redist/targets/GetRuntimeInformation.targets | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets
+index 5133c3a3841..01f704c7d8e 100644
+--- a/src/redist/targets/GetRuntimeInformation.targets
++++ b/src/redist/targets/GetRuntimeInformation.targets
+@@ -28,6 +28,8 @@
+ '$(Rid)' == 'linux-musl-x64' ">$(Rid)</ProductMonikerRid>
+ <ProductMonikerRid Condition=" '$(ProductMonikerRid)' == '' ">$(OSName)-$(Architecture)</ProductMonikerRid>
+
++ <PortableProductMonikerRid Condition=" '$(PortableProductMonikerRid)' == '' ">$(HostOSName)-$(Architecture)</PortableProductMonikerRid>
++
+ <ArtifactNameSdk>dotnet-sdk-internal$(PgoTerm)</ArtifactNameSdk>
+ <ArtifactNameCombinedHostHostFxrFrameworkSdk>dotnet-sdk$(PgoTerm)</ArtifactNameCombinedHostHostFxrFrameworkSdk>
diff --git a/testing/dotnet6-build/runtime_force-microsoftnetcoreilasmpackageruntimeid-as-musl.patch b/testing/dotnet6-build/runtime_force-microsoftnetcoreilasmpackageruntimeid-as-musl.patch
deleted file mode 100644
index e49c070a2f34..000000000000
--- a/testing/dotnet6-build/runtime_force-microsoftnetcoreilasmpackageruntimeid-as-musl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From db0d7c564822a0d0d28fa2a52fe613e297e80bef Mon Sep 17 00:00:00 2001
-From: Antoine Martin <dev@ayakael.net>
-Date: Thu, 16 Dec 2021 02:38:47 +0000
-Subject: [PATCH 1/1] Force MicrosoftNetCoreIlasmPackageRuntimeId as
-
-Runtime doesn't know to look for linux-musl version of
-Microsoft.NETCore.Ilasm nupkgs provided by stage0 and dotnet
-build. This forces looking for it
-
----
- Directory.Build.props | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/Directory.Build.props b/Directory.Build.props
-index 5cb87bb7c25..24efb6ba2b3 100644
---- a/Directory.Build.props
-+++ b/Directory.Build.props
-@@ -168,8 +168,7 @@
- <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'maccatalyst' or '$(_runtimeOS)' == 'ios' or '$(_runtimeOS)' == 'iOSSimulator' or '$(_runtimeOS)' == 'tvos' or '$(_runtimeOS)' == 'tvOSSimulator'">osx-x64</_toolRuntimeRID>
-
- <!-- There are no non-portable builds for Ilasm/Ildasm -->
-- <MicrosoftNetCoreIlasmPackageRuntimeId Condition="'$(PortableBuild)' != 'true' and '$(_portableOS)' == 'linux'">linux-$(_hostArch)</MicrosoftNetCoreIlasmPackageRuntimeId>
-- <MicrosoftNetCoreIlasmPackageRuntimeId Condition="'$(MicrosoftNetCoreIlasmPackageRuntimeId)' == ''">$(_toolRuntimeRID)</MicrosoftNetCoreIlasmPackageRuntimeId>
-+ <MicrosoftNetCoreIlasmPackageRuntimeId>linux-musl-$(_hostArch)</MicrosoftNetCoreIlasmPackageRuntimeId>
-
- <PackageRID>$(_packageOS)-$(TargetArchitecture)</PackageRID>
-
---
-2.34.1
-
diff --git a/testing/dotnet6-build/runtime_aarch64-armv7-armhf-lld-fix.patch b/testing/dotnet6-build/runtime_lld-fix.patch
similarity index 100%
rename from testing/dotnet6-build/runtime_aarch64-armv7-armhf-lld-fix.patch
rename to testing/dotnet6-build/runtime_lld-fix.patch
diff --git a/testing/dotnet6-build/runtime_x86-64-use-system-libunwind.patch b/testing/dotnet6-build/runtime_x86-64-use-system-libunwind.patch
new file mode 100644
index 000000000000..23ff2c2f3718
--- /dev/null
+++ b/testing/dotnet6-build/runtime_x86-64-use-system-libunwind.patch
@@ -0,0 +1,29 @@
+From 85b1a6bea96280cd564eba0b0bdbcc2696de9789 Mon Sep 17 00:00:00 2001
+PatchSource: https://github.com/dotnet/source-build/issues/2408
+From: Antoine Martin <dev@ayakael.net>
+Date: Wed, 16 Mar 2022 23:03:32 -0400
+Subject: [PATCH 1/1] use system libunwind
+
+Due to https://github.com/dotnet/source-build/issues/2408, this patch is needed
+to build with system libunwind, rather than using built-in library
+
+---
+ eng/SourceBuild.props | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
+index e191178c906..98f9d9cc42a 100644
+--- a/eng/SourceBuild.props
++++ b/eng/SourceBuild.props
+@@ -37,7 +37,7 @@
+ <InnerBuildArgs>$(InnerBuildArgs) /p:KeepNativeSymbols=true</InnerBuildArgs>
+ <InnerBuildArgs>$(InnerBuildArgs) /p:RuntimeOS=$(TargetRidWithoutPlatform)</InnerBuildArgs>
+ <InnerBuildArgs>$(InnerBuildArgs) /p:PortableBuild=$(SourceBuildPortable)</InnerBuildArgs>
+- <InnerBuildArgs>$(InnerBuildArgs) /p:BuildDebPackage=false</InnerBuildArgs>
++ <InnerBuildArgs>$(InnerBuildArgs) /p:BuildDebPackage=false --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE</InnerBuildArgs>
+ </PropertyGroup>
+ </Target>
+
+--
+2.31.1
+
diff --git a/testing/dotnet6-build/sdk_portable-runtime-id.patch b/testing/dotnet6-build/sdk_portable-runtime-id.patch
new file mode 100644
index 000000000000..8923d95ae684
--- /dev/null
+++ b/testing/dotnet6-build/sdk_portable-runtime-id.patch
@@ -0,0 +1,23 @@
+From 499fcf6e3b0e4b01a9c340a06f00cfc3e1fcc5d2 Mon Sep 17 00:00:00 2001
+PatchSource: https://github.com/dotnet/sdk/pull/22373
+From: Tom Deseyn <tom.deseyn@gmail.com>
+Date: Tue, 5 Oct 2021 09:04:14 +0200
+Subject: [PATCH] Use the portable rid for --use-current-runtime.
+
+---
+ .../targets/Microsoft.NET.RuntimeIdentifierInference.targets | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
+index 17308aa9160..e764b2d9845 100644
+--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
++++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
+@@ -62,7 +62,7 @@ Copyright (c) .NET Foundation. All rights reserved.
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(UseCurrentRuntimeIdentifier)' == 'true'">
+- <RuntimeIdentifier>$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
++ <RuntimeIdentifier>$(NETCoreSdkPortableRuntimeIdentifier)</RuntimeIdentifier>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(PlatformTarget)' == ''">
diff --git a/testing/dotnet6-build/sdk_telemetry-optout.patch b/testing/dotnet6-build/sdk_telemetry-optout.patch
index 6d584d50f6f7..c598bcf67886 100644
--- a/testing/dotnet6-build/sdk_telemetry-optout.patch
+++ b/testing/dotnet6-build/sdk_telemetry-optout.patch
@@ -6,22 +6,27 @@ Subject: [PATCH 1/1] SDK telemetry optout
Disables telemetry by default.
---
- src/Cli/dotnet/Program.cs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ src/Cli/dotnet/Program.cs | 7 +++++++
+ 1 file changed, 7 insertions(+)
diff --git a/src/Cli/dotnet/Program.cs b/src/Cli/dotnet/Program.cs
-index c3be733b4a..adfa457aaf 100644
+index c3be733b4a..2a157a75d5 100644
--- a/src/Cli/dotnet/Program.cs
+++ b/src/Cli/dotnet/Program.cs
-@@ -171,7 +171,7 @@ internal static int ProcessArgs(string[] args, TimeSpan startupTime, ITelemetry
- bool generateAspNetCertificate =
- environmentProvider.GetEnvironmentVariableAsBool("DOTNET_GENERATE_ASPNET_CERTIFICATE", defaultValue: true);
- bool telemetryOptout =
-- environmentProvider.GetEnvironmentVariableAsBool("DOTNET_CLI_TELEMETRY_OPTOUT", defaultValue: false);
-+ environmentProvider.GetEnvironmentVariableAsBool("DOTNET_CLI_TELEMETRY_OPTOUT", defaultValue: true);
- bool addGlobalToolsToPath =
- environmentProvider.GetEnvironmentVariableAsBool("DOTNET_ADD_GLOBAL_TOOLS_TO_PATH", defaultValue: true);
- bool nologo =
+@@ -27,6 +27,13 @@ public class Program
+
+ public static int Main(string[] args)
+ {
++ // opt out of telemetry by default if the env var is unset
++ string telemetryValue = Environment.GetEnvironmentVariable("DOTNET_CLI_TELEMETRY_OPTOUT");
++ if (String.IsNullOrEmpty(telemetryValue))
++ {
++ Environment.SetEnvironmentVariable("DOTNET_CLI_TELEMETRY_OPTOUT", "1");
++ }
++
+ DebugHelper.HandleDebugSwitch(ref args);
+
+ // Capture the current timestamp to calculate the host overhead.
--
-2.34.1
+2.35.1
--
GitLab