diff --git a/community/dotnet7-build/APKBUILD b/community/dotnet7-build/APKBUILD index 99afff2..8eb690b 100644 --- a/community/dotnet7-build/APKBUILD +++ b/community/dotnet7-build/APKBUILD @@ -1,88 +1,44 @@ # Maintainer: Antoine Martin (ayakael) # Contributor: Antoine Martin (ayakael) -# secfixes: -# 7.0.103-r0: -# - CVE-2023-21808 -# 7.0.105-r0: -# - CVE-2023-28260 -# 7.0.107-r0: -# - CVE-2023-24895 -# - CVE-2023-24897 -# - CVE-2023-24936 -# - CVE-2023-29331 -# - CVE-2023-29337 -# - CVE-2023-32032 -# - CVE-2023-33126 -# - CVE-2023-33128 -# - CVE-2023-33135 -# 7.0.109-r0: -# - CVE-2023-33127 -# - CVE-2023-33170 -# 7.0.110-r0: -# - CVE-2023-38178 -# - CVE-2023-35390 -# - CVE-2023-38180 -# - CVE-2023-35391 -# 7.0.111-r0: -# - CVE-2023-36792 -# - CVE-2023-36793 -# - CVE-2023-36794 -# - CVE-2023-36796 -# - CVE-2023-36799 -# 7.0.112-r0: -# - CVE-2023-36435 -# - CVE-2023-38171 -# - CVE-2023-44487 -# 7.0.113-r0: -# - CVE-2023-36792 -# - CVE-2023-36793 -# - CVE-2023-36794 -# - CVE-2023-36796 -# - CVE-2023-36799 -# - CVE-2023-44487 -# - CVE-2023-38171 -# - CVE-2023-36435 -# 7.0.114-r0: -# - CVE-2023-36049 -# - CVE-2023-36558 - - -pkgname=dotnet7-build -pkgver=7.0.114 +pkgname=dotnet8-runtime +pkgver=8.0.0 pkgrel=0 -_gittag=v$pkgver -_giturl="https://github.com/dotnet/installer" -_testtag=e1cc0f181ffd4d755756d30d985513897d592ba4 -_bunnytag=v12 -_llvmver=16 +_gittag=v8.0.0 +_giturl="https://github.com/dotnet/dotnet" +_testtag=d3d39e7c404c6e45c3e7ab6621c5f6cabf1540b0 +_bunnytag=v15 _patches=" - build_disable-package-validation.patch - build_disable-source-link.patch + aspnetcore_portable-build-workaround.patch + aspire_fix-gitinfo-target.patch build_enable-timestamps.patch + installer_hard-dereference-tar-gz.patch roslyn-analyzer_disable-apphost.patch - runtime_76500-mono-musl-support.patch runtime_82269-mono-thread-coop-undefine-fortify-source.patch - runtime_enable-runtime-marshalling.diff + runtime_90251-rename-mono-cmake-host-var.patch runtime_enable-system-libunwind.diff + runtime_more-clang-16-suppression.patch runtime_remove-usage-of-off64-t.patch - sdk_14239-add-zsh-compdef-completion-script.patch + vstest_intent-net8.0.patch " _pkgver_macro=${pkgver%.*} _pkgver_prior=${pkgver%.*.*} _pkgver_name=${_pkgver_macro//[.0]} -pkgdesc="The .NET $_pkgver_macro bootstrap" +_pkgver_sdk=${pkgver/0./0.10} +pkgdesc="The .NET $_pkgver_macro Core runtime" # x86: blocked by https://github.com/dotnet/runtime/issues/77667 # armhf: blocked by https://github.com/dotnet/runtime/issues/77663 -# riscv64: port WIP https://github.com/dotnet/runtime/issues/36748 -# s390x | ppc64le: no diskspace / lack maintainer resources -arch="x86_64 armv7 aarch64" +# riscv64: blocked by https://github.com/dotnet/runtime/issues/84834 +arch="all !x86 !armhf !riscv64" url=https://dotnet.microsoft.com license="MIT" -# hack for dotnetx-build to be able to pull itself for bootstrapping -provides="dotnet$_pkgver_name-bootstrap" -provider_priority=$_pkgver_prior +provides="dotnet$_pkgver_name=$pkgver-r$pkgrel" +depends=" + dotnet$_pkgver_name-hostfxr + icu-data-full + icu-libs + " checkdepends=" babeltrace binutils @@ -99,9 +55,8 @@ checkdepends=" which " makedepends=" - alpine-release bash - clang$_llvmver + clang cmake dotnet$_pkgver_name-bootstrap dotnet$_pkgver_name-bootstrap-artifacts @@ -121,7 +76,7 @@ makedepends=" libxml2-utils linux-headers lldb-dev - llvm$_llvmver-dev + llvm-dev lttng-ust-dev nodejs numactl-dev @@ -139,21 +94,26 @@ case $CARCH in esac subpackages=" - dotnet$_pkgver_name-artifacts:artifacts:noarch - dotnet$_pkgver_name-sdk - dotnet$_pkgver_name-templates:templates:noarch - dotnet-zsh-completion:zshcomp:noarch - dotnet-bash-completion:bashcomp:noarch - dotnet-doc - netstandard21-targeting-pack:netstandard_targeting_pack:noarch + aspnetcore$_pkgver_name-runtime:aspnetcore_runtime:noarch + aspnetcore$_pkgver_name-runtime-dbg:aspnetcore_dbg:noarch + aspnetcore$_pkgver_name-targeting-pack:aspnetcore_targeting_pack:noarch + dotnet$_pkgver_name-runtime-artifacts::noarch + dotnet$_pkgver_name-runtime-bootstrap + dotnet$_pkgver_name-runtime-dbg:runtime_dbg:noarch + dotnet$_pkgver_name-apphost-pack:apphost_pack + dotnet$_pkgver_name-hostfxr + dotnet$_pkgver_name-targeting-pack:targeting_pack:noarch + dotnet-host:host " source=" - https://lab.ilot.io/dotnet/installer/-/releases/$_gittag/downloads/tarball/dotnet-$_gittag.tar.xz + dotnet-tarball-$_gittag.tar.gz::https://github.com/dotnet/dotnet/archive/refs/tags/$_gittag.tar.gz + dotnet-release-$_gittag.json::https://github.com/dotnet/dotnet/releases/download/$_gittag/release.json dotnet-testsuite-$_testtag.tar.gz::https://github.com/redhat-developer/dotnet-regular-tests/archive/$_testtag.tar.gz dotnet-bunny-$_bunnytag.tar.gz::https://github.com/redhat-developer/dotnet-bunny/archive/$_bunnytag.tar.gz + dotnet.sh.in $_patches " -builddir="$srcdir"/dotnet-$_gittag +builddir="$srcdir"/dotnet-${_gittag/v} _checkdir="$srcdir"/dotnet-bunny-${_bunnytag/v} _testdir="$srcdir"/dotnet-regular-tests-$_testtag _cli_root="$srcdir"/bootstrap @@ -200,54 +160,9 @@ _fix_executable() { -exec chmod -x '{}' \; } -# generates tarball containing all components built by dotnet -snapshot() { - local _pkg="$srcdir"/${builddir##*/}.tar - ulimit -n 4096 - if [ -d "$srcdir" ]; then - cd "$srcdir" - else - mkdir -p "$srcdir" && cd "$srcdir" - fi - if [ -d "installer" ]; then - cd "$srcdir"/installer - else - git clone $_giturl --branch $_gittag && cd "$srcdir"/installer - fi - - sed 's||' -i src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets - - if [ -d "$_libdir/dotnet/bootstrap" ]; then - local _cli_root="$(find $_libdir/dotnet/bootstrap/${_pkgver_macro}* -maxdepth 0 -type d | sort -r | head -n 1)" - else - local _cli_root="" - fi - - _InitializeDotNetCli="$_cli_root" DOTNET_INSTALL_DIR="$_cli_root" DotNetBuildFromSource=true ./build.sh \ - /p:ArcadeBuildTarball=true \ - /p:TarballDir=$builddir \ - /p:TarballFilePath=$_pkg - - msg "Compressing ${builddir##*/}.tar to $SRCDEST" - xz -T0 -9 -vv -e -c > "$SRCDEST"/${builddir##*/}.tar.xz < "$_pkg" - - cd "$startdir" - abuild checksum -} - prepare() { default_prepare - # Parallel restore is broken on mono-based builds since dotnet7 - # see https://github.com/dotnet/runtime/issues/77364 - # A workaround via runtime_enable-runtime-marshalling.diff - case $CARCH in - s390x|ppc64le) - msg "runtime_enable-runtime-marshalling.diff" - patch -p1 -i "$srcdir"/runtime_enable-runtime-marshalling.diff - ;; - esac - # Using system libunwind is broken on aarch64|armv7, and unused on mono-based builds # see https://github.com/dotnet/source-build/issues/2408, case $CARCH in @@ -287,20 +202,18 @@ build() { ulimit -n 4096 - export PATH="$PATH:/usr/lib/llvm$_llvmver/bin" - - # Disable use of LTTng as tracing on lttng <=2,13,0 is broken + # Disable use of LTTng as tracing on lttng <=2.13.0 is broken # See https://github.com/dotnet/runtime/issues/57784. if [ -f "/usr/lib/liblttng-ust.so.1 " ]; then export DOTNET_LTTng=0 fi case "$CARCH" in - x86*) ;; - *) - # clang doesn't implement this outside of x86, and it causes a later configure to fail - export CFLAGS="${CFLAGS/-fstack-clash-protection}" - export CXXFLAGS="${CXXFLAGS/-fstack-clash-protection}" + x86*) ;; + *) + # clang doesn't implement this outside of x86, and it causes a later configure to fail + export CFLAGS="${CFLAGS/-fstack-clash-protection}" + export CXXFLAGS="${CXXFLAGS/-fstack-clash-protection}" ;; esac @@ -318,8 +231,9 @@ build() { # part of https://github.com/dotnet/installer/pull/14792 that sets this flag # was not integrated in 7.0.1xx yet + # UseSharedCompilation=false also reduces chances of hangups on mono-based builds case $CARCH in - s390x|ppc64le) local args="$args /p:SourceBuildUseMonoRuntime=true";; + riscv64|s390x|ppc64le) local args="$args /p:SourceBuildUseMonoRuntime=true /p:UseSharedCompilation=false";; esac # Sets TargetRid manually as dotnet cannot be trusted to reliably compute @@ -341,6 +255,7 @@ build() { ./build.sh \ --with-sdk "$_cli_root" \ --with-packages "$_artifactsdir" \ + --release-manifest "$srcdir"/dotnet-release-$_gittag.json \ -- $args } @@ -350,12 +265,13 @@ check() { local _tests_timeout=1000 # Test suite disable flags # following tests can only work after packaging step - local _disabled_tests="man-pages distribution-package bash-completion install-location release-version-sane" + local _disabled_tests="man-pages distribution-package bash-completion install-location release-version-sane managed-symbols-available tools-in-path" # test broken: permission issue on lxc / pipelines - local _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 - local _disabled_tests="$_disabled_tests liblttng-ust_sys-sdt.h lttng" + local _disabled_tests="$_disabled_tests createdump-aspnet" + # test broken: cannot pg_ctl can't create postgresql server + local _disabled_tests="$_disabled_tests system-data-odbc" + # test broken: no such file or directory bug + local _disabled_tests="$_disabled_tests limits" # {bundled,system}-libunwind: use system version on all but aarch64/armv7, as broken # see https://github.com/redhat-developer/dotnet-regular-tests/issues/113 # disable on mono-flavored runtime as mono does not use libunwind @@ -364,14 +280,10 @@ check() { s390x|ppc64le|armhf) local _disabled_tests="$_disabled_tests bundled-libunwind system-libunwind";; *) local _disabled_tests="$_disabled_tests bundled-libunwind";; esac - # test unit broken currently - local _disabled_tests="$_disabled_tests system-libunwind" # nativeaot is not supported on armv7 case $CARCH in armv7) local _disabled_tests="$_disabled_tests nativeaot" esac - # test unit hangs - local _disabled_tests="$_disabled_tests debugging-via-dotnet-dump" msg "Unpacking produced dotnet" export DOTNET_ROOT="$_checkdir/release" @@ -388,9 +300,12 @@ check() { _fix_executable "$DOTNET_ROOT" msg "Building turkey test suite" + if [ ! -d "$_logdir/check" ]; then + mkdir -p "$_logdir"/check + fi if [ ! -d "$_checkdir"/turkey ]; then cd "$_checkdir"/Turkey - dotnet publish -f netcoreapp3.1 -c Release -p:VersionPrefix=1 -p:VersionSuffix="$(git rev-parse --short HEAD)" -o "$_checkdir"/turkey + dotnet publish -bl:"$_logdir"/check/turkey.binlog -f net6.0 -c Release -p:VersionPrefix=1 -p:VersionSuffix="$(git rev-parse --short HEAD)" -o "$_checkdir"/turkey fi msg "Running test suite" @@ -400,39 +315,20 @@ check() { sed -i 's|"enabled": true|"enabled": false|' $i/test.json fi done - dotnet "$_checkdir"/turkey/Turkey.dll -t $_tests_timeout || local ERROR=true + dotnet "$_checkdir"/turkey/Turkey.dll -t $_tests_timeout -l "$_logdir"/check || local ERROR=true if [ $ERROR ]; then - msg "Check error reported, dumping logs" - for i in *.log; do - msg "Dumping $i" - cat "$i" - done + msg "Check error reported, please check logs" fi } package() { - # directory creation - install -dm 755 \ - "$pkgdir"/$_libdir/dotnet/bootstrap/$pkgver \ - "$pkgdir"/usr/share/man/man1 \ - "$pkgdir"/$_libdir/dotnet/artifacts/$pkgver + install -dm 755 "$pkgdir"/$_libdir/dotnet/shared - # unpack sdk to bootstrap tar --use-compress-program="pigz" \ -xf "$builddir"/artifacts/$_dotnet_arch/Release/dotnet-sdk-$_pkgver_macro*.tar.gz \ - -C "$pkgdir"/$_libdir/dotnet/bootstrap/$pkgver/ \ - --no-same-owner - - # extract arch-specific artifacts to artifacts dir for use by future dotnet builds - tar --use-compress-program="pigz" \ - -xf "$builddir"/artifacts/$_dotnet_arch/Release/Private.SourceBuilt.Artifacts.*.tar.gz \ - -C "$pkgdir"/$_libdir/dotnet/artifacts/$pkgver/ \ + -C "$pkgdir"/$_libdir/dotnet/ \ --no-same-owner \ - --wildcards \ - '*alpine*' - - # assemble docs - find "$builddir" -iname 'dotnet*.1' -type f -exec cp '{}' "$pkgdir"/usr/share/man/man1/. \; + ./shared/Microsoft.NETCore.App # some files either should or should not have executable bits _fix_executable "$pkgdir" @@ -440,74 +336,23 @@ package() { # Disable use of LTTng as tracing on lttng <=2,13,0 is broken # See https://github.com/dotnet/runtime/issues/57784. if [ -f "/usr/lib/liblttng-ust.so.1 " ]; then - rm "$pkgdir"/$_libdir/dotnet/bootstrap/*/shared/Microsoft.NETCore.App/*/libcoreclrtraceptprovider.so + rm "$pkgdir"/$_libdir/dotnet/shared/Microsoft.NETCore.App/*/libcoreclrtraceptprovider.so fi } -sdk() { - pkgdesc="The .NET $_pkgver_macro SDK" - # libucontext isn't automatically detected on all platforms - depends=" - aspnetcore$_pkgver_name-runtime - aspnetcore$_pkgver_name-targeting-pack - dotnet$_pkgver_name-apphost-pack - dotnet$_pkgver_name-targeting-pack - dotnet$_pkgver_name-templates - netstandard21-targeting-pack - libucontext - " - provides=" - dotnet-sdk-$_pkgver_macro=$pkgver-r$pkgrel - dotnet$_pkgver_name-dev=$pkgver-r$pkgrel - " +runtime_dbg() { + pkgdesc="The .NET $_pkgver_macro Core runtime - pdb debug files" + depends="dotnet$_pkgver_name-runtime" + provides="dotnet-runtime-dbg-$_pkgver_macro=$pkgver-r$pkgrel" - install -dm 755 "$subpkgdir"/$_libdir/dotnet + install -dm 755 "$subpkgdir"/$_libdir/dotnet/shared - # sdk tar --use-compress-program="pigz" \ - -xf "$builddir"/artifacts/$_dotnet_arch/Release/dotnet-sdk-$_pkgver_macro*.tar.gz \ + -xf "$builddir"/artifacts/$_dotnet_arch/Release/dotnet-symbols-sdk-$_pkgver_macro*.tar.gz \ -C "$subpkgdir"/$_libdir/dotnet/ \ --no-same-owner \ - ./sdk ./sdk-manifests + shared/Microsoft.NETCore.App - # some files either should or should not have executable bits - _fix_executable "$subpkgdir" - - # See https://github.com/dotnet/source-build/issues/2579 - find "$subpkgdir" -type f -name 'testhost.x86' -delete - find "$subpkgdir" -type f -name 'vstest.console' -delete -} - -netstandard_targeting_pack() { - pkgdesc="The .NET 2.1 Standard targeting pack" - depends="dotnet-host" - provides="netstandard-targeting-pack-2.1=$pkgver-r$pkgrel" - - install -dm 755 "$subpkgdir"/$_libdir/dotnet/packs - tar --use-compress-program="pigz" \ - -xf "$builddir"/artifacts/$_dotnet_arch/Release/dotnet-sdk-$_pkgver_macro*.tar.gz \ - -C "$subpkgdir"/$_libdir/dotnet/ \ - --no-same-owner \ - ./packs/NETStandard.Library.Ref - - # some files either should or should not have executable bits - _fix_executable "$subpkgdir" -} - -templates() { - pkgdesc="The .NET $_pkgver_macro templates" - depends="dotnet-host" - provides="dotnet-templates-$_pkgver_macro=$pkgver-r$pkgrel" - - install -dm 755 "$subpkgdir"/$_libdir/dotnet - tar --use-compress-program="pigz" \ - -xf "$builddir"/artifacts/$_dotnet_arch/Release/dotnet-sdk-$_pkgver_macro*.tar.gz \ - -C "$subpkgdir"/$_libdir/dotnet/ \ - --no-same-owner \ - ./templates - - # some files either should or should not have executable bits - _fix_executable "$subpkgdir" } artifacts() { @@ -518,67 +363,202 @@ artifacts() { # directory creation install -dm 755 \ - "$subpkgdir"/$_libdir/dotnet/artifacts/$pkgver \ + "$subpkgdir"/$_libdir/dotnet/artifacts/$_pkgver_sdk \ "$subpkgdir"/usr/share/licenses # extract arch-agnostic artifacts to artifacts dir for use by future dotnet builds tar --use-compress-program="pigz" \ -xf "$builddir"/artifacts/$_dotnet_arch/Release/Private.SourceBuilt.Artifacts.*.tar.gz \ - -C "$subpkgdir"/$_libdir/dotnet/artifacts/$pkgver/ \ + -C "$subpkgdir"/$_libdir/dotnet/artifacts/$_pkgver_sdk/ \ --no-same-owner \ --exclude '*Intermediate*' \ --exclude '*alpine*' } -zshcomp() { +bootstrap() { + pkgdesc="The .NET $_pkgver_macro Core bootstrap" depends="" - pkgdesc="zsh completion for .NET" - # netstandard21-targeting-pack will always be pulled by any dotnetx-sdk - # thus pulling this with it for sdk - install_if="netstandard21-targeting-pack zsh" - depends="dotnet-host" - install -dm 755 "$subpkgdir"/usr/share/zsh/site-functions - install -m 755 "$builddir"/src/sdk/scripts/register-completions.zsh "$subpkgdir"/usr/share/zsh/site-functions/_dotnet -} + # hack for dotnetx-runtime to be able to pull itself for bootstrapping + provides="dotnet$_pkgver_name-bootstrap" + provider_priority=$_pkgver_prior -bashcomp() { - depends="" - pkgdesc="bash completion for .NET" - # netstandard21-targeting-pack will always be pulled by any dotnetx-sdk - # thus pulling this with it for sdk - install_if="netstandard21-targeting-pack bash-completion" - depends="dotnet-host" + # directory creation + install -dm 755 \ + "$subpkgdir"/$_libdir/dotnet/bootstrap/$_pkgver_sdk/docs \ + "$subpkgdir"/$_libdir/dotnet/artifacts/$_pkgver_sdk - install -dm 755 "$subpkgdir"/usr/share/bash-completion/completions - install -m 755 "$builddir"/src/sdk/scripts/register-completions.bash "$subpkgdir"/usr/share/bash-completion/completions/_dotnet -} - -doc() { - default_doc - pkgdesc="Docs for .NET" - - # licenses - install -dm 755 "$subpkgdir"/usr/share/licenses/dotnet + # unpack sdk to bootstrap tar --use-compress-program="pigz" \ -xf "$builddir"/artifacts/$_dotnet_arch/Release/dotnet-sdk-$_pkgver_macro*.tar.gz \ - -C "$subpkgdir"/usr/share/licenses/dotnet/ \ + -C "$subpkgdir"/$_libdir/dotnet/bootstrap/$_pkgver_sdk/ \ + --no-same-owner + + # unpack sdk symbols to bootstrap + tar --use-compress-program="pigz" \ + -xf "$builddir"/artifacts/$_dotnet_arch/Release/dotnet-symbols-sdk-$_pkgver_macro*.tar.gz \ + -C "$subpkgdir"/$_libdir/dotnet/bootstrap/$_pkgver_sdk/ \ + --no-same-owner + + # extract arch-specific artifacts to artifacts dir for use by future dotnet builds + tar --use-compress-program="pigz" \ + -xf "$builddir"/artifacts/$_dotnet_arch/Release/Private.SourceBuilt.Artifacts.*.tar.gz \ + -C "$subpkgdir"/$_libdir/dotnet/artifacts/$_pkgver_sdk/ \ --no-same-owner \ - ./LICENSE.txt ./ThirdPartyNotices.txt + --wildcards \ + '*alpine*' + + # assemble docs + find "$builddir" -iname 'dotnet*.1' -type f -exec cp '{}' "$subpkgdir"/$_libdir/dotnet/bootstrap/$_pkgver_sdk/docs/. \; + + # completions + install -m 755 "$builddir"/src/sdk/scripts/register-completions.bash "$subpkgdir"/$_libdir/dotnet/bootstrap/$_pkgver_sdk/. + install -m 755 "$builddir"/src/sdk/scripts/register-completions.zsh "$subpkgdir"/$_libdir/dotnet/bootstrap/$_pkgver_sdk/. + + # some files either should or should not have executable bits + _fix_executable "$subpkgdir" + + # Disable use of LTTng as tracing on lttng <=2,13,0 is broken + # See https://github.com/dotnet/runtime/issues/57784. + if [ -f "/usr/lib/liblttng-ust.so.1 " ]; then + rm "$subpkgdir"/$_libdir/dotnet/bootstrap/*/shared/Microsoft.NETCore.App/*/libcoreclrtraceptprovider.so + fi +} + +host() { + pkgdesc="A generic driver for the .NET Core Command Line Interface" + depends="" + + install -dm 755 \ + "$subpkgdir"/etc/profile.d \ + "$subpkgdir"/etc/dotnet \ + "$subpkgdir"/usr/bin \ + "$subpkgdir"/$_libdir/dotnet + + tar --use-compress-program="pigz" \ + -xf "$builddir"/artifacts/$_dotnet_arch/Release/dotnet-sdk-$_pkgver_macro*.tar.gz \ + -C "$subpkgdir"/$_libdir/dotnet/ \ + --no-same-owner \ + ./dotnet + + ln -s $_libdir/dotnet/dotnet "$subpkgdir"/usr/bin/dotnet + echo "$_libdir/dotnet" > "$subpkgdir"/etc/dotnet/install_location + echo "$_libdir/dotnet" > "$subpkgdir"/etc/dotnet/install_location_$_dotnet_arch + sed "s|%LIBDIR%|$_libdir/dotnet|" "$srcdir"/dotnet.sh.in > "$subpkgdir"/etc/profile.d/dotnet.sh +} + +hostfxr() { + pkgdesc="The .NET host resolver contains the logic to resolve and select the right version of the .NET SDK or runtime to use." + depends="dotnet-host" + provides="dotnet-hostfxr-$_pkgver_macro=$pkgver-r$pkgrel" + + install -dm 755 "$subpkgdir"/$_libdir/dotnet + + tar --use-compress-program="pigz" \ + -xf "$builddir"/artifacts/$_dotnet_arch/Release/dotnet-sdk-$_pkgver_macro*.tar.gz \ + -C "$subpkgdir"/$_libdir/dotnet/ \ + --no-same-owner \ + ./host + + # some files either should or should not have executable bits + _fix_executable "$subpkgdir" +} + +aspnetcore_runtime() { + pkgdesc="The ASP.NET $_pkgver_macro Core runtime" + depends="dotnet$_pkgver_name-runtime" + provides="aspnetcore-runtime-$_pkgver_macro=$pkgver-r$pkgrel" + + install -dm 755 "$subpkgdir"/$_libdir/dotnet + + tar --use-compress-program="pigz" \ + -xf "$builddir"/artifacts/$_dotnet_arch/Release/dotnet-sdk-$_pkgver_macro*.tar.gz \ + -C "$subpkgdir"/$_libdir/dotnet/ \ + --no-same-owner \ + ./shared/Microsoft.AspNetCore.App + + # some files either should or should not have executable bits + _fix_executable "$subpkgdir" +} + +aspnetcore_dbg() { + pkgdesc="The ASP.NET $_pkgver_macro Core runtime - pdb debug files" + depends="aspnetcore$_pkgver_name-runtime" + provides="aspnetcore-runtime-dbg-$_pkgver_macro=$pkgver-r$pkgrel" + + install -dm 755 "$subpkgdir"/$_libdir/dotnet + + tar --use-compress-program="pigz" \ + -xf "$builddir"/artifacts/$_dotnet_arch/Release/dotnet-symbols-sdk-$_pkgver_macro*.tar.gz \ + -C "$subpkgdir"/$_libdir/dotnet/ \ + --no-same-owner \ + shared/Microsoft.AspNetCore.App +} + +apphost_pack() { + pkgdesc="The .NET $_pkgver_macro Core apphost pack" + provides="dotnet-apphost-pack-$_pkgver_macro=$pkgver-r$pkgrel" + + install -dm 755 "$subpkgdir"/$_libdir/dotnet + + tar --use-compress-program="pigz" \ + -xf "$builddir"/artifacts/$_dotnet_arch/Release/dotnet-sdk-$_pkgver_macro*.tar.gz \ + -C "$subpkgdir"/$_libdir/dotnet/ \ + --no-same-owner \ + --wildcards \ + './packs/Microsoft.NETCore.App.Host.*' + + # some files either should or should not have executable bits + _fix_executable "$subpkgdir" +} + +targeting_pack() { + pkgdesc="The .NET $_pkgver_macro Core targeting pack" + provides="dotnet-targeting-pack-$_pkgver_macro=$pkgver-r$pkgrel" + + install -dm 755 "$subpkgdir"/$_libdir/dotnet + + tar --use-compress-program="pigz" \ + -xf "$builddir"/artifacts/$_dotnet_arch/Release/dotnet-sdk-$_pkgver_macro*.tar.gz \ + -C "$subpkgdir"/$_libdir/dotnet/ \ + --no-same-owner \ + ./packs/Microsoft.NETCore.App.Ref + + # some files either should or should not have executable bits + _fix_executable "$subpkgdir" +} + +aspnetcore_targeting_pack() { + pkgdesc="The ASP.NET $_pkgver_macro Core targeting pack" + provides="aspnetcore-targeting-pack-$_pkgver_macro=$pkgver-r$pkgrel" + + install -dm 755 "$subpkgdir"/$_libdir/dotnet + + tar --use-compress-program="pigz" \ + -xf "$builddir"/artifacts/$_dotnet_arch/Release/dotnet-sdk-$_pkgver_macro*.tar.gz \ + -C "$subpkgdir"/$_libdir/dotnet/ \ + --no-same-owner \ + ./packs/Microsoft.AspNetCore.App.Ref + + # some files either should or should not have executable bits + _fix_executable "$subpkgdir" } sha512sums=" -ff554ad65e09b5dbce2bc617a6ed548081a2078b23f04ef7812309fe98e21303d0a090118a283cf5123c4a28690e63e3f151b364c56f8ee1e56ae6e63a4f50bc dotnet-v7.0.114.tar.xz -e9f3df13d093fac214778c1137857e065f58d4e0d2a48d540d8ed7bb41e2fd73b2b3f62a0aa5b0e80fa80a5b58ba77ff19b9d10a492802f8539e3a6ed79d299d dotnet-testsuite-e1cc0f181ffd4d755756d30d985513897d592ba4.tar.gz -0028d5d97b814b122d73137b4e0d64ca5d788aa0ae5fde500de722e23522827f2538f06e75acb17cc39b8917961ee78d1f0bbc84b2b624ae0e9bf88adca2ba6f dotnet-bunny-v12.tar.gz -429033f5f6a8e33eb849c29c1d6628faca13751e1b1e536179b491041034dcdee107cbff12f7e9f1ef68a178a0818c534113f63bc8bbc37de67ec900c23cacf4 build_disable-package-validation.patch -ebab0364deab5d99131e2724b7fbac668bc27ddf74958623af1913e49850df98b2d077d27324b2bbabbbcdf77ea48bf7a7ca83d0ced6f48bdb66cc1e8bbce4a4 build_disable-source-link.patch -86fbaa058f78bba100f534f4c4bd6d7254181909f70d264c0390d3dd89c878a14ba9b5d2de05271b2c07b73ead70e029488c926221f676d59e27e387e3e579e9 build_enable-timestamps.patch -4ac92d2d9190a55ee20d3e145a28a6953c98d3eb838c8acfb808b8839316443cb64da4a2c5787df0171fce7ef96ff6381043085ed90c23ec09ce9ac81571e675 roslyn-analyzer_disable-apphost.patch -b56d5053831c43b8fed48894735b9910020abbae62b2b57bc9a423cd5ef09f412025e56dd9ce1994f551b87155d682796203fd351ca7fb8a29658078a6d4b029 runtime_76500-mono-musl-support.patch +094265462d66d97b51ebfbe5fb06d4a679b97881f1f5a07a87a282a96eeaabfe97ca42061d59aac71dd8861c07f07dda16a72e29ae03167407e51d3fd2767562 dotnet-tarball-v8.0.0.tar.gz +55f2c56f7fbed4137ebe5e81c7b86d199d7ff91c6e19fbc9a4af8cd5d0f0195273356ead8b80aedfff56a3d704a541a7c2a7395bec3fa5d6585f3afd056b1220 dotnet-release-v8.0.0.json +8fe41ddd03c1b98dc9eec5e337ca0dcc8fbeff65b67ac1a383bd7d1e5fd3c21b820dacd498d1c2268445bb634cfb9dba3e8924e71a98f2ccd8221b17fb079044 dotnet-testsuite-d3d39e7c404c6e45c3e7ab6621c5f6cabf1540b0.tar.gz +7f59b10878aa90a6953ee4d88d08fa932910a24018dace92b173ee87c847d14734f93dc5fc031982a3d0a5cb4ac223b83d0e548531c23c4e3326dc83510989a9 dotnet-bunny-v15.tar.gz +c3f31956976b77198e72a3fef3427338b6b2961f8c121416040c1105de0ce8073e46f4c2e9ef22a001aee69cbe39621c2ddac988522693110071dfae42f2e2b7 dotnet.sh.in +ad7373a112acc07a6a7bbc522d417b26d90b3e3ae9c1e66a6cc70af16af7e7111d9764e7758062d0a5e67f026cc44f2b111051c3d484bd56917f2144db88588b aspnetcore_portable-build-workaround.patch +e5b9b947226456844f705e66f3f19d4519ce88f360e3f3413999c2867c31d9008db78f5806bfee7185d7548c6279ef6492a40ff24c20ed9d58b6ef66b167d7a8 aspire_fix-gitinfo-target.patch +eed7a7481a967f6938de956a6df485efa6dd61bf36ae4a768493cb1f7da0296dc91e0f2f89f7c302083ba9cf0c778e28228ec1b52e902077a00072d7d9957ef3 build_enable-timestamps.patch +ab362bdbbea8d8116b6bf7bf58e330ce6d7d171b42613ac03514f76afa2574b75d6566148d1b72047fbfe61b40ac67b3f2d8af87a7074c790bf882a5b7e73960 installer_hard-dereference-tar-gz.patch +097db705c787501782a1b203e8c453453075dfcadc4f5282849c6ffdda4d7832f75c56089bced4542cc83704fe33842cc725084dac2ba261cacdaf54ae468b3c roslyn-analyzer_disable-apphost.patch d732df247c721c9f677baabdd7f36dbf4b564814ff64164361065bb1c196b767494a1d39f634eadf01a23032c7b3e64102614b7213065c81096bbf3f8022e6a0 runtime_82269-mono-thread-coop-undefine-fortify-source.patch -1f7be536c4826638853f110ee88bbd554be015cc88c6491c1066830789be18ad324f8ed2b1b75ed7aad74457dcafc812730059cb25d36d6344bfae8a517c00c4 runtime_enable-runtime-marshalling.diff -293742ab307bef459a21deadcc4ad7c7996cc4b490910a36c2763b8ad25cc8a91c4e03b6290567cd1030f69638d0156c5b6970887858fb091f8482b67356065d runtime_enable-system-libunwind.diff -d972e77df27748a80c9b23eca12f9fbd78be97f9034b79cc5703ba58eb6750171d9a115314300f883620ccbca89c65a99ca7a45d54a421b028b590190b4bed80 runtime_remove-usage-of-off64-t.patch -d1b4ebcbb1a6815fc0ce4c471485c232618e60968a879309fb8336821a9351d2e0028d9f7726c0c041c750b497a0baa47400c78c9ceff550b91b4a6c2816fc41 sdk_14239-add-zsh-compdef-completion-script.patch +3354fa721809f1b94c579408ee78004ff3ca2ba79212c1a0ecc424a9955bb5d5a80c115d4c30dd257526f356ea76f0562db6f83d8dd0b6135f8c689886b3348d runtime_90251-rename-mono-cmake-host-var.patch +39e1b848d1ae81e4b81758522de7d3e36b11d2ab626565efb8e4cceae8da29018277709f0af8fcfa75be8da79f8d6432eb6aac49a5e82510c3aca34632df4d8e runtime_enable-system-libunwind.diff +887112eb2b103eadd6887529ebae7f9a75df2c2cb168e84fd40cc09f9bcd20917d428bbba06968b07b0a463890da82b1b2b1d033a3dd016e6494067464ae6f74 runtime_more-clang-16-suppression.patch +0c25319125ef5b0ad490b37a643c0c5257c796d5ed24f9ac404f698710b07de790bcbb0b6336d4a50025b94c3bff99b214951bd8f0a79a8d6f543ebaa300740f runtime_remove-usage-of-off64-t.patch +5c74abbd7ea71ba6164f71b866c9da564db9ccd95f1a9a8b82f5b0b599fab6d59d64ba1157ec13d7ac36d23145f3d9de2189ed6c40f56e46555ab378c161948b vstest_intent-net8.0.patch " diff --git a/community/dotnet7-build/README.md b/community/dotnet7-build/README.md index 4c2c6df..14cde12 100644 --- a/community/dotnet7-build/README.md +++ b/community/dotnet7-build/README.md @@ -1,22 +1,23 @@ -# dotnet7-build +# dotnet8-runtime -This is the .NET 7.0 package for Alpine Linux. +This is the .NET 8.0 package for Alpine Linux. Please report any issues [using Gitlab](https://gitlab.alpinelinux.org/alpine/aports/-/issues/new) and tag @ayakael # Building info ## Generated packages -* `dotnet7-build` (aimed for internal use as bootstrap) -* `dotnet7-build-artifacts` (aimed for internal use as bootstrap) -* `dotnet7-sdk` -* `dotnet7-templates` (required by sdk) -* `dotnet-zsh-completion` -* `dotnet-bash-completion` -* `dotnet-doc` -* `netstandard21-targeting-pack` +* `aspnetcore8-runtime` +* `aspnetcore8-targeting-pack` +* `dotnet8-apphost-pack` (used by dotnet8-runtime) +* `dotnet8-hostfxr` (used by dotnet-host) +* `dotnet8-runtime` +* `dotnet8-runtime-artifacts` (aimed for internal use as bootstrap) +* `dotnet8-runtime-bootstrap` (aimed for internal use as bootstrap) +* `dotnet8-targeting-pack` +* `dotnet-host` -## How to build dotnet7 on Alpine +## How to build dotnet8 on Alpine As dotnet is a self-hosting compiler (thus it compiles using itself), it requires a bootstrap for the initial build. To solve this problem, this package follows the `stage0` proposal outlined [here](https://lists.alpinelinux.org/~alpine/devel/%3C33KG0XO61I4IL.2Z7RTAZ5J3SY6%408pit.net%3E) @@ -27,17 +28,20 @@ builds bootstraps for Alpine on `x86_64`, `aarch64`, and `armv7`. Thus, `stage0` has also been designed to be crossbuild aware, allowing bootstrapping to other platforms. -In summary, dotnet7 is built using three different aports. +In summary, dotnet8 is built using three different aports. -* `community/dotnet7-stage0` -Builds minimum components for full build of dotnet7, and packages these in an initial -`dotnet7-stage0-bootstrap` package that `dotnet7-build` pulls. -* `community/dotnet7-build` -Builds full and packages dotnet7 fully using either stage0 or previoulsy built -dotnet7 build. -* `community/dotnet7-runtime` +* `community/dotnet8-stage0` +Builds minimum components for full build of dotnet8, and packages these in an initial +`dotnet8-stage0-bootstrap` package that `dotnet8-runtime` pulls. +* `community/dotnet8-runtime` +Builds full and packages dotnet8 fully using either stage0 or previoulsy built +dotnet8 build. +* `community/dotnet8-sdk` As abuild does not allow different versions for subpackages, a different aport -is required to package runtime bits from dotnet7-build. +is required to package sdk bits from dotnet8-runtime. dotnet8-runtime only +builds 8.0.1xx feature branch of SDK. Thus, when a new feature branch of sdk is +released, the updated components are to be built on dotnet8-sdk rather than +simply repackaging dotnet8-runtime artifacts. ## Crossbuilding with `stage0` Crossbuilding `stage0` is a three step process: @@ -49,7 +53,7 @@ Crossbuilding `stage0` is a three step process: `$HOME/sysroot-$CTARGET_ARCH/etc/apk/repositories`, making sure to add required keys. This makes it so that whatever package is not built in step 1 will be pulled from package repos -3. Crossbuild `dotnet7-stage0` via: +3. Crossbuild `dotnet8-stage0` via: ``` CHOST=$CTARGET_ARCH abuild -r ``` @@ -58,7 +62,7 @@ CHOST=$CTARGET_ARCH abuild -r This package follows [package naming and contents suggested by upstream](https://docs.microsoft.com/en-us/dotnet/core/build/distribution-packaging), with two exceptions. It installs dotnet to `/usr/lib/dotnet` (aka `$_libdir`). -In addition, the package is named `dotnet7` as opposed to `dotnet-7.0` +In addition, the package is named `dotnet8` as opposed to `dotnet-8.0` to match Alpine Linux naming conventions for packages with many installable versions # Contributing @@ -74,7 +78,7 @@ follow. 2. Checkout the forked repository. - `git clone ssh://git@gitlab.alpinelinux.org/$USER/aports` - - `cd community/dotnet7-build` + - `cd community/dotnet8-runtime` 3. Make your changes. Don't forget to add a changelog. @@ -86,15 +90,15 @@ follow. 6. Commit the changes to the git repo in a git branch - - `git checkout -b dotnet7/` + - `git checkout -b dotnet8/` - `git add` any new patches - `git remove` any now-unnecessary patches - - `git commit -m 'community/dotnet7-build: descriptive description'` + - `git commit -m 'community/dotnet8-runtime: descriptive description'` - `git push` 7. Create a merge request with your changes, tagging @ayakael for review. -8. Once the tests in the merge-request pass, and reviewers are happy, your changes +8. Once the tests in the pull-request pass, and reviewers are happy, your changes will be merged. ## Updating to an new upstream release @@ -104,7 +108,7 @@ follow. 2. Checkout the forked repository. - `git clone ssh://git@gitlab.alpinelinux.org/$USER/aports` - - `cd community/dotnet7-build` + - `cd community/dotnet8-runtime` 3. Build the new upstream source tarball. Update the versions in the @@ -125,15 +129,15 @@ follow. 7. Commit the changes to the git repo in a git branch. - - `git checkout -b dotnet7/` + - `git checkout -b dotnet8/` - `git add` any new patches - `git remove` any now-unnecessary patches - - `git commit -m 'community/dotnet7-build: upgrade to ` + - `git commit -m 'community/dotnet8-runtime: upgrade to ` - `git push` 8. Create a merge request with your changes, tagging @ayakael for review. -9. Once the tests in the merge-request pass, and reviewers are happy, your changes +9. Once the tests in the pull-request pass, and reviewers are happy, your changes will be merged. # Testing diff --git a/community/dotnet7-build/aspire_fix-gitinfo-target.patch b/community/dotnet7-build/aspire_fix-gitinfo-target.patch new file mode 100644 index 0000000..7066d02 --- /dev/null +++ b/community/dotnet7-build/aspire_fix-gitinfo-target.patch @@ -0,0 +1,20 @@ +diff --git a/src/aspire/Directory.Build.targets.orig b/src/aspire/Directory.Build.targets +index 511adb03a5d..d62a050caab 100644 +--- a/src/aspire/Directory.Build.targets.orig ++++ b/src/aspire/Directory.Build.targets +@@ -6,13 +6,12 @@ + README.md + + +- +- ++ + + + + + + +- ++ + diff --git a/community/dotnet7-build/aspnetcore_portable-build-workaround.patch b/community/dotnet7-build/aspnetcore_portable-build-workaround.patch new file mode 100644 index 0000000..43f2ce0 --- /dev/null +++ b/community/dotnet7-build/aspnetcore_portable-build-workaround.patch @@ -0,0 +1,43 @@ +From 451aa3e9544b0214d0e8e844c27af3847f5bf391 Mon Sep 17 00:00:00 2001 +Patch-Source: https://github.com/dotnet/installer/pull/13410 +From: Antoine Martin +Date: Fri, 18 Feb 2022 05:14:39 +0000 +Subject: [PATCH 1/1] musl build fix + +Line causes build of aspnetcore on arm to look for linux version of +CrossGen2 rather than linux-musl. This removes the line so that +BuildOsName is pulled from TargetOsName as expected + +This is now only necessary for portable +builds, as https://github.com/dotnet/installer/pull/14549 has fixed +issues relating to musl build on full source-build + +--- + .../App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/aspnetcore/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj.orig b/src/aspnetcore/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +index 77dce00..b31b36d 100644 +--- a/src/aspnetcore/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj.orig ++++ b/src/aspnetcore/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +@@ -103,8 +103,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant + Special case the crossgen2 package reference on Windows to avoid the x86 package when building in Visual Studio. + --> + $(TargetOsName) +- linux + $(TargetRuntimeIdentifier.Substring(0,$(TargetRuntimeIdentifier.IndexOf('-')))) + x64 + $(BuildArchitecture) + PkgMicrosoft_NETCore_App_Crossgen2_$(BuildOsName.Replace('.', '_'))-$(Crossgen2BuildArchitecture) +diff --git a/repo-projects/aspnetcore.proj.orig b/repo-projects/aspnetcore.proj +index 289b506..fadcc0d 100644 +--- a/repo-projects/aspnetcore.proj.orig ++++ b/repo-projects/aspnetcore.proj +@@ -13,6 +13,7 @@ + $(StandardSourceBuildArgs.Replace('--publish', '')) + + $(BuildCommandArgs) --arch $(Platform) ++ $(BuildCommandArgs) --os-name linux-musl + $(BuildCommandArgs) --no-build-repo-tasks + $(BuildCommandArgs) --no-build-nodejs + $(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltAspNetCoreRuntime) diff --git a/community/dotnet7-build/build_disable-package-validation.patch b/community/dotnet7-build/build_disable-package-validation.patch deleted file mode 100644 index 3200c67..0000000 --- a/community/dotnet7-build/build_disable-package-validation.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/repos/aspnetcore.proj.orig b/repos/aspnetcore.proj -index cea712c1bfa..cf5099da788 100644 ---- a/repos/aspnetcore.proj.orig -+++ b/repos/aspnetcore.proj -@@ -10,6 +10,7 @@ - $(BuildCommandArgs) --no-build-nodejs - $(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltAspNetCoreRuntime) - $(BuildCommandArgs) /p:PortableBuild=false /p:TargetRuntimeIdentifier=$(TargetRid) -+ $(BuildCommandArgs) /p:EnablePackageValidation=false - - $(BuildCommandArgs) /p:MicrosoftNetFrameworkReferenceAssembliesVersion=1.0.0 diff --git a/community/dotnet7-build/build_disable-source-link.patch b/community/dotnet7-build/build_disable-source-link.patch deleted file mode 100644 index acf8132..0000000 --- a/community/dotnet7-build/build_disable-source-link.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 98054ea87ce70247bb09ceafd2ad1a0b36d2fef4 Mon Sep 17 00:00:00 2001 -From: Antoine Martin -Date: Sat, 1 Oct 2022 09:21:58 -0400 -Subject: [PATCH] Disable source link - -Addresses undiagnosed "Source control information is not available" error - ---- -diff --git a/repos/installer.proj b/repos/installer.proj -index 3a9756a27b7..4968184b14e 100644 ---- a/repos/installer.proj -+++ b/repos/installer.proj -@@ -26,6 +26,7 @@ - --> - $(BuildCommandArgs) /p:NETCoreAppMaximumVersion=99.9 - $(BuildCommandArgs) /p:OSName=$(OSNameOverride) -+ $(BuildCommandArgs) /p:EnableSourceLink=false - $(BuildCommandArgs) /p:PortableOSName=$(PortableOS) - $(BuildCommandArgs) /p:Rid=$(TargetRid) - $(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir) diff --git a/community/dotnet7-build/build_enable-timestamps.patch b/community/dotnet7-build/build_enable-timestamps.patch index 98c7a50..5977a41 100644 --- a/community/dotnet7-build/build_enable-timestamps.patch +++ b/community/dotnet7-build/build_enable-timestamps.patch @@ -1,7 +1,7 @@ -diff --git a/repos/Directory.Build.props b/repos/Directory.Build.props +diff --git a/repo-projects/Directory.Build.props b/repo-projects/Directory.Build.props index b70a3161fef..d57f9393299 100644 ---- a/repos/Directory.Build.props -+++ b/repos/Directory.Build.props +--- a/repo-projects/Directory.Build.props ++++ b/repo-projects/Directory.Build.props @@ -134,6 +134,7 @@ $(StandardSourceBuildArgs) $(FlagParameterPrefix)pack $(StandardSourceBuildArgs) $(FlagParameterPrefix)publish diff --git a/community/dotnet7-build/dotnet.sh.in b/community/dotnet7-build/dotnet.sh.in new file mode 100644 index 0000000..f85eb29 --- /dev/null +++ b/community/dotnet7-build/dotnet.sh.in @@ -0,0 +1,12 @@ +# Set location for AppHost lookup +[ -z "$DOTNET_ROOT" ] && export DOTNET_ROOT=%LIBDIR% + +# Add dotnet tools directory to PATH +DOTNET_TOOLS_PATH="$HOME/.dotnet/tools" +case "$PATH" in + *"$DOTNET_TOOLS_PATH"* ) true ;; + * ) PATH="$PATH:$DOTNET_TOOLS_PATH" ;; +esac + +# Extract self-contained executables under HOME to avoid multi-user issues from using the default '/var/tmp' +[ -z "$DOTNET_BUNDLE_EXTRACT_BASE_DIR" ] && export DOTNET_BUNDLE_EXTRACT_BASE_DIR="${XDG_CACHE_HOME:-"$HOME"/.cache}/dotnet_bundle_extract" diff --git a/community/dotnet7-build/installer_hard-dereference-tar-gz.patch b/community/dotnet7-build/installer_hard-dereference-tar-gz.patch new file mode 100644 index 0000000..4f92e2c --- /dev/null +++ b/community/dotnet7-build/installer_hard-dereference-tar-gz.patch @@ -0,0 +1,13 @@ +diff --git a/src/installer/src/core-sdk-tasks/TarGzFileCreateFromDirectory.cs.orig b/src/installer/src/core-sdk-tasks/TarGzFileCreateFromDirectory.cs +index 06b9857..066d595 100644 +--- a/src/installer/src/core-sdk-tasks/TarGzFileCreateFromDirectory.cs.orig ++++ b/src/installer/src/core-sdk-tasks/TarGzFileCreateFromDirectory.cs +@@ -131,7 +131,7 @@ private string GetSourceSpecification() + + private string GetDestinationArchive() + { +- return $"-czf {DestinationArchive}"; ++ return $"--hard-dereference -czf {DestinationArchive}"; + } + + private string GetExcludes() diff --git a/community/dotnet7-build/installer_set-crossgen2rid-using-buildarchitecture.patch b/community/dotnet7-build/installer_set-crossgen2rid-using-buildarchitecture.patch new file mode 100644 index 0000000..309e092 --- /dev/null +++ b/community/dotnet7-build/installer_set-crossgen2rid-using-buildarchitecture.patch @@ -0,0 +1,13 @@ +diff --git a/src/installer/src/redist/targets/GenerateLayout.targets.orig b/src/installer/src/redist/targets/GenerateLayout.targets +index a27834f..0c899d4 100644 +--- a/src/installer/src/redist/targets/GenerateLayout.targets.orig ++++ b/src/installer/src/redist/targets/GenerateLayout.targets +@@ -85,7 +85,7 @@ + windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) + + $(HostOSName)-$(BuildArchitecture) +- $(SharedFrameworkRid) ++ $(SharedFrameworkRid.SubString(0, $(SharedFrameworkRid.LastIndexOf('-'))))-$(BuildArchitecture) + + $(SharedFrameworkRid) + linux-x64 diff --git a/community/dotnet7-build/roslyn-analyzer_disable-apphost.patch b/community/dotnet7-build/roslyn-analyzer_disable-apphost.patch index 7ebf967..6d5d57c 100644 --- a/community/dotnet7-build/roslyn-analyzer_disable-apphost.patch +++ b/community/dotnet7-build/roslyn-analyzer_disable-apphost.patch @@ -7,19 +7,19 @@ Roslyn-analyzer can't seem to find apphost produced by runtime build on ppc64le This disables its use as it isn't necessary --- -diff --git a/src/roslyn-analyzers/src/PerformanceTests/Tests/PerformanceTests.csproj b/src/roslyn-analyzers/src/PerformanceTests/Tests/PerformanceTests.csproj -index 044a2aba46..3d37e147b3 100644 ---- a/src/roslyn-analyzers/src/PerformanceTests/Tests/PerformanceTests.csproj +diff --git a/src/roslyn-analyzers/src/PerformanceTests/Tests/PerformanceTests.csproj.orig b/src/roslyn-analyzers/src/PerformanceTests/Tests/PerformanceTests.csproj +index 7b454a4..bbe18ae 100644 +--- a/src/roslyn-analyzers/src/PerformanceTests/Tests/PerformanceTests.csproj.orig +++ b/src/roslyn-analyzers/src/PerformanceTests/Tests/PerformanceTests.csproj -@@ -15,6 +15,7 @@ - Release +@@ -16,6 +16,7 @@ false true + $(MicrosoftCodeAnalysisVersionForTests) + false -@@ -27,4 +28,4 @@ +@@ -28,4 +29,4 @@ diff --git a/community/dotnet7-build/runtime_76500-mono-musl-support.patch b/community/dotnet7-build/runtime_76500-mono-musl-support.patch deleted file mode 100644 index f9d2630..0000000 --- a/community/dotnet7-build/runtime_76500-mono-musl-support.patch +++ /dev/null @@ -1,325 +0,0 @@ -From 98054ea87ce70247bb09ceafd2ad1a0b36d2fef4 Mon Sep 17 00:00:00 2001 -Patch-Source: https://github.com/dotnet/runtime/pull/76500 -From: Antoine Martin -Date: Sat, 1 Oct 2022 09:21:58 -0400 -Subject: [PATCH] Mono musl support - ---- - Directory.Build.props | 1 + - eng/common/cross/toolchain.cmake | 38 +++++++++++++++++++----- - eng/native/configurecompiler.cmake | 7 +++++ - eng/native/tryrun.cmake | 6 +++- - src/coreclr/pal/src/CMakeLists.txt | 5 ++++ - src/coreclr/pal/src/misc/perfjitdump.cpp | 2 +- - src/coreclr/vm/i386/cgenx86.cpp | 4 +++ - src/mono/CMakeLists.txt | 33 ++++++++++++++++++++ - src/mono/mono.proj | 32 +++++++++++++------- - src/mono/mono/mini/mini-runtime.c | 29 ++++++++++++++++++ - src/mono/mono/utils/mono-context.h | 8 +++++ - 11 files changed, 146 insertions(+), 19 deletions(-) - -diff --git a/src/runtime/Directory.Build.props b/src/runtime/Directory.Build.props -index 6f9b97c0a9c..4298a6df1d3 100644 ---- a/src/runtime/Directory.Build.props -+++ b/src/runtime/Directory.Build.props -@@ -22,7 +22,6 @@ - $(_hostOS) - true - true -- true - - - -@@ -154,7 +154,7 @@ - <_runtimeOS Condition="'$(TargetsMobile)' == 'true'">$(TargetOS.ToLowerInvariant()) - - <_portableOS>linux -- <_portableOS Condition="'$(_runtimeOS)' == 'linux-musl'">linux-musl -+ <_portableOS Condition="'$(_runtimeOS)' == 'linux-musl' or $(_runtimeOS.StartsWith('alpine'))">linux-musl - <_portableOS Condition="'$(_runtimeOS)' == 'linux-bionic'">linux-bionic - <_portableOS Condition="'$(_hostOS)' == 'OSX'">osx - <_portableOS Condition="'$(_runtimeOS)' == 'win' or '$(TargetOS)' == 'windows'">win - -@@ -200,6 +199,9 @@ - - $(PackageRID) - $(_portableOS)-$(TargetArchitecture) -+ -+ true -+ true - - - -diff --git a/src/runtime/eng/native/tryrun.cmake b/src/runtime/eng/native/tryrun.cmake -index 6355b0988f7..056c6606b17 100644 ---- a/src/runtime/eng/native/tryrun.cmake -+++ b/src/runtime/eng/native/tryrun.cmake -@@ -8,7 +8,11 @@ endmacro() - - if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv7-alpine-linux-musleabihf OR - EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf OR -- EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/aarch64-alpine-linux-musl) -+ EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/aarch64-alpine-linux-musl OR -+ EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/s390x-alpine-linux-musl OR -+ EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/ppc64le-alpine-linux-musl OR -+ EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl OR -+ EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/riscv64-alpine-linux-musl) - - set(ALPINE_LINUX 1) - elseif(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version) -diff --git a/src/runtime/src/coreclr/pal/src/CMakeLists.txt b/src/runtime/src/coreclr/pal/src/CMakeLists.txt -index d9726460ccf..c28563f8619 100644 ---- a/src/runtime/src/coreclr/pal/src/CMakeLists.txt -+++ b/src/runtime/src/coreclr/pal/src/CMakeLists.txt -@@ -315,6 +315,11 @@ if(CLR_CMAKE_TARGET_LINUX) - target_link_libraries(coreclrpal ${UNWIND_LIBS}) - endif(CLR_CMAKE_USE_SYSTEM_LIBUNWIND) - -+ # bundled libunwind requires using libucontext on alpine and x86 and ppc64le -+ if(CLR_CMAKE_TARGET_ALPINE_LINUX AND (CLR_CMAKE_TARGET_ARCH_I386 OR CLR_CMAKE_TARGET_ARCH_POWERPC64)) -+ target_link_libraries(coreclrpal ucontext) -+ endif(CLR_CMAKE_TARGET_ALPINE_LINUX AND (CLR_CMAKE_TARGET_ARCH_I386 OR CLR_CMAKE_TARGET_ARCH_POWERPC64)) -+ - endif(CLR_CMAKE_TARGET_LINUX) - - if(CLR_CMAKE_TARGET_NETBSD) -diff --git a/src/runtime/src/coreclr/pal/src/misc/perfjitdump.cpp b/src/runtime/src/coreclr/pal/src/misc/perfjitdump.cpp -index 8d7f79ed3f0..043939ad2da 100644 ---- a/src/runtime/src/coreclr/pal/src/misc/perfjitdump.cpp -+++ b/src/runtime/src/coreclr/pal/src/misc/perfjitdump.cpp -@@ -25,7 +25,7 @@ - #include - #include - #include --#include -+#include - - #include "../inc/llvm/ELF.h" - -diff --git a/src/runtime/src/coreclr/vm/i386/cgenx86.cpp b/src/runtime/src/coreclr/vm/i386/cgenx86.cpp -index 811c84a140d..4e958a44b30 100644 ---- a/src/runtime/src/coreclr/vm/i386/cgenx86.cpp -+++ b/src/runtime/src/coreclr/vm/i386/cgenx86.cpp -@@ -1133,6 +1133,7 @@ extern "C" DWORD __stdcall avx512StateSupport() - - #else // !TARGET_UNIX - -+#if !__has_builtin(__cpuid) - void __cpuid(int cpuInfo[4], int function_id) - { - // Based on the Clang implementation provided in cpuid.h: -@@ -1143,7 +1144,9 @@ void __cpuid(int cpuInfo[4], int function_id) - : "0"(function_id) - ); - } -+#endif - -+#if !__has_builtin(__cpuidex) - void __cpuidex(int cpuInfo[4], int function_id, int subFunction_id) - { - // Based on the Clang implementation provided in cpuid.h: -@@ -1154,6 +1157,7 @@ void __cpuidex(int cpuInfo[4], int function_id, int subFunction_id) - : "0"(function_id), "2"(subFunction_id) - ); - } -+#endif - - extern "C" DWORD __stdcall xmmYmmStateSupport() - { -diff --git a/src/runtime/src/mono/CMakeLists.txt b/src/runtime/src/mono/CMakeLists.txt -index cdff32677c0..08a82cd7e83 100644 ---- a/src/runtime/src/mono/CMakeLists.txt -+++ b/src/runtime/src/mono/CMakeLists.txt -@@ -216,6 +216,35 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") - # Enable the "full RELRO" options (RELRO & BIND_NOW) at link time - add_link_options(-Wl,-z,relro) - add_link_options(-Wl,-z,now) -+ # Detect Linux ID -+ # TODO: Eventually merge with eng/native/configureplatform.cmake -+ set(LINUX_ID_FILE "/etc/os-release") -+ if(CMAKE_CROSSCOMPILING) -+ set(LINUX_ID_FILE "${CMAKE_SYSROOT}${LINUX_ID_FILE}") -+ endif() -+ -+ if(EXISTS ${LINUX_ID_FILE}) -+ execute_process( -+ COMMAND bash -c "source ${LINUX_ID_FILE} && echo \$ID" -+ OUTPUT_VARIABLE CLR_CMAKE_LINUX_ID -+ OUTPUT_STRIP_TRAILING_WHITESPACE) -+ -+ execute_process( -+ COMMAND bash -c "if strings \"${CMAKE_SYSROOT}/usr/bin/ldd\" 2>&1 | grep -q musl; then echo musl; fi" -+ OUTPUT_VARIABLE CLR_CMAKE_LINUX_MUSL -+ OUTPUT_STRIP_TRAILING_WHITESPACE) -+ endif() -+ -+ if(DEFINED CLR_CMAKE_LINUX_ID) -+ if(CLR_CMAKE_LINUX_ID STREQUAL alpine) -+ set(CLR_CMAKE_HOST_ALPINE_LINUX 1) -+ set(CLR_CMAKE_HOST_OS ${CLR_CMAKE_LINUX_ID}) -+ endif() -+ -+ if(CLR_CMAKE_LINUX_MUSL STREQUAL musl) -+ set(CLR_CMAKE_HOST_LINUX_MUSL 1) -+ endif() -+ endif(DEFINED CLR_CMAKE_LINUX_ID) - elseif(CMAKE_SYSTEM_NAME STREQUAL "Android") - set(HOST_LINUX 1) - add_definitions(-D_GNU_SOURCE -D_REENTRANT) -@@ -900,6 +929,11 @@ else() - set(DISABLE_DLLMAP 1) - endif() - -+if(CLR_CMAKE_HOST_ALPINE_LINUX) -+ # On Alpine Linux, we need to ensure that the reported stack range for the primary thread is -+ # larger than the initial committed stack size. -+ add_definitions(-DENSURE_PRIMARY_STACK_SIZE) -+endif() - if(TARGET_DARWIN) - check_c_compiler_flag(-fno-objc-msgsend-selector-stubs COMPILER_SUPPORTS_FNO_OBJC_MSGSEND_SELECTOR_STUBS) - if(COMPILER_SUPPORTS_FNO_OBJC_MSGSEND_SELECTOR_STUBS) -diff --git a/src/runtime/src/mono/mono.proj b/src/runtime/src/mono/mono.proj -index 59fea4a2f72..5bac7fdf1c6 100644 ---- a/src/runtime/src/mono/mono.proj -+++ b/src/runtime/src/mono/mono.proj -@@ -554,19 +560,21 @@ - darwin-x86_64 - windows-x86_64 - <_MonoRuntimeFilePath>$(MonoObjDir)out\lib\$(MonoFileName) -- <_LinuxAbi Condition="'$(TargetsAndroid)' != 'true' and '$(TargetsLinuxBionic)' != 'true'">gnu -- <_LinuxAbi Condition="'$(TargetsAndroid)' == 'true' or '$(TargetsLinuxBionic)' == 'true'">android -+ <_LinuxAbi Condition="'$(TargetsAndroid)' != 'true' and '$(TargetsLinuxBionic)' != 'true' and '$(TargetsLinuxMusl)' != 'true'">linux-gnu -+ <_LinuxAbi Condition="'$(TargetsAndroid)' != 'true' and '$(TargetsLinuxBionic)' != 'true' and '$(TargetsLinuxMusl)' == 'true'">alpine-linux-musl -+ <_LinuxAbi Condition="'$(TargetsAndroid)' == 'true' or '$(TargetsLinuxBionic)' == 'true'">linux-android - <_LinuxFloatAbi Condition="'$(TargetsAndroid)' != 'true' and '$(TargetsLinuxBionic)' != 'true'">hf - <_Objcopy>objcopy -- <_Objcopy Condition="'$(Platform)' == 'arm'">arm-linux-$(_LinuxAbi)eabi$(_LinuxFloatAbi)-$(_Objcopy) -- <_Objcopy Condition="'$(Platform)' == 'armv6'">arm-linux-$(_LinuxAbi)eabi$(_LinuxFloatAbi)-$(_Objcopy) -- <_Objcopy Condition="'$(Platform)' == 'arm64'">aarch64-linux-$(_LinuxAbi)-$(_Objcopy) -- <_Objcopy Condition="'$(Platform)' == 'riscv64'">riscv64-linux-$(_LinuxAbi)-$(_Objcopy) -- <_Objcopy Condition="'$(Platform)' == 's390x'">s390x-linux-$(_LinuxAbi)-$(_Objcopy) -- <_Objcopy Condition="'$(Platform)' == 'ppc64le'">powerpc64le-linux-$(_LinuxAbi)-$(_Objcopy) -- <_Objcopy Condition="'$(Platform)' == 'x64'">x86_64-linux-$(_LinuxAbi)-$(_Objcopy) -- <_Objcopy Condition="'$(Platform)' == 'x86'">i686-linux-$(_LinuxAbi)-$(_Objcopy) -+ <_Objcopy Condition="'$(Platform)' == 'arm'">arm-$(_LinuxAbi)eabi$(_LinuxFloatAbi)-$(_Objcopy) -+ <_Objcopy Condition="'$(Platform)' == 'armv6'">arm-$(_LinuxAbi)eabi$(_LinuxFloatAbi)-$(_Objcopy) -+ <_Objcopy Condition="'$(Platform)' == 'arm64'">aarch64-$(_LinuxAbi)-$(_Objcopy) -+ <_Objcopy Condition="'$(Platform)' == 'riscv64'">riscv64-$(_LinuxAbi)-$(_Objcopy) -+ <_Objcopy Condition="'$(Platform)' == 's390x'">s390x-$(_LinuxAbi)-$(_Objcopy) -+ <_Objcopy Condition="'$(Platform)' == 'ppc64le'">powerpc64le-$(_LinuxAbi)-$(_Objcopy) -+ <_Objcopy Condition="'$(Platform)' == 'x64'">x86_64-$(_LinuxAbi)-$(_Objcopy) -+ <_Objcopy Condition="'$(Platform)' == 'x86'">i686-$(_LinuxAbi)-$(_Objcopy) - <_Objcopy Condition="'$(TargetsAndroid)' == 'true' or '$(TargetsLinuxBionic)' == 'true'">$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/$(MonoToolchainPrebuiltOS)/bin/llvm-objcopy -+ <_Objcopy Condition="'$(TargetsLinuxMusl)' == 'true' and '$(CrossBuild)' != 'true'">objcopy - - <_ObjcopyPrefix Condition="'$(MonoCrossDir)' != '' and '$(Platform)' == 'riscv64'">llvm-objcopy- - -diff --git a/src/runtime/src/mono/mono/mini/CMakeLists.txt b/src/runtime/src/mono/mono/mini/CMakeLists.txt -index 30df4bac1f7..8698fd81206 100644 ---- a/src/runtime/src/mono/mono/mini/CMakeLists.txt -+++ b/src/runtime/src/mono/mono/mini/CMakeLists.txt -@@ -368,6 +368,11 @@ if(NOT DISABLE_SHARED_LIBS) - target_sources(monosgen-shared PRIVATE $) - set_target_properties(monosgen-shared PROPERTIES OUTPUT_NAME ${MONO_SHARED_LIB_NAME}) - target_link_libraries (monosgen-shared PRIVATE monoapi) -+ # Alpine Linux implements ucontext in a different library -+ if(CLR_CMAKE_HOST_ALPINE_LINUX AND TARGET_S390X) -+ target_link_libraries(monosgen-shared PRIVATE ucontext) -+ endif(CLR_CMAKE_HOST_ALPINE_LINUX AND TARGET_S390X) -+ - target_include_directories (monosgen-shared PRIVATE monoapi) - if(TARGET_WIN32) - # on Windows the import library for the shared mono library will have the same name as the static library, -@@ -527,6 +532,10 @@ if(NOT DISABLE_EXECUTABLES) - set_target_properties(mono-sgen PROPERTIES OUTPUT_NAME mono-aot-cross) - endif() - target_link_libraries(mono-sgen PRIVATE monoapi monosgen-static ${OS_LIBS} ${LLVM_LIBS} ${ICU_LIBS} ${Z_LIBS}) -+ # Alpine Linux implements ucontext in a different library -+ if(CLR_CMAKE_HOST_ALPINE_LINUX AND TARGET_S390X) -+ target_link_libraries(mono-sgen PRIVATE ucontext) -+ endif(CLR_CMAKE_HOST_ALPINE_LINUX AND TARGET_S390X) - if(NOT DISABLE_COMPONENTS AND STATIC_COMPONENTS AND NOT DISABLE_LINK_STATIC_COMPONENTS) - # if components are built statically, link them into runtime. - target_sources(mono-sgen PRIVATE "${mono-components-objects}") -diff --git a/src/runtime/src/mono/mono/mini/mini-runtime.c b/src/runtime/src/mono/mono/mini/mini-runtime.c -index c481f69adc8..4db6c9a0ae7 100644 ---- a/src/runtime/src/mono/mono/mini/mini-runtime.c -+++ b/src/runtime/src/mono/mono/mini/mini-runtime.c -@@ -4383,6 +4383,30 @@ mini_llvm_init (void) - #endif - } - -+#ifdef ENSURE_PRIMARY_STACK_SIZE -+/*++ -+ Function: -+ EnsureStackSize -+ -+ Abstract: -+ This fixes a problem on MUSL where the initial stack size reported by the -+ pthread_attr_getstack is about 128kB, but this limit is not fixed and -+ the stack can grow dynamically. The problem is that it makes the -+ functions ReflectionInvocation::[Try]EnsureSufficientExecutionStack -+ to fail for real life scenarios like e.g. compilation of corefx. -+ Since there is no real fixed limit for the stack, the code below -+ ensures moving the stack limit to a value that makes reasonable -+ real life scenarios work. -+ -+ --*/ -+static MONO_NO_OPTIMIZATION MONO_NEVER_INLINE void -+ensure_stack_size (size_t size) -+{ -+ volatile uint8_t *s = (uint8_t *)g_alloca(size); -+ *s = 0; -+} -+#endif // ENSURE_PRIMARY_STACK_SIZE -+ - void - mini_add_profiler_argument (const char *desc) - { -@@ -4544,6 +4568,11 @@ mini_init (const char *filename) - mono_w32handle_init (); - #endif - -+#ifdef ENSURE_PRIMARY_STACK_SIZE -+ // TODO: https://github.com/dotnet/runtime/issues/72920 -+ ensure_stack_size (5 * 1024 * 1024); -+#endif // ENSURE_PRIMARY_STACK_SIZE -+ - mono_thread_info_runtime_init (&ticallbacks); - - if (g_hasenv ("MONO_DEBUG")) { -diff --git a/src/runtime/src/mono/mono/utils/mono-context.h b/src/runtime/src/mono/mono/utils/mono-context.h -index a1f0fe6f68e..a9db2d336ca 100644 ---- a/src/runtime/src/mono/mono/utils/mono-context.h -+++ b/src/runtime/src/mono/mono/utils/mono-context.h -@@ -11,6 +11,14 @@ - #ifndef __MONO_MONO_CONTEXT_H__ - #define __MONO_MONO_CONTEXT_H__ - -+/* -+ * Handle non-gnu libc versions with nothing in features.h -+ * We have no idea what they're compatible with, so always fail. -+ */ -+#ifndef __GLIBC_PREREQ -+# define __GLIBC_PREREQ(x,y) 0 -+#endif -+ - #include "mono-compiler.h" - #include "mono-sigcontext.h" - #include "mono-machine.h" -diff --git a/src/runtime/src/native/libs/System.Native/pal_io.c b/src/runtime/src/native/libs/System.Native/pal_io.c -index 0929a0b49ec..86311e19507 100644 ---- a/src/runtime/src/native/libs/System.Native/pal_io.c -+++ b/src/runtime/src/native/libs/System.Native/pal_io.c -@@ -1267,7 +1267,7 @@ int32_t SystemNative_CopyFile(intptr_t sourceFd, intptr_t destinationFd, int64_t - // Try copying data using a copy-on-write clone. This shares storage between the files. - if (sourceLength != 0) - { -- while ((ret = ioctl(outFd, FICLONE, inFd)) < 0 && errno == EINTR); -+ while ((ret = ioctl(outFd, (int)FICLONE, inFd)) < 0 && errno == EINTR); - copied = ret == 0; - } - #endif --- -2.36.3 - diff --git a/community/dotnet7-build/runtime_83682-specify-notext-on-linux-musl-x86.patch b/community/dotnet7-build/runtime_83682-specify-notext-on-linux-musl-x86.patch index 7afbfa6..6dfefc0 100644 --- a/community/dotnet7-build/runtime_83682-specify-notext-on-linux-musl-x86.patch +++ b/community/dotnet7-build/runtime_83682-specify-notext-on-linux-musl-x86.patch @@ -7,18 +7,18 @@ Subject: [PATCH] Specify -z notext on linux-musl-x86 src/coreclr/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/src/runtime/src/coreclr/CMakeLists.txt.orig b/src/runtime/src/coreclr/CMakeLists.txt -index 7d1ce8d..5cacc78 100644 ---- a/src/runtime/src/coreclr/CMakeLists.txt.orig +diff --git a/src/runtime/src/coreclr/CMakeLists.txt b/src/runtime/src/coreclr/CMakeLists.txt +index 67b773bf78787..87d862a541ae6 100644 +--- a/src/runtime/src/coreclr/CMakeLists.txt +++ b/src/runtime/src/coreclr/CMakeLists.txt -@@ -105,6 +105,10 @@ if(CLR_CMAKE_HOST_UNIX) +@@ -109,6 +109,10 @@ if(CLR_CMAKE_HOST_UNIX) endif() endif() + if(CLR_CMAKE_TARGET_ALPINE_LINUX AND CLR_CMAKE_TARGET_ARCH_I386) -+ add_linker_flag(-Wl,-z,notext) ++ add_linker_flag(-Wl,-z,notext) + endif() + - add_subdirectory(pal) - add_subdirectory(hosts) - else() + if(NOT CLR_CMAKE_HOST_MACCATALYST AND NOT CLR_CMAKE_HOST_IOS AND NOT CLR_CMAKE_HOST_TVOS) + add_subdirectory(pal) + add_subdirectory(hosts) diff --git a/community/dotnet7-build/runtime_90251-rename-mono-cmake-host-var.patch b/community/dotnet7-build/runtime_90251-rename-mono-cmake-host-var.patch new file mode 100644 index 0000000..6a5fadd --- /dev/null +++ b/community/dotnet7-build/runtime_90251-rename-mono-cmake-host-var.patch @@ -0,0 +1,80 @@ +From 828269b7e68039f8bc0bdac66e2fd5c58b6d3471 Mon Sep 17 00:00:00 2001 +Patch-Source: https://github.com/dotnet/runtime/pull/90251 +From: Antoine Martin +Date: Wed, 9 Aug 2023 11:36:39 -0400 +Subject: [PATCH 1/1] Rename CMAKE var for mono on libc-musl + +--- + src/mono/CMakeLists.txt | 6 +++--- + src/mono/mono/mini/CMakeLists.txt | 12 ++++++------ + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/runtime/src/coreclr/pgosupport.cmake b/src/runtime/src/coreclr/pgosupport.cmake +index 719ac14ad99..34a42781ab2 100644 +--- a/src/runtime/src/coreclr/pgosupport.cmake ++++ b/src/runtime/src/coreclr/pgosupport.cmake +@@ -25,13 +25,13 @@ function(add_pgo TargetName) + target_compile_options(${TargetName} PRIVATE -flto -fprofile-instr-generate) + set_property(TARGET ${TargetName} APPEND_STRING PROPERTY LINK_FLAGS " -flto -fprofile-instr-generate") + if(CMAKE_CROSSCOMPILING AND CMAKE_C_COMPILER_ID MATCHES "Clang") +- if (CLR_CMAKE_HOST_ALPINE_LINUX) ++ if (CLR_CMAKE_TARGET_LINUX_MUSL) + set_property(TARGET ${TargetName} APPEND_STRING PROPERTY LINK_FLAGS " -resource-dir ${CMAKE_SYSROOT}/usr/lib/clang/${CMAKE_C_COMPILER_VERSION}") +- else(CLR_CMAKE_HOST_ALPINE_LINUX) ++ else(CLR_CMAKE_TARGET_LINUX_MUSL) + string(REPLACE "." ";" CLANG_VERSION "${CMAKE_C_COMPILER_VERSION}") + list(POP_FRONT CLANG_VERSION CLANG_VERSION_MAJOR) + set_property(TARGET ${TargetName} APPEND_STRING PROPERTY LINK_FLAGS " -resource-dir ${CMAKE_SYSROOT}/usr/lib/llvm-${CLANG_VERSION_MAJOR}/lib/clang/${CMAKE_C_COMPILER_VERSION}") +- endif(CLR_CMAKE_HOST_ALPINE_LINUX) ++ endif(CLR_CMAKE_TARGET_LINUX_MUSL) + endif(CMAKE_CROSSCOMPILING AND CMAKE_C_COMPILER_ID MATCHES "Clang") + if(NOT LD_LLVM) + set_property(TARGET ${TargetName} APPEND_STRING PROPERTY LINK_FLAGS " -fuse-ld=gold") +diff --git a/src/runtime/src/mono/CMakeLists.txt b/src/runtime/src/mono/CMakeLists.txt +index e04d9e9d364..00e54a25d69 100644 +--- a/src/runtime/src/mono/CMakeLists.txt ++++ b/src/runtime/src/mono/CMakeLists.txt +@@ -943,10 +943,10 @@ else() + set(DISABLE_DLLMAP 1) + endif() + +-if(CLR_CMAKE_HOST_ALPINE_LINUX) +- # Setting RLIMIT_NOFILE breaks debugging of coreclr on Alpine Linux for some reason ++if(CLR_CMAKE_TARGET_LINUX_MUSL) ++ # Setting RLIMIT_NOFILE breaks debugging of coreclr on musl-libc for some reason + add_definitions(-DDONT_SET_RLIMIT_NOFILE) +- # On Alpine Linux, we need to ensure that the reported stack range for the primary thread is ++ # On musl-libc, we need to ensure that the reported stack range for the primary thread is + # larger than the initial committed stack size. + add_definitions(-DENSURE_PRIMARY_STACK_SIZE) + endif() +diff --git a/src/runtime/src/mono/mono/mini/CMakeLists.txt.orig b/src/runtime/src/mono/mono/mini/CMakeLists.txt +index 5d6ef3d..c3e5414 100644 +--- a/src/runtime/src/mono/mono/mini/CMakeLists.txt.orig ++++ b/src/runtime/src/mono/mono/mini/CMakeLists.txt +@@ -400,9 +400,9 @@ if(NOT DISABLE_SHARED_LIBS) + endif() + target_compile_definitions(monosgen-shared PRIVATE -DMONO_DLL_EXPORT) + # Alpine Linux implements ucontext in a different library +- if(CLR_CMAKE_HOST_ALPINE_LINUX AND TARGET_S390X) ++ if(CLR_CMAKE_TARGET_LINUX_MUSL AND TARGET_S390X) + target_link_libraries(monosgen-shared PRIVATE ucontext) +- endif(CLR_CMAKE_HOST_ALPINE_LINUX AND TARGET_S390X) ++ endif(CLR_CMAKE_TARGET_LINUX_MUSL AND TARGET_S390X) + set_target_properties(monosgen-shared PROPERTIES OUTPUT_NAME ${MONO_SHARED_LIB_NAME}) + if(MONO_SET_RPATH_ORIGIN) + set_target_properties(monosgen-shared PROPERTIES INSTALL_RPATH "$ORIGIN") +@@ -601,10 +601,10 @@ if(NOT DISABLE_EXECUTABLES) + target_link_libraries(mono-sgen PRIVATE icu_shim_objects) + endif() + target_link_libraries(mono-sgen PRIVATE ${OS_LIBS} ${LLVM_LIBS} ${ICU_LIBS} ${Z_LIBS}) +- # Alpine Linux implements ucontext in a different library +- if(CLR_CMAKE_HOST_ALPINE_LINUX AND TARGET_S390X) ++ # musl-libc implements ucontext in a different library ++ if(CLR_CMAKE_TARGET_LINUX_MUSL AND TARGET_S390X) + target_link_libraries(mono-sgen PRIVATE ucontext) +- endif(CLR_CMAKE_HOST_ALPINE_LINUX AND TARGET_S390X) ++ endif(CLR_CMAKE_TARGET_LINUX_MUSL AND TARGET_S390X) + if(NOT DISABLE_COMPONENTS AND STATIC_COMPONENTS AND NOT DISABLE_LINK_STATIC_COMPONENTS) + # if components are built statically, link them into runtime. + target_sources(mono-sgen PRIVATE "${mono-components-objects}") diff --git a/community/dotnet7-build/runtime_enable-runtime-marshalling.diff b/community/dotnet7-build/runtime_enable-runtime-marshalling.diff deleted file mode 100644 index f609cfa..0000000 --- a/community/dotnet7-build/runtime_enable-runtime-marshalling.diff +++ /dev/null @@ -1,1807 +0,0 @@ -From 98054ea87ce70247bb09ceafd2ad1a0b36d2fef4 Mon Sep 17 00:00:00 2001 -Patch-Source: https://github.com/dotnet/runtime/issues/77364 -From: Antoine Martin -Date: Sat, 1 Oct 2022 09:21:58 -0400 -Subject: [PATCH] Enable runtime marshalling - -Dotnet7 introduced a bug where MkDir would sometimes have a snuffed errno. -This is a temporary workaround till upstream finds why the errno is being -turned into EAGAIN. - ---- - src/libraries/Common/src/DisableRuntimeMarshalling.cs | 2 +- - .../Common/src/Interop/Unix/System.Native/Interop.MkDir.cs | 4 ++-- - src/libraries/Common/tests/Common.Tests.csproj | 2 +- - src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj | 2 +- - .../Microsoft.Extensions.Hosting.WindowsServices.Tests.csproj | 4 ++-- - .../UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj | 2 +- - .../tests/Common/Microsoft.Extensions.Logging.Tests.csproj | 2 +- - .../tests/Microsoft.Win32.Primitives.Tests.csproj | 2 +- - .../src/Microsoft.Win32.Registry.AccessControl.csproj | 2 +- - .../tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj | 2 +- - .../src/Microsoft.Win32.Registry.csproj | 2 +- - .../tests/Microsoft.Win32.Registry.Tests.csproj | 2 +- - .../src/Microsoft.Win32.SystemEvents.csproj | 2 +- - .../tests/Microsoft.Win32.SystemEvents.Tests.csproj | 2 +- - src/libraries/System.Console/src/System.Console.csproj | 2 +- - .../System.Console/tests/System.Console.Tests.csproj | 2 +- - src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj | 2 +- - .../System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj | 2 +- - src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj | 2 +- - .../System.Data.OleDb/tests/System.Data.OleDb.Tests.csproj | 2 +- - .../tests/System.Diagnostics.Debug.Tests.csproj | 2 +- - .../src/System.Diagnostics.EventLog.csproj | 2 +- - .../tests/System.Diagnostics.EventLog.Tests.csproj | 2 +- - .../src/System.Diagnostics.FileVersionInfo.csproj | 2 +- - .../System.Diagnostics.FileVersionInfo.Tests.csproj | 2 +- - .../src/System.Diagnostics.PerformanceCounter.csproj | 2 +- - .../tests/System.Diagnostics.PerformanceCounter.Tests.csproj | 2 +- - .../src/System.Diagnostics.Process.csproj | 2 +- - .../tests/System.Diagnostics.Process.Tests.csproj | 2 +- - .../tests/System.Diagnostics.Tracing.Tests.csproj | 2 +- - .../src/System.DirectoryServices.AccountManagement.csproj | 2 +- - .../System.DirectoryServices.AccountManagement.Tests.csproj | 2 +- - .../src/System.DirectoryServices.Protocols.csproj | 2 +- - .../tests/System.DirectoryServices.Protocols.Tests.csproj | 2 +- - .../src/System.DirectoryServices.csproj | 2 +- - .../tests/System.DirectoryServices.Tests.csproj | 2 +- - .../System.Drawing.Common/src/System.Drawing.Common.csproj | 2 +- - .../tests/System.Drawing.Common.Tests.csproj | 2 +- - .../src/System.Drawing.Primitives.csproj | 2 +- - .../System.Formats.Tar/src/System.Formats.Tar.csproj | 2 +- - .../System.Formats.Tar/tests/System.Formats.Tar.Tests.csproj | 2 +- - .../NlsTests/System.Globalization.Extensions.Nls.Tests.csproj | 2 +- - .../tests/NlsTests/System.Globalization.Nls.Tests.csproj | 2 +- - .../src/System.IO.Compression.Brotli.csproj | 2 +- - .../tests/System.IO.Compression.Brotli.Tests.csproj | 2 +- - .../src/System.IO.Compression.ZipFile.csproj | 2 +- - .../tests/System.IO.Compression.ZipFile.Tests.csproj | 2 +- - .../System.IO.Compression/src/System.IO.Compression.csproj | 2 +- - .../tests/System.IO.Compression.Tests.csproj | 2 +- - .../src/System.IO.FileSystem.AccessControl.csproj | 2 +- - .../tests/System.IO.FileSystem.AccessControl.Tests.csproj | 2 +- - .../src/System.IO.FileSystem.DriveInfo.csproj | 2 +- - .../tests/System.IO.FileSystem.DriveInfo.Tests.csproj | 2 +- - .../src/System.IO.FileSystem.Watcher.csproj | 2 +- - .../tests/System.IO.FileSystem.Watcher.Tests.csproj | 2 +- - .../tests/System.IO.FileSystem.Tests.csproj | 2 +- - .../src/System.IO.IsolatedStorage.csproj | 2 +- - .../tests/System.IO.IsolatedStorage.Tests.csproj | 2 +- - .../src/System.IO.MemoryMappedFiles.csproj | 2 +- - .../tests/System.IO.MemoryMappedFiles.Tests.csproj | 2 +- - .../src/System.IO.Pipes.AccessControl.csproj | 2 +- - .../tests/System.IO.Pipes.AccessControl.Tests.csproj | 2 +- - src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj | 2 +- - .../System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj | 2 +- - src/libraries/System.IO.Ports/src/System.IO.Ports.csproj | 2 +- - .../System.IO.Ports/tests/System.IO.Ports.Tests.csproj | 2 +- - src/libraries/System.Management/src/System.Management.csproj | 2 +- - .../System.Management/tests/System.Management.Tests.csproj | 2 +- - .../src/System.Net.Http.WinHttpHandler.csproj | 2 +- - .../System.Net.Http.WinHttpHandler.Functional.Tests.csproj | 2 +- - .../System.Net.Http.WinHttpHandler.Unit.Tests.csproj | 2 +- - src/libraries/System.Net.Http/src/System.Net.Http.csproj | 2 +- - .../FunctionalTests/System.Net.Http.Functional.Tests.csproj | 2 +- - .../tests/UnitTests/System.Net.Http.Unit.Tests.csproj | 2 +- - .../src/System.Net.HttpListener.csproj | 2 +- - .../tests/System.Net.HttpListener.Tests.csproj | 2 +- - src/libraries/System.Net.Mail/src/System.Net.Mail.csproj | 2 +- - .../tests/Functional/System.Net.Mail.Functional.Tests.csproj | 2 +- - .../tests/Unit/System.Net.Mail.Unit.Tests.csproj | 2 +- - .../src/System.Net.NameResolution.csproj | 2 +- - .../System.Net.NameResolution.Functional.Tests.csproj | 2 +- - .../tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj | 2 +- - .../src/System.Net.NetworkInformation.csproj | 2 +- - src/libraries/System.Net.Ping/src/System.Net.Ping.csproj | 2 +- - .../FunctionalTests/System.Net.Ping.Functional.Tests.csproj | 2 +- - .../System.Net.Primitives/src/System.Net.Primitives.csproj | 2 +- - .../System.Net.Primitives.Functional.Tests.csproj | 2 +- - .../tests/PalTests/System.Net.Primitives.Pal.Tests.csproj | 2 +- - .../UnitTests/System.Net.Primitives.UnitTests.Tests.csproj | 2 +- - src/libraries/System.Net.Quic/src/System.Net.Quic.csproj | 2 +- - .../FunctionalTests/System.Net.Quic.Functional.Tests.csproj | 2 +- - .../System.Net.Requests/src/System.Net.Requests.csproj | 2 +- - .../System.Net.Security/src/System.Net.Security.csproj | 2 +- - .../tests/FunctionalTests/System.Net.Security.Tests.csproj | 2 +- - .../tests/UnitTests/System.Net.Security.Unit.Tests.csproj | 2 +- - .../System.Net.Sockets/src/System.Net.Sockets.csproj | 2 +- - .../tests/FunctionalTests/System.Net.Sockets.Tests.csproj | 2 +- - .../System.Net.WebSockets/src/System.Net.WebSockets.csproj | 2 +- - .../System.Private.Xml/src/System.Private.Xml.csproj | 2 +- - .../tests/System.Resources.Extensions.Tests.csproj | 2 +- - .../tests/System.Resources.ResourceManager.Tests.csproj | 2 +- - .../System.Runtime.Caching/src/System.Runtime.Caching.csproj | 2 +- - .../tests/System.Runtime.Caching.Tests.csproj | 2 +- - .../tests/System.Runtime.Extensions.Tests.csproj | 2 +- - ...em.Runtime.InteropServices.RuntimeInformation.Tests.csproj | 2 +- - .../System.Runtime.InteropServices.Tests.csproj | 2 +- - .../tests/System.Runtime.Intrinsics.Tests.csproj | 2 +- - .../System.Runtime.Serialization.Formatters.Tests.csproj | 2 +- - .../tests/NlsTests/System.Runtime.Nls.Tests.csproj | 2 +- - .../System.Runtime/tests/System.Runtime.Tests.csproj | 2 +- - .../src/System.Security.AccessControl.csproj | 2 +- - .../tests/System.Security.AccessControl.Tests.csproj | 2 +- - .../tests/System.Security.Cryptography.Cng.Tests.csproj | 2 +- - .../tests/System.Security.Cryptography.Csp.Tests.csproj | 2 +- - .../src/System.Security.Cryptography.Pkcs.csproj | 2 +- - .../tests/System.Security.Cryptography.Pkcs.Tests.csproj | 2 +- - .../src/System.Security.Cryptography.ProtectedData.csproj | 2 +- - .../System.Security.Cryptography.ProtectedData.Tests.csproj | 2 +- - ...System.Security.Cryptography.X509Certificates.Tests.csproj | 2 +- - .../src/System.Security.Cryptography.csproj | 2 +- - .../tests/System.Security.Cryptography.Tests.csproj | 2 +- - .../tests/System.Security.Permissions.Tests.csproj | 2 +- - .../src/System.Security.Principal.Windows.csproj | 2 +- - .../tests/System.Security.Principal.Windows.Tests.csproj | 2 +- - .../src/System.ServiceProcess.ServiceController.csproj | 2 +- - .../System.ServiceProcess.ServiceController.Tests.csproj | 2 +- - src/libraries/System.Speech/src/System.Speech.csproj | 2 +- - src/libraries/System.Speech/tests/System.Speech.Tests.csproj | 2 +- - .../src/System.Text.Encoding.CodePages.csproj | 2 +- - .../src/System.Threading.AccessControl.csproj | 2 +- - .../tests/System.Threading.AccessControl.Tests.csproj | 2 +- - .../src/System.Transactions.Local.csproj | 2 +- - .../src/System.Windows.Extensions.csproj | 2 +- - .../tests/System.Windows.Extensions.Tests.csproj | 2 +- - 134 files changed, 136 insertions(+), 136 deletions(-) - -diff --git a/src/runtime/src/libraries/Common/src/DisableRuntimeMarshalling.cs b/src/runtime/src/libraries/Common/src/DisableRuntimeMarshalling.cs -index 9a6bc544e55..10ec1fce44a 100644 ---- a/src/runtime/src/libraries/Common/src/DisableRuntimeMarshalling.cs -+++ b/src/runtime/src/libraries/Common/src/DisableRuntimeMarshalling.cs -@@ -2,4 +2,4 @@ - // The .NET Foundation licenses this file to you under the MIT license. - - // Used to indicate that runtime marshalling should be disabled. --[assembly: System.Runtime.CompilerServices.DisableRuntimeMarshalling] -+// [assembly: System.Runtime.CompilerServices.DisableRuntimeMarshalling] -diff --git a/src/runtime/src/libraries/Common/src/Interop/Unix/System.Native/Interop.MkDir.cs b/src/runtime/src/libraries/Common/src/Interop/Unix/System.Native/Interop.MkDir.cs -index a6bb1dc3c0f..751e0ac690b 100644 ---- a/src/runtime/src/libraries/Common/src/Interop/Unix/System.Native/Interop.MkDir.cs -+++ b/src/runtime/src/libraries/Common/src/Interop/Unix/System.Native/Interop.MkDir.cs -@@ -9,8 +9,8 @@ internal static partial class Interop - { - internal static partial class Sys - { -- [LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_MkDir", SetLastError = true)] -- private static partial int MkDir(ref byte path, int mode); -+ [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_MkDir", SetLastError = true)] -+ private static extern int MkDir(ref byte path, int mode); - - internal static int MkDir(ReadOnlySpan path, int mode) - { -diff --git a/src/runtime/src/libraries/Common/tests/Common.Tests.csproj b/src/runtime/src/libraries/Common/tests/Common.Tests.csproj -index 72de3a2ba17..16adf14be81 100644 ---- a/src/runtime/src/libraries/Common/tests/Common.Tests.csproj -+++ b/src/runtime/src/libraries/Common/tests/Common.Tests.csproj -@@ -2,7 +2,7 @@ - - true - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX -+ $(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX - true - - -diff --git a/src/runtime/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj b/src/runtime/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj -index 19ee3bde1b5..d390a06be81 100644 ---- a/src/runtime/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj -+++ b/src/runtime/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent) - $(NoWarn);nullable - - -diff --git a/src/runtime/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/tests/Microsoft.Extensions.Hosting.WindowsServices.Tests.csproj b/src/runtime/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/tests/Microsoft.Extensions.Hosting.WindowsServices.Tests.csproj -index 93be9b87c96..10117338458 100644 ---- a/src/runtime/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/tests/Microsoft.Extensions.Hosting.WindowsServices.Tests.csproj -+++ b/src/runtime/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/tests/Microsoft.Extensions.Hosting.WindowsServices.Tests.csproj -@@ -1,8 +1,8 @@ - - - -- -- $(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum) -+ -+ $(NetFrameworkMinimum) - true - - -diff --git a/src/runtime/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj b/src/runtime/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj -index 0743d679b15..8ec495e8345 100644 ---- a/src/runtime/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj -+++ b/src/runtime/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj -@@ -1,7 +1,7 @@ -  - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetFrameworkMinimum) -+ $(NetCoreAppCurrent);$(NetFrameworkMinimum) - true - true - true -diff --git a/src/runtime/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj b/src/runtime/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj -index 6586026447c..c284ea4f48c 100644 ---- a/src/runtime/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj -+++ b/src/runtime/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj -@@ -1,7 +1,7 @@ - - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetFrameworkMinimum) -+ $(NetCoreAppCurrent);$(NetFrameworkMinimum) - true - - -diff --git a/src/runtime/src/libraries/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj b/src/runtime/src/libraries/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj -index aa61641a9fa..56ed9a2c927 100644 ---- a/src/runtime/src/libraries/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj -+++ b/src/runtime/src/libraries/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser - - - -diff --git a/src/runtime/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj b/src/runtime/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj -index 7f6d66bdba8..168a20a1115 100644 ---- a/src/runtime/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj -+++ b/src/runtime/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) -+ $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) - true - true - Provides support for managing access and audit control lists for Microsoft.Win32.RegistryKey. -diff --git a/src/runtime/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj b/src/runtime/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj -index 76442c6fb1f..e92db98f790 100644 ---- a/src/runtime/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj -+++ b/src/runtime/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum) -+ $(NetFrameworkMinimum) - - - -diff --git a/src/runtime/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj b/src/runtime/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj -index 98652656e9c..1972ac8ad18 100644 ---- a/src/runtime/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj -+++ b/src/runtime/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj -@@ -2,7 +2,7 @@ - - true - $(DefineConstants);REGISTRY_ASSEMBLY -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent) - $(NoWarn);CA2249 - - -diff --git a/src/runtime/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj b/src/runtime/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj -index 1feb97ef841..ae5ad78ce7f 100644 ---- a/src/runtime/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj -+++ b/src/runtime/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj -@@ -1,7 +1,7 @@ - - - $(DefineConstants);REGISTRY_ASSEMBLY -- $(NetCoreAppCurrent)-windows -+ - true - true - -diff --git a/src/runtime/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj b/src/runtime/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj -index d7e7dc61211..640179e2960 100644 ---- a/src/runtime/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj -+++ b/src/runtime/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) -+ $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) - true - true - Provides access to Windows system event notifications. -diff --git a/src/runtime/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj b/src/runtime/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj -index 1a8e130bee4..131134daa80 100644 ---- a/src/runtime/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj -+++ b/src/runtime/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum) -+ $(NetFrameworkMinimum) - true - true - true -diff --git a/src/runtime/src/libraries/System.Console/src/System.Console.csproj b/src/runtime/src/libraries/System.Console/src/System.Console.csproj -index 1c45c5a8f93..880b740def1 100644 ---- a/src/runtime/src/libraries/System.Console/src/System.Console.csproj -+++ b/src/runtime/src/libraries/System.Console/src/System.Console.csproj -@@ -1,7 +1,7 @@ - - - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent) - - - -diff --git a/src/runtime/src/libraries/System.Console/tests/System.Console.Tests.csproj b/src/runtime/src/libraries/System.Console/tests/System.Console.Tests.csproj -index f4b451d30e1..418f9b30039 100644 ---- a/src/runtime/src/libraries/System.Console/tests/System.Console.Tests.csproj -+++ b/src/runtime/src/libraries/System.Console/tests/System.Console.Tests.csproj -@@ -2,7 +2,7 @@ - - true - true -- $(NetCoreAppCurrent);$(NetCoreAppCurrent)-windows -+ $(NetCoreAppCurrent); - true - ..\src\Resources\Strings.resx - -diff --git a/src/runtime/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj b/src/runtime/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj -index 8fad480d961..6efc49b3004 100644 ---- a/src/runtime/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj -+++ b/src/runtime/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum)-FreeBSD;$(NetCoreAppMinimum)-Linux;$(NetCoreAppMinimum)-OSX;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) -+ $(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-FreeBSD;$(NetCoreAppMinimum)-Linux;$(NetCoreAppMinimum)-OSX;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) - true - $(NoWarn);CA2249;CA1838;CA1846 - -diff --git a/src/runtime/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj b/src/runtime/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj -index 85a15ebe3d2..a8183df7eef 100644 ---- a/src/runtime/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj -+++ b/src/runtime/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetFrameworkMinimum) -+ $(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetFrameworkMinimum) - - - -diff --git a/src/runtime/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj b/src/runtime/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj -index 1a1756a85ad..0fa7a416a0f 100644 ---- a/src/runtime/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj -+++ b/src/runtime/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) -+ $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) - true - - $(NoWarn);CA2249 -diff --git a/src/runtime/src/libraries/System.Data.OleDb/tests/System.Data.OleDb.Tests.csproj b/src/runtime/src/libraries/System.Data.OleDb/tests/System.Data.OleDb.Tests.csproj -index 6f72486a944..66d1f92904e 100644 ---- a/src/runtime/src/libraries/System.Data.OleDb/tests/System.Data.OleDb.Tests.csproj -+++ b/src/runtime/src/libraries/System.Data.OleDb/tests/System.Data.OleDb.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum) -+ $(NetFrameworkMinimum) - - - -diff --git a/src/runtime/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj b/src/runtime/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj -index 601c003fc30..6c22aac1e01 100644 ---- a/src/runtime/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj -+++ b/src/runtime/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj -@@ -1,7 +1,7 @@ - - - System.Diagnostics.Tests -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix -+ $(NetCoreAppCurrent)-Unix - true - - false -diff --git a/src/runtime/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj b/src/runtime/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj -index dfae87cc90a..affb0753616 100644 ---- a/src/runtime/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj -+++ b/src/runtime/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) -+ $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) - true - $(NoWarn);CA1847 - - -diff --git a/src/runtime/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj b/src/runtime/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj -index d052ccaa0b6..3563132cda3 100644 ---- a/src/runtime/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj -+++ b/src/runtime/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser - true - true - true -diff --git a/src/runtime/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj b/src/runtime/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj -index a0dbb8e208b..4ae893f4765 100644 ---- a/src/runtime/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj -+++ b/src/runtime/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) -+ $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) - true - $(NoWarn);CA1847 - annotations -diff --git a/src/runtime/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj b/src/runtime/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj -index 2146bf437cb..dd3dfeb4ae4 100644 ---- a/src/runtime/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj -+++ b/src/runtime/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj -@@ -1,7 +1,7 @@ - - - true -- $(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum) -+ $(NetFrameworkMinimum) - - - -diff --git a/src/runtime/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj b/src/runtime/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj -index 2c273820afb..c158c49ec2e 100644 ---- a/src/runtime/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj -+++ b/src/runtime/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj -@@ -2,7 +2,7 @@ - - $(DefineConstants);FEATURE_REGISTRY - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent) - - - -diff --git a/src/runtime/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj b/src/runtime/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj -index e23bb4a94a7..bfa37a8f919 100644 ---- a/src/runtime/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj -+++ b/src/runtime/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj -@@ -2,7 +2,7 @@ - - true - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser - true - true - -diff --git a/src/runtime/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj b/src/runtime/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj -index 35b1a833abb..18c323c28ae 100644 ---- a/src/runtime/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj -+++ b/src/runtime/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj -@@ -1,7 +1,7 @@ - - - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent) - true - true - -diff --git a/src/runtime/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj b/src/runtime/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj -index 8152e3c7f05..be32f5d3b5d 100644 ---- a/src/runtime/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj -+++ b/src/runtime/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj -@@ -1,6 +1,6 @@ -  - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0 -+ $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0 - true - true - $(NoWarn);CA2249 -diff --git a/src/runtime/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj b/src/runtime/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj -index 0bb24c8eadd..6155cac4498 100644 ---- a/src/runtime/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj -+++ b/src/runtime/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;net48 -+ net48 - - - -diff --git a/src/runtime/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj b/src/runtime/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj -index 56862519355..3e11d02035a 100644 ---- a/src/runtime/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj -+++ b/src/runtime/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum)-OSX;$(NetCoreAppMinimum)-Linux;$(NetCoreAppMinimum);netstandard2.0 -+ $(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-OSX;$(NetCoreAppMinimum)-Linux;$(NetCoreAppMinimum);netstandard2.0 - true - true - true -diff --git a/src/runtime/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj b/src/runtime/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj -index 9a78a3acd54..632de15c235 100644 ---- a/src/runtime/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj -+++ b/src/runtime/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;net48 -+ $(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;net48 - - - -diff --git a/src/runtime/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj b/src/runtime/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj -index 83a118e940d..7b045dc3c0b 100644 ---- a/src/runtime/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj -+++ b/src/runtime/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj -@@ -1,6 +1,6 @@ -  - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0 -+ $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0 - true - true - - $(NoWarn);SYSLIB0003 -- $(NetCoreAppCurrent)-windows;net48 -+ net48 - - - -diff --git a/src/runtime/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj b/src/runtime/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj -index df9c7ef864a..9cf9a016204 100644 ---- a/src/runtime/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj -+++ b/src/runtime/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) -+ $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) - $(DefineConstants);DRAWING_NAMESPACE - true - CS0618 -diff --git a/src/runtime/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj b/src/runtime/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj -index 33f175f1456..0b14a790777 100644 ---- a/src/runtime/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj -+++ b/src/runtime/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj -@@ -2,7 +2,7 @@ - - true - true -- $(NetCoreAppCurrent)-windows;net48 -+ net48 - true - - -diff --git a/src/runtime/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj b/src/runtime/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj -index 697be7783e2..2efcb61d950 100644 ---- a/src/runtime/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj -+++ b/src/runtime/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj -@@ -1,7 +1,7 @@ -  - - System.Drawing -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent) - - - -diff --git a/src/runtime/src/libraries/System.Formats.Tar/src/System.Formats.Tar.csproj b/src/runtime/src/libraries/System.Formats.Tar/src/System.Formats.Tar.csproj -index 33a9aa8c1dc..ea69b03b8a8 100644 ---- a/src/runtime/src/libraries/System.Formats.Tar/src/System.Formats.Tar.csproj -+++ b/src/runtime/src/libraries/System.Formats.Tar/src/System.Formats.Tar.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) - true - - -diff --git a/src/runtime/src/libraries/System.Formats.Tar/tests/System.Formats.Tar.Tests.csproj b/src/runtime/src/libraries/System.Formats.Tar/tests/System.Formats.Tar.Tests.csproj -index ca1b4d99e50..d4475c8781f 100644 ---- a/src/runtime/src/libraries/System.Formats.Tar/tests/System.Formats.Tar.Tests.csproj -+++ b/src/runtime/src/libraries/System.Formats.Tar/tests/System.Formats.Tar.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix -+ $(NetCoreAppCurrent)-Unix - true - $(LibrariesProjectRoot)/Common/tests/Resources/Strings.resx - true -diff --git a/src/runtime/src/libraries/System.Globalization.Extensions/tests/NlsTests/System.Globalization.Extensions.Nls.Tests.csproj b/src/runtime/src/libraries/System.Globalization.Extensions/tests/NlsTests/System.Globalization.Extensions.Nls.Tests.csproj -index 61a409ffedc..38f61fb9197 100644 ---- a/src/runtime/src/libraries/System.Globalization.Extensions/tests/NlsTests/System.Globalization.Extensions.Nls.Tests.csproj -+++ b/src/runtime/src/libraries/System.Globalization.Extensions/tests/NlsTests/System.Globalization.Extensions.Nls.Tests.csproj -@@ -1,6 +1,6 @@ -  - -- $(NetCoreAppCurrent)-windows -+ - true - - -diff --git a/src/runtime/src/libraries/System.Globalization/tests/NlsTests/System.Globalization.Nls.Tests.csproj b/src/runtime/src/libraries/System.Globalization/tests/NlsTests/System.Globalization.Nls.Tests.csproj -index a9aeef49807..0284070ad05 100644 ---- a/src/runtime/src/libraries/System.Globalization/tests/NlsTests/System.Globalization.Nls.Tests.csproj -+++ b/src/runtime/src/libraries/System.Globalization/tests/NlsTests/System.Globalization.Nls.Tests.csproj -@@ -4,7 +4,7 @@ - true - true - -- $(NetCoreAppCurrent)-windows -+ - 14.0 - - -diff --git a/src/runtime/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj b/src/runtime/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj -index ced12496d65..d67e262836b 100644 ---- a/src/runtime/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj -+++ b/src/runtime/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj -@@ -1,7 +1,7 @@ -  - - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) - - - -diff --git a/src/runtime/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj b/src/runtime/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj -index 709f655902d..607c50be625 100644 ---- a/src/runtime/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj -+++ b/src/runtime/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser - true - true - -diff --git a/src/runtime/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj b/src/runtime/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj -index 94999191663..f8506c2adbc 100644 ---- a/src/runtime/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj -+++ b/src/runtime/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj -@@ -1,7 +1,7 @@ -  - - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent) - - - -diff --git a/src/runtime/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj b/src/runtime/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj -index 29c88cb2f9c..b049a0f3caa 100644 ---- a/src/runtime/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj -+++ b/src/runtime/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj -@@ -3,7 +3,7 @@ - true - true - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser - - - -diff --git a/src/runtime/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj b/src/runtime/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj -index 80007bcfe5f..ee0bf21ccfc 100644 ---- a/src/runtime/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj -+++ b/src/runtime/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj -@@ -1,7 +1,7 @@ - - - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent) - - - -diff --git a/src/runtime/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj b/src/runtime/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj -index 229119e3aa3..2fcad878c05 100644 ---- a/src/runtime/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj -+++ b/src/runtime/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser - true - - -diff --git a/src/runtime/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj b/src/runtime/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj -index 494ef1959db..08ddf1c7dd9 100644 ---- a/src/runtime/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj -+++ b/src/runtime/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent) - - - -diff --git a/src/runtime/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj b/src/runtime/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj -index c42a680fa2f..fe12ddd7911 100644 ---- a/src/runtime/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj -+++ b/src/runtime/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows -+ - - - -diff --git a/src/runtime/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj b/src/runtime/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj -index 61225e58e8a..90c69fee153 100644 ---- a/src/runtime/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj -+++ b/src/runtime/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj -@@ -1,7 +1,7 @@ - - - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) - - - -diff --git a/src/runtime/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj b/src/runtime/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj -index 00d1afd3c94..8071e492986 100644 ---- a/src/runtime/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj -+++ b/src/runtime/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser - - - -diff --git a/src/runtime/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj b/src/runtime/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj -index 469005b661d..7edcd52db0c 100644 ---- a/src/runtime/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj -+++ b/src/runtime/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj -@@ -1,7 +1,7 @@ -  - - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent) - - - -diff --git a/src/runtime/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj b/src/runtime/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj -index 1246c914ab8..a83fbe23499 100644 ---- a/src/runtime/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj -+++ b/src/runtime/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj -@@ -2,7 +2,7 @@ - - true - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-FreeBSD -+ $(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-FreeBSD - true - true - -diff --git a/src/runtime/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj b/src/runtime/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj -index e386671171d..746e218cc24 100644 ---- a/src/runtime/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj -+++ b/src/runtime/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj -@@ -2,7 +2,7 @@ - - true - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser - - --working-dir=/test-dir - true -diff --git a/src/runtime/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj b/src/runtime/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj -index 2309a8c007a..b16deb25f25 100644 ---- a/src/runtime/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj -+++ b/src/runtime/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent) - - - -diff --git a/src/runtime/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj b/src/runtime/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj -index 0410513c46c..1f4b92f6418 100644 ---- a/src/runtime/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj -+++ b/src/runtime/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Android -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Android - true - - -diff --git a/src/runtime/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj b/src/runtime/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj -index 9be9a376620..56ed27283ac 100644 ---- a/src/runtime/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj -+++ b/src/runtime/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj -@@ -1,7 +1,7 @@ - - - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent) - - - -diff --git a/src/runtime/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj b/src/runtime/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj -index ef44754372e..4525b0aa830 100644 ---- a/src/runtime/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj -+++ b/src/runtime/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj -@@ -2,7 +2,7 @@ - - true - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser - true - - -diff --git a/src/runtime/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj b/src/runtime/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj -index 3dd3c8a455b..82091dc68d0 100644 ---- a/src/runtime/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj -+++ b/src/runtime/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent) - - - -diff --git a/src/runtime/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj b/src/runtime/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj -index 386250a4320..e0e4eab4e8e 100644 ---- a/src/runtime/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj -+++ b/src/runtime/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows -+ - - - -diff --git a/src/runtime/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj b/src/runtime/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj -index b0956d6ba7b..77585616ea3 100644 ---- a/src/runtime/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj -+++ b/src/runtime/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) - true - - -diff --git a/src/runtime/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj b/src/runtime/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj -index 8f31d5dd604..2e6ae7616ea 100644 ---- a/src/runtime/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj -+++ b/src/runtime/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj -@@ -2,7 +2,7 @@ - - true - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) - true - true - -diff --git a/src/runtime/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj b/src/runtime/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj -index c341d6c3ba6..3173e525799 100644 ---- a/src/runtime/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj -+++ b/src/runtime/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum)-Unix;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-Unix;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) - true - $(DefineConstants);SERIAL_PORTS - true -diff --git a/src/runtime/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj b/src/runtime/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj -index 9a1592778a7..b71f36bc2f1 100644 ---- a/src/runtime/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj -+++ b/src/runtime/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-FreeBSD;$(NetFrameworkMinimum) -+ $(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-FreeBSD;$(NetFrameworkMinimum) - - - -diff --git a/src/runtime/src/libraries/System.Management/src/System.Management.csproj b/src/runtime/src/libraries/System.Management/src/System.Management.csproj -index 5b66be0b573..1352df29995 100644 ---- a/src/runtime/src/libraries/System.Management/src/System.Management.csproj -+++ b/src/runtime/src/libraries/System.Management/src/System.Management.csproj -@@ -1,6 +1,6 @@ -  - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0 -+ $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0 - true - $(NoWarn);0618 - -diff --git a/src/runtime/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj b/src/runtime/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj -index b5a0ebaa389..45c62a15a8b 100644 ---- a/src/runtime/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj -+++ b/src/runtime/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj -@@ -4,7 +4,7 @@ - $(DefineConstants);SYSNETHTTP_NO_OPENSSL;HTTP3 - true - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX -+ $(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX - true - true - -diff --git a/src/runtime/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj b/src/runtime/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj -index 85139c5391f..f2f2c2e5696 100644 ---- a/src/runtime/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj -+++ b/src/runtime/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj -@@ -3,7 +3,7 @@ - ../../src/Resources/Strings.resx - true - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Android -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Android - true - - -diff --git a/src/runtime/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj b/src/runtime/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj -index b0e790da1d6..46e75182fae 100644 ---- a/src/runtime/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj -+++ b/src/runtime/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj -@@ -2,7 +2,7 @@ - - true - false -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) - true - - -diff --git a/src/runtime/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj b/src/runtime/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj -index ff51965c789..d5f4d3637ca 100644 ---- a/src/runtime/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj -+++ b/src/runtime/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj -@@ -2,7 +2,7 @@ - - true - ../src/Resources/Strings.resx -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX - true - - -diff --git a/src/runtime/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj b/src/runtime/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj -index 5d2ce4cc280..323c647d2d6 100644 ---- a/src/runtime/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj -+++ b/src/runtime/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj -@@ -1,7 +1,7 @@ -  - - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent) - - - -diff --git a/src/runtime/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj b/src/runtime/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj -index 4a7b913a457..f81cc0576f9 100644 ---- a/src/runtime/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj -+++ b/src/runtime/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj -@@ -1,7 +1,7 @@ - - - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-Android -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-Android - true - true - true -diff --git a/src/runtime/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj b/src/runtime/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj -index 0fbb5d7c497..b466e0b9d96 100644 ---- a/src/runtime/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj -+++ b/src/runtime/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj -@@ -2,7 +2,7 @@ - - true - ../../src/Resources/Strings.resx -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser - true - - -diff --git a/src/runtime/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj b/src/runtime/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj -index 6d7ee08de0b..76e1a178242 100644 ---- a/src/runtime/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj -+++ b/src/runtime/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj -@@ -1,7 +1,7 @@ - - - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent) - - - -diff --git a/src/runtime/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj b/src/runtime/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj -index f4588a2b4a1..a21ef6a5d18 100644 ---- a/src/runtime/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj -+++ b/src/runtime/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser - true - true - true -diff --git a/src/runtime/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj b/src/runtime/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj -index 2edc2e3601c..75c119af62a 100644 ---- a/src/runtime/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj -+++ b/src/runtime/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj -@@ -2,7 +2,7 @@ - - true - ../../src/Resources/Strings.resx -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser - true - true - -diff --git a/src/runtime/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj b/src/runtime/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj -index d36ad67504e..8b240730a52 100644 ---- a/src/runtime/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj -+++ b/src/runtime/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj -@@ -1,7 +1,7 @@ -  - - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent) - - - -diff --git a/src/runtime/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj b/src/runtime/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj -index 71b5d783c45..167b0a2c5f5 100644 ---- a/src/runtime/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj -+++ b/src/runtime/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj -@@ -1,7 +1,7 @@ -  - - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent) - - - -diff --git a/src/runtime/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj b/src/runtime/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj -index 0a068b65b72..5ccac35d05f 100644 ---- a/src/runtime/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj -+++ b/src/runtime/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser - true - true - true -diff --git a/src/runtime/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj b/src/runtime/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj -index 84a5864cac9..3567f4a6ea7 100644 ---- a/src/runtime/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj -+++ b/src/runtime/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj -@@ -2,7 +2,7 @@ - - true - false -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent) - - $(DefineConstants);SYSTEM_NET_PRIMITIVES_DLL -diff --git a/src/runtime/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj b/src/runtime/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj -index 4e2e897b0a6..7a48043aad5 100644 ---- a/src/runtime/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj -+++ b/src/runtime/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj -@@ -1,7 +1,7 @@ - - - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser - true - - -diff --git a/src/runtime/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj b/src/runtime/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj -index 2fb034467dc..633181e4b58 100644 ---- a/src/runtime/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj -+++ b/src/runtime/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj -@@ -2,7 +2,7 @@ - - true - ../../src/Resources/Strings.resx -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser - true - - -diff --git a/src/runtime/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj b/src/runtime/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj -index 8cc3d0ff90f..098b0d7460a 100644 ---- a/src/runtime/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj -+++ b/src/runtime/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj -@@ -3,7 +3,7 @@ - true - 169,649 - ../../src/Resources/Strings.resx -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser - true - - -diff --git a/src/runtime/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj b/src/runtime/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj -index 257af8dbb88..6f118e0bf88 100644 ---- a/src/runtime/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj -+++ b/src/runtime/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj -@@ -1,7 +1,7 @@ -  - - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent) - true - - -diff --git a/src/runtime/src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj b/src/runtime/src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj -index 62b1be2da62..45b87e1dddb 100644 ---- a/src/runtime/src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj -+++ b/src/runtime/src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj -@@ -2,7 +2,7 @@ - - true - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix -+ $(NetCoreAppCurrent)-Unix - true - - -diff --git a/src/runtime/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj b/src/runtime/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj -index d16970c9a19..6a5034037a3 100644 ---- a/src/runtime/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj -+++ b/src/runtime/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj -@@ -1,7 +1,7 @@ - - - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) - - $(NoWarn);SYSLIB0014 - -diff --git a/src/runtime/src/libraries/System.Net.Security/src/System.Net.Security.csproj b/src/runtime/src/libraries/System.Net.Security/src/System.Net.Security.csproj -index e030690763e..ad96b0fb669 100644 ---- a/src/runtime/src/libraries/System.Net.Security/src/System.Net.Security.csproj -+++ b/src/runtime/src/libraries/System.Net.Security/src/System.Net.Security.csproj -@@ -1,7 +1,7 @@ - - - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent) - - $(DefineConstants);PRODUCT - true -diff --git a/src/runtime/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj b/src/runtime/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj -index 7c3d432f34c..7fd430a9220 100644 ---- a/src/runtime/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj -+++ b/src/runtime/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj -@@ -2,7 +2,7 @@ - - true - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS - true - true - -diff --git a/src/runtime/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj b/src/runtime/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj -index 1dd366e72a0..6a184f9d405 100644 ---- a/src/runtime/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj -+++ b/src/runtime/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj -@@ -10,7 +10,7 @@ - 436 - - $(NoWarn);3021 -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-Android -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-Android - true - true - -diff --git a/src/runtime/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj b/src/runtime/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj -index 61f9c6fa2d4..2674e098d82 100644 ---- a/src/runtime/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj -+++ b/src/runtime/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj -@@ -1,7 +1,7 @@ - - - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) - - - -diff --git a/src/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj b/src/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj -index 884db1eea54..86517b47af6 100644 ---- a/src/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj -+++ b/src/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj -@@ -2,7 +2,7 @@ - - true - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser - true - true - -diff --git a/src/runtime/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj b/src/runtime/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj -index c0c4ded0d33..b361cc90d32 100644 ---- a/src/runtime/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj -+++ b/src/runtime/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj -@@ -1,7 +1,7 @@ - - - True -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent) - - - -diff --git a/src/runtime/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj b/src/runtime/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj -index 405e6375a9f..2a5bd1faacb 100644 ---- a/src/runtime/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj -+++ b/src/runtime/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent) - System.Xml - true - -diff --git a/src/runtime/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj b/src/runtime/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj -index ad289dc6319..2485635439b 100644 ---- a/src/runtime/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj -+++ b/src/runtime/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetFrameworkMinimum) -+ $(NetCoreAppCurrent)-Unix;$(NetFrameworkMinimum) - true - - -diff --git a/src/runtime/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj b/src/runtime/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj -index 66cb937a3d1..12e027437bd 100644 ---- a/src/runtime/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj -+++ b/src/runtime/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj -@@ -4,7 +4,7 @@ - true - true - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix -+ $(NetCoreAppCurrent)-Unix - - - -diff --git a/src/runtime/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj b/src/runtime/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj -index 869129ba71f..41a41f7bebb 100644 ---- a/src/runtime/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj -+++ b/src/runtime/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0 -+ $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0 - true - Annotations - true -diff --git a/src/runtime/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching.Tests.csproj b/src/runtime/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching.Tests.csproj -index 8f08caf9b46..ee8e300954a 100644 ---- a/src/runtime/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching.Tests.csproj -+++ b/src/runtime/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent);$(NetCoreAppCurrent)-windows;net48 -+ $(NetCoreAppCurrent);net48 - true - - -diff --git a/src/runtime/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj b/src/runtime/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj -index 3e3e2937781..85074f9fba2 100644 ---- a/src/runtime/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj -+++ b/src/runtime/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj -@@ -4,7 +4,7 @@ - true - true - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser - - - -diff --git a/src/runtime/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj b/src/runtime/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj -index 3edd7d47f72..db7a23c27c5 100644 ---- a/src/runtime/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj -+++ b/src/runtime/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj -@@ -1,7 +1,7 @@ -  - - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser - - - -diff --git a/src/runtime/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.UnitTests/System.Runtime.InteropServices.Tests.csproj b/src/runtime/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.UnitTests/System.Runtime.InteropServices.Tests.csproj -index 34964fb33f2..1a78852a17b 100644 ---- a/src/runtime/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.UnitTests/System.Runtime.InteropServices.Tests.csproj -+++ b/src/runtime/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.UnitTests/System.Runtime.InteropServices.Tests.csproj -@@ -1,7 +1,7 @@ - - - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser - true - true - -diff --git a/src/runtime/src/libraries/System.Runtime.Intrinsics/tests/System.Runtime.Intrinsics.Tests.csproj b/src/runtime/src/libraries/System.Runtime.Intrinsics/tests/System.Runtime.Intrinsics.Tests.csproj -index 6c0187cf21f..fef12aa096c 100644 ---- a/src/runtime/src/libraries/System.Runtime.Intrinsics/tests/System.Runtime.Intrinsics.Tests.csproj -+++ b/src/runtime/src/libraries/System.Runtime.Intrinsics/tests/System.Runtime.Intrinsics.Tests.csproj -@@ -4,7 +4,7 @@ - $(NoWarn),1718,SYSLIB0013 - true - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser - - $(Features.Replace('nullablePublicOnly', '') - -diff --git a/src/runtime/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj b/src/runtime/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj -index 378b38abb93..971c431ca2e 100644 ---- a/src/runtime/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj -+++ b/src/runtime/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj -@@ -2,7 +2,7 @@ - - true - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;net48 -+ $(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;net48 - - - -diff --git a/src/runtime/src/libraries/System.Runtime/tests/NlsTests/System.Runtime.Nls.Tests.csproj b/src/runtime/src/libraries/System.Runtime/tests/NlsTests/System.Runtime.Nls.Tests.csproj -index 849edc8cd5c..2deaa7914ef 100644 ---- a/src/runtime/src/libraries/System.Runtime/tests/NlsTests/System.Runtime.Nls.Tests.csproj -+++ b/src/runtime/src/libraries/System.Runtime/tests/NlsTests/System.Runtime.Nls.Tests.csproj -@@ -3,7 +3,7 @@ - true - true - true -- $(NetCoreAppCurrent)-windows -+ - $(NoWarn),SYSLIB0013 - - -diff --git a/src/runtime/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj b/src/runtime/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj -index fc6859854dc..260dafbd372 100644 ---- a/src/runtime/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj -+++ b/src/runtime/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser - true - $(NoWarn),1718,SYSLIB0013 - true -diff --git a/src/runtime/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj b/src/runtime/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj -index 35fabc2416c..a461103be90 100644 ---- a/src/runtime/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj -+++ b/src/runtime/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj -@@ -1,7 +1,7 @@ -  - - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent) - - - -diff --git a/src/runtime/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj b/src/runtime/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj -index 05fd95a165f..f0c167ed082 100644 ---- a/src/runtime/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj -+++ b/src/runtime/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows -+ - - - -diff --git a/src/runtime/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj b/src/runtime/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj -index 4bfc1719abf..cc312cffe4e 100644 ---- a/src/runtime/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj -+++ b/src/runtime/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj -@@ -1,7 +1,7 @@ - - - $(DefineConstants);TESTING_CNG_IMPLEMENTATION -- $(NetCoreAppCurrent)-windows -+ - - - -diff --git a/src/runtime/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj b/src/runtime/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj -index 59d139c7749..a8e94e72847 100644 ---- a/src/runtime/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj -+++ b/src/runtime/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser - - $(NoWarn);SYSLIB0021 - -diff --git a/src/runtime/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj b/src/runtime/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj -index be33237e616..426ddb38e27 100644 ---- a/src/runtime/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj -+++ b/src/runtime/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) -+ $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) - true - true - $(NoWarn);CA5384 -diff --git a/src/runtime/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj b/src/runtime/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj -index 8523c0d8296..2045f05a28e 100644 ---- a/src/runtime/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj -+++ b/src/runtime/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj -@@ -1,7 +1,7 @@ - - - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);net48 -+ $(NetCoreAppCurrent);net48 - - - $(DefineConstants);HAVE_THUMBPRINT_OVERLOADS - true - $(NoWarn);SYSLIB0026;SYSLIB0027;SYSLIB0028 -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS - true - - -diff --git a/src/runtime/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj b/src/runtime/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj -index cf25738f6e7..29d0f0734cb 100644 ---- a/src/runtime/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj -+++ b/src/runtime/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj -@@ -2,7 +2,7 @@ - - true - $(DefineConstants);INTERNAL_ASYMMETRIC_IMPLEMENTATIONS -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent) - $(NoWarn);CA5350;CA5351;CA5379;CA5384;SYSLIB0026 - - $(NoWarn);CS0809 -diff --git a/src/runtime/src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj b/src/runtime/src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj -index 50e110c0445..b32809447d3 100644 ---- a/src/runtime/src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj -+++ b/src/runtime/src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-Browser -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-Browser - true - $(NoWarn);SYSLIB0021 - true -diff --git a/src/runtime/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj b/src/runtime/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj -index 73f50b209fb..7205c2e239a 100644 ---- a/src/runtime/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj -+++ b/src/runtime/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows -+ - - $(NoWarn);SYSLIB0003 - -diff --git a/src/runtime/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj b/src/runtime/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj -index a67d4af63eb..9fef2993b07 100644 ---- a/src/runtime/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj -+++ b/src/runtime/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj -@@ -1,7 +1,7 @@ - - - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent) - - - -diff --git a/src/runtime/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj b/src/runtime/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj -index e9caf5fa463..43e03119cb3 100644 ---- a/src/runtime/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj -+++ b/src/runtime/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj -@@ -1,7 +1,7 @@ - - - true -- $(NetCoreAppCurrent)-windows -+ - - - -diff --git a/src/runtime/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj b/src/runtime/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj -index 518c800ae01..2b465d475b0 100644 ---- a/src/runtime/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj -+++ b/src/runtime/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) -+ $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) - true - $(NoWarn);CA2249 - true -diff --git a/src/runtime/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests.csproj b/src/runtime/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests.csproj -index 1039fad47f4..99412bc09b8 100644 ---- a/src/runtime/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests.csproj -+++ b/src/runtime/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum) -+ $(NetFrameworkMinimum) - - - -diff --git a/src/runtime/src/libraries/System.Speech/src/System.Speech.csproj b/src/runtime/src/libraries/System.Speech/src/System.Speech.csproj -index 22506f7bf96..9c53e796bd8 100644 ---- a/src/runtime/src/libraries/System.Speech/src/System.Speech.csproj -+++ b/src/runtime/src/libraries/System.Speech/src/System.Speech.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0 -+ $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0 - true - - -diff --git a/src/runtime/src/libraries/System.Speech/tests/System.Speech.Tests.csproj b/src/runtime/src/libraries/System.Speech/tests/System.Speech.Tests.csproj -index 9139d0d2392..d81ff8a7ca1 100644 ---- a/src/runtime/src/libraries/System.Speech/tests/System.Speech.Tests.csproj -+++ b/src/runtime/src/libraries/System.Speech/tests/System.Speech.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows -+ - - - -diff --git a/src/runtime/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj b/src/runtime/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj -index 8883abba36b..c7ff6be8fec 100644 ---- a/src/runtime/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj -+++ b/src/runtime/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) -+ $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) - true - true - true -diff --git a/src/runtime/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj b/src/runtime/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj -index 54c8e0bad5f..c9c91e64692 100644 ---- a/src/runtime/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj -+++ b/src/runtime/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) -+ $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) - true - true - Provides support for managing access and audit control lists for synchronization primitives. -diff --git a/src/runtime/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj b/src/runtime/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj -index 3b9e105954d..14949ff735b 100644 ---- a/src/runtime/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj -+++ b/src/runtime/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum) -+ $(NetFrameworkMinimum) - - - - true - true -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent) - CA1805;IDE0059;CS1591 - $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) - -diff --git a/src/runtime/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj b/src/runtime/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj -index ee9cb23d69e..741c633215b 100644 ---- a/src/runtime/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj -+++ b/src/runtime/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum) -+ $(NetCoreAppCurrent);$(NetCoreAppMinimum) - true - true - Provides miscellaneous Windows-specific types -diff --git a/src/runtime/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj b/src/runtime/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj -index e7b45293318..089fe0ef33f 100644 ---- a/src/runtime/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj -+++ b/src/runtime/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-windows -+ - - - --- -2.36.3 - diff --git a/community/dotnet7-build/runtime_enable-system-libunwind.diff b/community/dotnet7-build/runtime_enable-system-libunwind.diff index 69045ad..e88e5cf 100644 --- a/community/dotnet7-build/runtime_enable-system-libunwind.diff +++ b/community/dotnet7-build/runtime_enable-system-libunwind.diff @@ -1,11 +1,11 @@ -diff --git a/src/runtime/eng/SourceBuild.props b/src/runtime/eng/SourceBuild.props -index 32e6d9c0ba..8e2a7f9931 100644 ---- a/src/runtime/eng/SourceBuild.props +diff --git a/src/runtime/eng/SourceBuild.props.orig b/src/runtime/eng/SourceBuild.props +index 1e9d5cf..c40e4fa 100644 +--- a/src/runtime/eng/SourceBuild.props.orig +++ b/src/runtime/eng/SourceBuild.props -@@ -51,6 +51,7 @@ - $(InnerBuildArgs) /p:DisableSourceLink=false - $(InnerBuildArgs) /p:AdditionalRuntimeIdentifierParent=$(BaseOS) - $(InnerBuildArgs) /p:PrimaryRuntimeFlavor=Mono /p:RuntimeFlavor=Mono +@@ -48,6 +48,7 @@ + $(InnerBuildArgs) /p:OfficialBuildId=$(OfficialBuildId) + $(InnerBuildArgs) /p:ContinuousIntegrationBuild=$(ContinuousIntegrationBuild) + $(InnerBuildArgs) --usemonoruntime + $(InnerBuildArgs) --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE diff --git a/community/dotnet7-build/runtime_more-clang-16-suppression.patch b/community/dotnet7-build/runtime_more-clang-16-suppression.patch new file mode 100644 index 0000000..1e94419 --- /dev/null +++ b/community/dotnet7-build/runtime_more-clang-16-suppression.patch @@ -0,0 +1,13 @@ +diff --git a/src/runtime/eng/native/configurecompiler.cmake b/src/runtime/eng/native/configurecompiler.cmake +index c9a54547c0a..931da2cae5b 100644 +--- a/src/runtime/eng/native/configurecompiler.cmake ++++ b/src/runtime/eng/native/configurecompiler.cmake +@@ -488,6 +488,8 @@ if (CLR_CMAKE_HOST_UNIX) + # other clang 16.0 suppressions + add_compile_options(-Wno-single-bit-bitfield-constant-conversion) + add_compile_options(-Wno-cast-function-type-strict) ++ add_compile_options(-Wno-incompatible-function-pointer-types-strict) ++ add_compile_options(-Wno-ignored-attributes) + else() + add_compile_options(-Wno-uninitialized) + add_compile_options(-Wno-strict-aliasing) diff --git a/community/dotnet7-build/runtime_remove-usage-of-off64-t.patch b/community/dotnet7-build/runtime_remove-usage-of-off64-t.patch index a55dcde..cec5877 100644 --- a/community/dotnet7-build/runtime_remove-usage-of-off64-t.patch +++ b/community/dotnet7-build/runtime_remove-usage-of-off64-t.patch @@ -1,15 +1,26 @@ -diff --git a/src/runtime/src/coreclr/debug/createdump/crashinfounix.cpp b/src/runtime/src/coreclr/debug/createdump/crashinfounix.cpp -index 03712c3b684..99d8a457957 100644 ---- a/src/runtimr/src/coreclr/debug/createdump/crashinfounix.cpp +diff --git a/src/runtime/src/coreclr/debug/createdump/crashinfounix.cpp.orig b/src/runtime/src/coreclr/debug/createdump/crashinfounix.cpp +index 20b2494..165b190 100644 +--- a/src/runtime/src/coreclr/debug/createdump/crashinfounix.cpp.orig +++ b/src/runtime/src/coreclr/debug/createdump/crashinfounix.cpp -@@ -395,7 +395,7 @@ CrashInfo::ReadProcessMemory(void* address, void* buffer, size_t size, size_t* r +@@ -469,7 +469,7 @@ CrashInfo::ReadProcessMemory(void* address, void* buffer, size_t size, size_t* r // performance optimization. m_canUseProcVmReadSyscall = false; - assert(m_fd != -1); -- *read = pread64(m_fd, buffer, size, (off64_t)address); -+ *read = pread(m_fd, buffer, size, (off_t)address); + assert(m_fdMem != -1); +- *read = pread64(m_fdMem, buffer, size, (off64_t)address); ++ *read = pread(m_fdMem, buffer, size, (off_t)address); } if (*read == (size_t)-1) - - +diff --git a/src/runtime/src/coreclr/debug/createdump/crashinfo.cpp.orig b/src/runtime/src/coreclr/debug/createdump/crashinfo.cpp +index 5addb79..79655d1 100644 +--- a/src/runtime/src/coreclr/debug/createdump/crashinfo.cpp.orig ++++ b/src/runtime/src/coreclr/debug/createdump/crashinfo.cpp +@@ -760,7 +760,7 @@ CrashInfo::PageMappedToPhysicalMemory(uint64_t start) + } + + uint64_t pagemapOffset = (start / PAGE_SIZE) * sizeof(uint64_t); +- uint64_t seekResult = lseek64(m_fdPagemap, (off64_t) pagemapOffset, SEEK_SET); ++ uint64_t seekResult = lseek(m_fdPagemap, (off_t) pagemapOffset, SEEK_SET); + if (seekResult != pagemapOffset) + { + int seekErrno = errno; diff --git a/community/dotnet7-build/sdk_14239-add-zsh-compdef-completion-script.patch b/community/dotnet7-build/sdk_14239-add-zsh-compdef-completion-script.patch deleted file mode 100644 index bdb120b..0000000 --- a/community/dotnet7-build/sdk_14239-add-zsh-compdef-completion-script.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4c74721e1f5da9642adab03075dda2f55719ac7b Mon Sep 17 00:00:00 2001 -Patch-Source: https://github.com/dotnet/sdk/pull/14239 -From: Esgariot -Date: Mon, 19 Oct 2020 23:42:37 +0200 -Subject: [PATCH 1/1] Add zsh compdef completion script. - -Continuing off of PR 13384 in upstream. -This commit is ready to be rebased to include appropriate co-authors -before merging PR. - ---- - scripts/register-completions.zsh | 13 +++---------- - 1 file changed, 3 insertions(+), 10 deletions(-) - -diff --git a/src/sdk/scripts/register-completions.zsh b/src/sdk/scripts/register-completions.zsh -index 8eebe9a867..faa32fef71 100644 ---- a/src/sdk/scripts/register-completions.zsh -+++ b/src/sdk/scripts/register-completions.zsh -@@ -1,10 +1,3 @@ --# zsh parameter completion for the dotnet CLI -- --_dotnet_zsh_complete() --{ -- local completions=("$(dotnet complete "$words")") -- -- reply=( "${(ps:\n:)completions}" ) --} -- --compctl -K _dotnet_zsh_complete dotnet -+#compdef dotnet -+local completions=("$(dotnet complete "$words")") -+[[ -n "$completions" ]] && compadd -- "${(ps:\n:)completions}" --- -2.34.1 - diff --git a/community/dotnet7-build/vstest_intent-net8.0.patch b/community/dotnet7-build/vstest_intent-net8.0.patch new file mode 100644 index 0000000..6a51807 --- /dev/null +++ b/community/dotnet7-build/vstest_intent-net8.0.patch @@ -0,0 +1,13 @@ +diff --git a/src/vstest/test/Intent/Intent.csproj b/src/vstest/test/Intent/Intent.csproj +index bb711c9256..6d0b199a9b 100644 +--- a/src/vstest/test/Intent/Intent.csproj ++++ b/src/vstest/test/Intent/Intent.csproj +@@ -2,7 +2,7 @@ + + + Exe +- net6.0 ++ net8.0 + enable + enable +