diff --git a/apk/v3.13/main/dotnet-3.1/APKBUILD b/apk/v3.13/main/dotnet-3.1/APKBUILD new file mode 100644 index 0000000..040dba0 --- /dev/null +++ b/apk/v3.13/main/dotnet-3.1/APKBUILD @@ -0,0 +1,335 @@ +# Maintainer: Antoine Martin (ayakael) + +# Based on Archlinux PKGBUILD by: +# Maxime Gauduin +# Kristian Mosegaard +# Max Liebkies +# Krzysztof Bogacki + +# Build vars +_bootstrap=false +_bootstrap_sdk='3.1.115' +_bootstrap_runtime='3.1.1' +_targetrid=linux-musl-x64 +_coreclrver=3.1.16-servicing +_coreclrbld=21262.5 +_llvmver=10 + +pkgname=dotnet-3.1 +pkgdesc='The .NET Core SDK' +pkgver=3.1.17 +pkgrel=0 +arch='x86_64' +url=https://www.microsoft.com/net/core +license='MIT' +makedepends=" + bash + clang + cmake + git + icu-dev + inetutils-syslogd + krb5-dev + libgit2-dev + libunwind-dev + libxml2-dev + libxml2-utils + lldb-dev + llvm$_llvmver-dev + lttng-ust-dev + nodejs + openssl-dev + zlib-dev +" + +if [ ${_bootstrap} != 'true' ]; then + makedepends=" + ${makedepends} + dotnet-bootstrap-sdk-3.1 + dotnet-bootstrap-runtime-3.1 + " +fi + +#depends=' +# icu-libs +# krb5-libs +# libgcc +# #libgdiplus +# libintl +# libssl1.1 +# libstdc++zlib +# +subpackages="dotnet-sdk-3.1:sdk dotnet-host-3.1:host dotnet-runtime-3.1:runtime aspnet-runtime-3.1:aspnet_runtime:noarch dotnet-targeting-pack-3.1:targeting_pack aspnet-targeting-pack-3.1:aspnet_targeting_pack:noarch" +_gittag=v${pkgver}-runtime +_giturl=https://github.com/dotnet/source-build +options="!check !archcheck" +source=" + $pkgname-$pkgver.git.zip + dotnet.sh +" + +# patches +source=" + ${source} + coreclr_fix-build-on-Alpine-edge-45352.patch + corefx_fix-build-clang10.patch + xliff-tasks_use-netcoreapp21.patch + build_coreclr-tools-path.patch +" +# core-setup_attempt-fix-transport-runtime.patch + + +builddir="$srcdir/$pkgname" + +snapshot() { + mkdir -p "$srcdir" + cd "${srcdir}" + if ! [ -d $pkgname.git ]; then + git clone $_giturl $pkgname.git || return 1 + cd $pkgname.git + else + cd $pkgname.git + git fetch || return 1 + fi + + echo "Repo archive" + mkfifo $pkgname-$pkgver.git + git bundle create - $_gittag > $pkgname-$pkgver.git & + zip --fifo "${SRCDEST}"/$pkgname-$pkgver.git.zip $pkgname-$pkgver.git + rm $pkgname-$pkgver.git + + ln -s "$SRCDEST"/$pkgname-$pkgver.git.zip "$startdir"/$pkgname-$pkgver.git.zip +} + +unpack() { + default_unpack + cd "${srcdir}" + git clone $pkgname-$pkgver.git $pkgname --branch $_gittag 1>/dev/null 2>&1 +} + +prepare() { + local i failed= + [ -n "$builddir" -a -d "$builddir" ] && cd "$builddir" + + msg "Settings up bootstrap SDK" + if [ "${_bootstrap}" == 'true' ]; then + eng/common/dotnet-install.sh -runtime dotnet -version $_bootstrap_runtime + bash .dotnet/dotnet-install.sh --version $_bootstrap_sdk --install-dir ./ + bash .dotnet/dotnet-install.sh --version $_bootstrap_runtime --install-dir ./ --runtime dotnet + else + cp -r /usr/share/dotnet . + fi + + + # disable warnings + sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.common.props + + # TODO: core-setup src/pkg/packaging-tools/framework.dependency.targets ignored trailing version number for MicrosoftNETCoreRuntimeCoreCLRPackageVersion set by + # artifacts/obj/x64/Release/PackageVersions.props thus can't find transport.runtime.linux-x64.Microsoft.NETCore.Jit and transport.runtime.linux-x64.microsoft.netcore.runtime.coreclr + # + # Ideal solution: Make sure transport.runtime.$_targetrid.microsoft.netcore.runtime.coreclr is restored w/o buildid (like it is expected) + # No data + # + # Possible mitigation: Adjust PackageVersions.props to include build id + # Need to find where PackageVersions.props gets it versions. Probable artifacts/sources/coreclr/eng/Versions.props + # + # Possible hack: ln expected path to actual path (implemented) + # See below + # + for i in runtime.coreclr jit; do + [ -d "packages/restored/transport.runtime.$_targetrid.microsoft.netcore.$i" ] || mkdir -p "packages/restored/transport.runtime.$_targetrid.microsoft.netcore.$i" + ln -s ../transport.runtime.linux-musl-x64.microsoft.netcore.${i}/$_coreclrver.$_coreclrbld packages/restored/transport.runtime.$_targetrid.microsoft.netcore.$i/$_coreclrver + done + # + + # TODO: Figure out the whole ilasm / ildasm business. For now: + for i in ildasm ilasm; do + [ -f "Tools/source-built/coreclr-tools/x64/$i" ] || { mkdir -p "Tools/source-built/coreclr-tools/x64"; ln -s ../${i} Tools/source-built/coreclr-tools/x64/${i}; } + done + # + + export SOURCE_BUILD_SKIP_SUBMODULE_CHECK=1 + + if ! have_patches; then + return 0 + fi + [ -d "$builddir" ] || { error "Is \$builddir set correctly?"; return 1; } + + msg "Deploying patches" + for i in $source; do + case ${i%::*} in + build_*.patch) + patch ${patch_args:--p1} -i "$srcdir/$(filename_from_uri $i)" || failed="$failed $i" + ;; + *.patch) + local _package=$(echo ${i} | sed 's|_.*||') + local _patch=$(echo ${i} | sed "s|${_package}_||") + echo "cp $_patch -> $_package" + [ -d patches/$_package ] || mkdir patches/$_package + cp "$srcdir"/"$i" patches/${_package}/${_patch} + ;; + esac + done + if [ -z "$failed" ]; then + return 0 + fi + error "The following patches failed to apply:" + for i in $failed; do + printf " %s\n" "$i" + done + return 1 +} + +pkgver() { + cd "$builddir" + + local _runtimever=$(xmllint --xpath "//Dependency[@Name='Microsoft.NETCore.App.Runtime.win-x64']/@Version" eng/Version.Details.xml | cut -d '=' -f 2 | sed 's/^"//; s/"$//') + local _sdkver=$(xmllint --xpath "//Dependency[@Name='Microsoft.NET.Sdk']/@Version" eng/Version.Details.xml | cut -d '=' -f 2 | sed 's/^"//; s/"$//; s/-rtm.*//; s/-servicing.*//') + + echo "${_runtimever}.sdk${_sdkver##*.}" +} + +build() { + cd "$builddir" + + export SOURCE_BUILD_SKIP_SUBMODULE_CHECK=1 + + ./build.sh \ + --with-sdk ./ \ + /p:ArchiveDownloadedPackages=true \ + /p:ContinueOnPrebuiltBaselineError=true \ + /p:SkipPortableRuntimeBuild=true \ + /p:TargetRid=$_targetrid \ + /p:SkipPrebuiltEnforcement=true \ + /p:UseSystemLibraries=true \ + /p:UseSystemLibunwind=true +} + +package() { + depends=' + dotnet-sdk-3.1 + dotnet-host-3.1 + dotnet-runtime-3.1 + dotnet-targetting-pack-3.1 + aspnet-runtime-3.1 + aspnet-targeting-pack-3.1 + netstandard-targeting-pack-5.0 + ' + mkdir -p "${pkgdir}" +} + +sdk() { + depends=' + dotnet-runtime-3.1 + dotnet-targeting-pack-3.1 + musl + libgcc + netstandard-targeting-pack-5.0 + aspnet-targeting-pack-3.1 + ' + + # XXX: This is a hack to allow this abuild to depend on itself. Adding "dotnet" + # to makedepends would not work, because abuild implicitly removes $pkgname + # and $subpackages from the abuild's dependencies. + # + provides="dotnet-bootstrap-sdk-3.1=$pkgver-r$pkgrel" + + cd "$builddir"/artifacts/x64/Release + + install -dm 755 "$subpkgdir"/usr/share/dotnet "$subpkgdir"/usr/share/licenses + bsdtar -xf dotnet-sdk-${pkgver%.*}.*-$_targetrid.tar.gz -C "${subpkgdir}"/usr/share/dotnet/ --no-same-owner sdk templates + ln -s dotnet-host "${subpkgdir}"/usr/share/licenses/dotnet-sdk-3.1 +} + + +host() { + pkgdesc='A generic driver for the .NET Core Command Line Interface' + depends=' + gcc + musl + ' + + cd $builddir/artifacts/x64/Release + + install -dm 755 "$subpkgdir"/etc/profile.d "$subpkgdir"/usr/bin "$subpkgdir"/usr/lib "$subpkgdir"/usr/share/dotnet "$subpkgdir"/usr/share/licenses/dotnet-host + + bsdtar -xf dotnet-sdk-${pkgver%.*}.*-$_targetrid.tar.gz -C "${subpkgdir}"/usr/share/dotnet/ --no-same-owner dotnet host + bsdtar -xf dotnet-sdk-${pkgver%.*}.*-$_targetrid.tar.gz -C "${subpkgdir}"/usr/share/licenses/dotnet-host/ --no-same-owner LICENSE.txt ThirdPartyNotices.txt + ln -s /usr/share/dotnet/dotnet "${subpkgdir}"/usr/bin/dotnet + ln -s /usr/share/dotnet/host/fxr/${pkgver}/libhostfxr.so "${subpkgdir}"/usr/lib/libhostfxr.so + install -Dm 644 "${srcdir}"/dotnet.sh -t "${subpkgdir}"/etc/profile.d/ +} + +runtime() { + pkgdesc='The .NET Core runtime' + makedepends=' + icu-dev + krb5-dev + libunwind-dev + zlib-dev + openssl-dev + ' + depends=' + dotnet-host + libgcc + musl + icu + krb5-libs + libunwind + zlib + openssl + ' + + # XXX: This is a hack to allow this abuild to depend on itself. Adding "dotnet" + # to makedepends would not work, because abuild implicitly removes $pkgname + # and $subpackages from the abuild's dependencies. + # + provides="dotnet-bootstrap-runtime-3.1=$pkgver-r$pkgrel" + + cd "$builddir"/artifacts/x64/Release + + install -dm 755 "$subpkgdir"/usr/share/dotnet "$subpkgdir"/usr/share/licenses + bsdtar -xf dotnet-sdk-${pkgver%.*}.*-$_targetrid.tar.gz -C "${subpkgdir}"/usr/share/dotnet/ --no-same-owner shared/Microsoft.NETCore.App + ln -s dotnet-host "${subpkgdir}"/usr/share/licenses/dotnet-runtime-3.1 +} + +aspnet_runtime() { + pkgdesc='The ASP.NET Core runtime' + depends='dotnet-runtime-3.1' + + cd "$builddir"/artifacts/x64/Release + + install -dm 755 "$subpkgdir"/usr/share/dotnet "$subpkgdir"/usr/share/licenses + bsdtar -xf dotnet-sdk-${pkgver%.*}.*-$_targetrid.tar.gz -C "${subpkgdir}"/usr/share/dotnet/ --no-same-owner shared/Microsoft.AspNetCore.App + ln -s dotnet-host "${subpkgdir}"/usr/share/licenses/aspnet-runtime-3.1 +} + +targeting_pack() { + pkgdesc='The .NET Core targeting pack' + depends='netstandard-targeting-pack-5.0' + + cd "$builddir"/artifacts/x64/Release + + install -dm 755 "$subpkgdir"/usr/share/dotnet "$subpkgdir"/usr/share/licenses + bsdtar -xf dotnet-sdk-${pkgver%.*}.*-$_targetrid.tar.gz -C "${subpkgdir}"/usr/share/dotnet/ --no-same-owner packs/Microsoft.NETCore.App.Host.$_targetrid packs/Microsoft.NETCore.App.Ref + ln -s dotnet-host "${subpkgdir}"/usr/share/licenses/dotnet-targeting-pack-3.1 +} + +aspnet_targeting_pack() { + pkgdesc='The ASP.NET Core targeting pack' + depends='dotnet-targeting-pack-3.1' + + cd "$builddir"/artifacts/x64/Release + + install -dm 755 "$subpkgdir"/usr/share/dotnet "$subpkgdir"/usr/share/licenses + bsdtar -xf dotnet-sdk-${pkgver%.*}.*-$_targetrid.tar.gz -C "${subpkgdir}"/usr/share/dotnet/ --no-same-owner packs/Microsoft.AspNetCore.App.Ref + ln -s dotnet-host "${subpkgdir}"/usr/share/licenses/aspnet-targeting-pack-3.1 +} + +# vim: ts=2 sw=2 et: +sha512sums="f75e6c1fe0a3c1934ca018669f174716dd17b71af03a85bd48d3559f2069b1b2fffe00549fdad07ed787e330828e5672e6ac6802d1402802d2f1908c282287dd dotnet-3.1-3.1.16.git.zip +e61b9e3e5a2305646a616d598378230c9755c5dd5363692cc363f8f4add3807563c324dd86f3a7ae9d358c82d730608e7b293935a2b6c81c0c0f62d752a0a1cf dotnet.sh +b3475c0b727c5258c7bc6f4c53305f9ced991e57f9f46a2ad323bed40627662eb8bf57286bf6a22d9a22bfdea9282da4630dd094166f0805c783aece5df5dff3 coreclr_fix-build-on-Alpine-edge-45352.patch +9f56cf85f0b4dd3d4def525296f2d67ce3bc1e5180fb3598c6e26461d099644408502e9c8c0d866925be7792ac2af82c5cfea48a95858f96b87f93c3799744e9 corefx_fix-build-clang10.patch +8cdde0fee68e867aa859facfbb809099a317b371593e55f6c20a53c976b48b18a39a3c527ab13d534f6d7505813fdc47ebdf507c1e05c4dcd26c58c9f9e5cad1 xliff-tasks_use-netcoreapp21.patch +eda3e6453d2137d3b62635068583e7c91010cdaebf55da25f43081ecc135fae00aff41d65d99f15783ecc9087c8be4653687451e56a63ab98e09df0bec2b3b5c build_coreclr-tools-path.patch" diff --git a/apk/v3.13/main/dotnet-3.1/build_coreclr-tools-path.patch b/apk/v3.13/main/dotnet-3.1/build_coreclr-tools-path.patch new file mode 100644 index 0000000..dc21199 --- /dev/null +++ b/apk/v3.13/main/dotnet-3.1/build_coreclr-tools-path.patch @@ -0,0 +1,44 @@ +From b2148eeb23bd54513a11682c025976ee1798d682 Mon Sep 17 00:00:00 2001 +From: "build@apk-groulx" +Date: Wed, 14 Jul 2021 04:15:54 +0000 +Subject: [PATCH 1/1] dotnet-source-build-coreclr-tools-path.patch + +--- + repos/coreclr-portable.proj | 2 +- + repos/coreclr.proj | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/repos/coreclr-portable.proj b/repos/coreclr-portable.proj +index 78adc146..378547ea 100644 +--- a/repos/coreclr-portable.proj ++++ b/repos/coreclr-portable.proj +@@ -19,7 +19,7 @@ + Inputs="$(MSBuildProjectFullPath)" + Outputs="$(RepoCompletedSemaphorePath)CopyTools.complete"> + +- $(ToolPackageExtractDir)coreclr-tools/$(BuildArchitecture) ++ $(ToolPackageExtractDir)coreclr-tools + so + so + dylib +diff --git a/repos/coreclr.proj b/repos/coreclr.proj +index 7e67b283..6f7851b1 100644 +--- a/repos/coreclr.proj ++++ b/repos/coreclr.proj +@@ -15,11 +15,11 @@ + + + +- $(ToolPackageExtractDir)coreclr-tools/$(BuildArchitecture) ++ $(ToolPackageExtractDir)coreclr-tools + so + so + dylib +-- +2.30.2 + diff --git a/apk/v3.13/main/dotnet-3.1/core-setup_attempt-fix-transport-runtime.patch b/apk/v3.13/main/dotnet-3.1/core-setup_attempt-fix-transport-runtime.patch new file mode 100644 index 0000000..2bcf1e2 --- /dev/null +++ b/apk/v3.13/main/dotnet-3.1/core-setup_attempt-fix-transport-runtime.patch @@ -0,0 +1,26 @@ +From 0c83f6ee54f8eb40a9ed229ab3f11aa821b09dc5 Mon Sep 17 00:00:00 2001 +From: "build@apk-groulx" +Date: Wed, 14 Jul 2021 04:10:40 +0000 +Subject: [PATCH 1/1] Attempt at fixing unfindable version of + transport.runtime.linux-x64.microsoft.netcore.runtime.coreclr + +--- + src/pkg/packaging-tools/framework.dependency.targets | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pkg/packaging-tools/framework.dependency.targets b/src/pkg/packaging-tools/framework.dependency.targets +index 3c34242d..a73ea003 100644 +--- a/src/pkg/packaging-tools/framework.dependency.targets ++++ b/src/pkg/packaging-tools/framework.dependency.targets +@@ -238,7 +238,7 @@ + <_runtimePackageId>transport.runtime.$(PackageRID).$(MicrosoftNETCoreRuntimeCoreCLRPackage.ToLowerInvariant()) + <_runtimePackageVersion>$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) + +- <_runtimePackageDir>$(PackagesDir)$(_runtimePackageId)/$(_runtimePackageVersion)/ ++ <_runtimePackageDir>$(PackagesDir)$(_runtimePackageId)/$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion)/ + <_jitPackageDir>$(PackagesDir)transport.runtime.$(PackageRID).microsoft.netcore.jit/$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion)/ + <_corefxPackageDir>$(PackagesDir)runtime.$(PackageRID).$(MicrosoftPrivateCoreFxNETCoreAppPackage.ToLowerInvariant())/$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)/ + <_winmdPackageDir>$(PackagesDir)$(MicrosoftTargetingPackPrivateWinRTPackage.ToLowerInvariant())/$(MicrosoftTargetingPackPrivateWinRTPackageVersion)/ +-- +2.30.2 + diff --git a/apk/v3.13/main/dotnet-3.1/coreclr_fix-build-on-Alpine-edge-45352.patch b/apk/v3.13/main/dotnet-3.1/coreclr_fix-build-on-Alpine-edge-45352.patch new file mode 100644 index 0000000..b4a701e --- /dev/null +++ b/apk/v3.13/main/dotnet-3.1/coreclr_fix-build-on-Alpine-edge-45352.patch @@ -0,0 +1,31 @@ +From 1c1678176e499ef0709edc7d35fec0d69d17f636 Mon Sep 17 00:00:00 2001 +From: "build@apk-groulx" +Date: Sat, 10 Jul 2021 06:02:50 +0000 +Subject: [PATCH] Fix build on Alpine edge (#45352) + +--- + src/pal/src/include/pal/palinternal.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/pal/src/include/pal/palinternal.h b/src/pal/src/include/pal/palinternal.h +index 77978f30d7..bcc8d0d947 100644 +--- a/src/pal/src/include/pal/palinternal.h ++++ b/src/pal/src/include/pal/palinternal.h +@@ -173,6 +173,7 @@ function_name() to call the system's implementation + #define memset DUMMY_memset + #define memmove DUMMY_memmove + #define memchr DUMMY_memchr ++#define atoll DUMMY_atoll + #define strlen DUMMY_strlen + #define stricmp DUMMY_stricmp + #define strstr DUMMY_strstr +@@ -371,6 +372,7 @@ function_name() to call the system's implementation + #undef memset + #undef memmove + #undef memchr ++#undef atoll + #undef strlen + #undef strnlen + #undef wcsnlen +-- +2.30.2 diff --git a/apk/v3.13/main/dotnet-3.1/corefx_fix-build-clang10.patch b/apk/v3.13/main/dotnet-3.1/corefx_fix-build-clang10.patch new file mode 100644 index 0000000..c03f376 --- /dev/null +++ b/apk/v3.13/main/dotnet-3.1/corefx_fix-build-clang10.patch @@ -0,0 +1,13 @@ + +diff -rupN corefx.620cea9ccf0359993e803c900059932966399584.orig/src/Native/Unix/CMakeLists.txt corefx.620cea9ccf0359993e803c900059932966399584/src/Native/Unix/CMakeLists.txt +--- corefx.620cea9ccf0359993e803c900059932966399584.orig/src/Native/Unix/CMakeLists.txt 2020-06-23 18:07:14.111464986 +0200 ++++ corefx.620cea9ccf0359993e803c900059932966399584/src/Native/Unix/CMakeLists.txt 2020-06-23 18:08:56.147153789 +0200 +@@ -18,6 +18,8 @@ add_compile_options(-Wno-empty-translati + add_compile_options(-Wno-cast-align) + add_compile_options(-Wno-typedef-redefinition) + add_compile_options(-Wno-c11-extensions) ++add_compile_options(-Wno-sign-conversion) ++add_compile_options(-Wno-unused-result) + add_compile_options(-fPIC) + add_compile_options(-I${CMAKE_CURRENT_SOURCE_DIR}/Common) + add_compile_options(-I${CMAKE_CURRENT_BINARY_DIR}/Common) diff --git a/apk/v3.13/main/dotnet-3.1/dotnet.sh b/apk/v3.13/main/dotnet-3.1/dotnet.sh new file mode 100644 index 0000000..fcc0bfd --- /dev/null +++ b/apk/v3.13/main/dotnet-3.1/dotnet.sh @@ -0,0 +1,12 @@ +# Set location for AppHost lookup +[ -z "$DOTNET_ROOT" ] && export DOTNET_ROOT=/usr/share/dotnet + +# 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/apk/v3.13/main/dotnet-3.1/xliff-tasks_use-netcoreapp21.patch b/apk/v3.13/main/dotnet-3.1/xliff-tasks_use-netcoreapp21.patch new file mode 100644 index 0000000..1129b81 --- /dev/null +++ b/apk/v3.13/main/dotnet-3.1/xliff-tasks_use-netcoreapp21.patch @@ -0,0 +1,67 @@ +From d5749e5d22db7930bb2a1c7b53dae3d3840c03dc Mon Sep 17 00:00:00 2001 +From: "build@apk-groulx" +Date: Sat, 10 Jul 2021 19:32:29 +0000 +Subject: [PATCH] Updated to netcore 2.1 + +--- + src/XliffTasks/XliffTasks.csproj | 7 ++++--- + src/XliffTasks/build/XliffTasks.targets | 5 ++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/XliffTasks/XliffTasks.csproj b/src/XliffTasks/XliffTasks.csproj +index d967ac3..a8332e9 100644 +--- a/src/XliffTasks/XliffTasks.csproj ++++ b/src/XliffTasks/XliffTasks.csproj +@@ -3,14 +3,15 @@ + + + +- netcoreapp2.0;net46 +- netcoreapp2.0 ++ netcoreapp2.1;net46 ++ netcoreapp2.1 + tools + false + true + true + MIT + 7.2 ++ true + + + +@@ -23,7 +24,7 @@ + + + +- ++ + + + +diff --git a/src/XliffTasks/build/XliffTasks.targets b/src/XliffTasks/build/XliffTasks.targets +index 40df6d1..a9c09cf 100644 +--- a/src/XliffTasks/build/XliffTasks.targets ++++ b/src/XliffTasks/build/XliffTasks.targets +@@ -4,8 +4,7 @@ + + + +- $(MSBuildAllProjects);$(MSBuildThisFileFullPath) +- $(MSBuildThisFileDirectory)..\tools\netcoreapp2.0\ ++ $(MSBuildThisFileDirectory)..\tools\netcoreapp2.1\ + $(MSBuildThisFileDirectory)..\tools\net46\ + $(XliffTasksDirectory)XliffTasks.dll + +@@ -64,7 +63,7 @@ + /> + + + +-- +2.30.2 + diff --git a/apk/v3.13/main/dotnet-5.0/APKBUILD b/apk/v3.13/main/dotnet-5.0/APKBUILD new file mode 100644 index 0000000..f885b62 --- /dev/null +++ b/apk/v3.13/main/dotnet-5.0/APKBUILD @@ -0,0 +1,320 @@ +# Maintainer: Antoine Martin (ayakael) + +# Based on Archlinux PKGBUILD by: +# Maxime Gauduin +# Kristian Mosegaard +# Max Liebkies +# Krzysztof Bogacki + +# Build vars +_bootstrap=true +_bootstrap_sdk=5.0.205 +_bootstrap_runtime=3.1.1 +_targetrid=alpine.3.13-x64 +_llvmver=10 + +pkgname=dotnet-5.0 +pkgdesc='The .NET Core SDK' +pkgver=5.0.7 +pkgrel=0 +arch='x86_64' +url=https://www.microsoft.com/net/core +license='MIT' +makedepends=" + bash + clang + cmake + git + icu-dev + inetutils-syslogd + krb5-dev + libgit2-dev + libunwind-dev + libunwind + libxml2-dev + libxml2-utils + lldb-dev + llvm$_llvmver-dev + lttng-ust-dev + nodejs + openssl-dev + zlib-dev +" +if [ ${_bootstrap} != 'true' ]; then + makedepends=" + ${makedepends} + dotnet-bootstrap-runtime-3.1 + dotnet-bootstrap-sdk-5.0 + " +fi + +#depends=' +# icu-libs +# krb5-libs +# libgcc +# #libgdiplus +# libintl +# libssl1.1 +# libstdc++zlib +#' +subpackages="dotnet-sdk-5.0:sdk dotnet-host-5.0:host dotnet-runtime-5.0:runtime aspnet-runtime-5.0:aspnet_runtime:noarch netstandard-targeting-pack-5.0:netstandard_targeting_pack-5.0:noarch $pkgname-targeting-pack-5.0:targeting_pack aspnet-targeting-pack-5.0:aspnet_targeting_pack:noarch" +_gittag=v${pkgver}-runtime +_giturl=https://github.com/dotnet/source-build +options="!check !archcheck" +source=" + $pkgname-$pkgver.git.zip + https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh + dotnet.sh + runtime_link-order.patch + sdk_telemetry-optout.patch + build_darc-fix-alpine.patch + +" +# runtime_illink-target-fix.patch +# build_applicationinsights-alternative-source.patch +# applications-insights_fix-net40-location.patch +# runtime_alpine-non-portable-rid-fix.patch + +# TODO: Code 139 when trying to exec "/var/build/build/apk/v3.13/main/dotnet-5.0/src/dotnet-5.0/dotnet" "/var/build/build/apk/v3.13/main/dotnet-5.0/src/dotnet-5.0/artifacts/src/roslyn.59eedc33d35754759994155ea2f4e1012a9951e3/artifacts/bin/CodeStyleConfigFileGenerator/Release/netcoreapp3.1/CodeStyleConfigFileGenerator.dll" "CSharp" "/var/build/build/apk/v3.13/main/dotnet-5.0/src/dotnet-5.0/artifacts/src/roslyn.59eedc33d35754759994155ea2f4e1012a9951e3/artifacts/bin/Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes/Release/netstandard2.0" "Microsoft.CodeAnalysis.CSharp.CodeStyle.targets" "/var/build/build/apk/v3.13/main/dotnet-5.0/src/dotnet-5.0/artifacts/src/roslyn.59eedc33d35754759994155ea2f4e1012a9951e3/artifacts/bin/Microsoft.CodeAnalysis.CodeStyle/Release/netstandard2.0/Microsoft.CodeAnalysis.CodeStyle.dll;/var/build/build/apk/v3.13/main/dotnet-5.0/src/dotnet-5.0/artifacts/src/roslyn.59eedc33d35754759994155ea2f4e1012a9951e3/artifacts/bin/Microsoft.CodeAnalysis.CSharp.CodeStyle/Release/netstandard2.0/Microsoft.CodeAnalysis.CSharp.CodeStyle.dll from within build +# Have to do it via shell when roslyn crashes. +# Associated with line 34 of src/CodeStyle/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj +# +# TODO: Illink fails to find dotnet +# + +builddir="$srcdir/$pkgname" + +snapshot() { + mkdir -p "$srcdir" + cd "${srcdir}" + if ! [ -d $pkgname.git ]; then + git clone $_giturl $pkgname.git || return 1 + cd $pkgname.git + else + cd $pkgname.git + git fetch || return 1 + fi + + echo "Repo archive" + mkfifo $pkgname-$pkgver.git + git bundle create - $_gittag > $pkgname-$pkgver.git & + zip --fifo "${SRCDEST}"/$pkgname-$pkgver.git.zip $pkgname-$pkgver.git + rm $pkgname-$pkgver.git + + ln -s "$SRCDEST"/$pkgname-$pkgver.git.zip "$startdir"/$pkgname-$pkgver.git.zip +} + +unpack() { + default_unpack + cd "${srcdir}" + git clone $pkgname-$pkgver.git $pkgname --branch $_gittag 1>/dev/null 2>&1 +} + + +prepare() { + local i failed= + [ -n "$builddir" -a -d "$builddir" ] && cd "$builddir" + + msg "Settings up bootstrap SDK" + if [ "${_bootstrap}" == 'true' ]; then + eng/common/dotnet-install.sh -runtime dotnet -version $_bootstrap_runtime + bash .dotnet/dotnet-install.sh --version $_bootstrap_sdk --install-dir ./ + bash .dotnet/dotnet-install.sh --version $_bootstrap_runtime --install-dir ./ --runtime dotnet + else + cp -r /usr/share/dotnet . + fi + + + # disable warnings + sed -i 's|skiptests|skiptests ignorewarnings|' repos/runtime.common.props + export SOURCE_BUILD_SKIP_SUBMODULE_CHECK=1 + + if ! have_patches; then + return 0 + fi + [ -d "$builddir" ] || { error "Is \$builddir set correctly?"; return 1; } + + msg "Deploying patches" + for i in $source; do + case ${i%::*} in + build_*.patch) + patch ${patch_args:--p1} -i "$srcdir/$(filename_from_uri $i)" || failed="$failed $i" + ;; + *.patch) + local _package=$(echo ${i} | sed 's|_.*||') + local _patch=$(echo ${i} | sed "s|${_package}_||") + echo "cp $_patch -> $_package" + [ -d patches/$_package ] || mkdir patches/$_package + cp "$srcdir"/"$i" patches/${_package}/${_patch} + ;; + esac + done + if [ -z "$failed" ]; then + return 0 + fi + error "The following patches failed to apply:" + for i in $failed; do + printf " %s\n" "$i" + done + return 1 +} + +pkgver() { + cd "$builddir" + + local _runtimever=$(xmllint --xpath "//Dependency[@Name='Microsoft.NETCore.App.Runtime.win-x64']/@Version" eng/Version.Details.xml | cut -d '=' -f 2 | sed 's/^"//; s/"$//') + local _sdkver=$(xmllint --xpath "//Dependency[@Name='Microsoft.NET.Sdk']/@Version" eng/Version.Details.xml | cut -d '=' -f 2 | sed 's/^"//; s/"$//; s/-rtm.*//; s/-servicing.*//') + + echo "${_runtimever}.sdk${_sdkver##*.}" +} + +build() { + cd "${builddir}" + msg "Building $pkgname-$pkgver" + ./build.sh \ + --with-sdk ../$pkgname \ + /p:ArchiveDownloadedPackages=true \ + /p:ContinueOnPrebuiltBaselineError=true \ + /p:SkipPortableRuntimeBuild=true \ + /p:SkipPrebuiltEnforcement=true \ + /p:UseSystemLibraries=true \ + /p:UseSystemLibunwind=true +# /p:TargetRid=$_targetrid \ +} + +package() { + depends=' + dotnet-sdk-5.0 + dotnet-host-5.0 + dotnet-runtime-5.0 + dotnet-targetting-pack-5.0 + aspnet-runtime-5.0 + aspnet-targeting-pack-5.0 + netstandard-targeting-pack-5.0 + ' + mkdir -p "${pkgdir}" +} + +sdk() { + depends=' + dotnet-runtime-5.0 + dotnet-targeting-pack-5.0 + musl + libgcc + netstandard-targeting-pack-5.0 + aspnet-targeting-pack-5.0 + ' + + # XXX: This is a hack to allow this abuild to depend on itself. Adding "dotnet" + # to makedepends would not work, because abuild implicitly removes $pkgname + # and $subpackages from the abuild's dependencies. + provides="dotnet-bootstrak-sdk-5.0=$pkgver-r$pkgrel" + + cd "$builddir"/artifacts/x64/Release + + install -dm 755 "$subpkgdir"/usr/share/dotnet "$subpkgdir"/usr/share/licenses + bsdtar -xf dotnet-sdk-*.tar.gz -C "${subpkgdir}"/usr/share/dotnet/ --no-same-owner sdk templates + ln -s dotnet-host "${subpkgdir}"/usr/share/licenses/dotnet-sdk-5.0 +} + + +host() { + pkgdesc='A generic driver for the .NET Core Command Line Interface' + depends=' + gcc + musl + ' + + cd $builddir/artifacts/x64/Release + + install -dm 755 "$subpkgdir"/etc/profile.d "$subpkgdir"/usr/bin "$subpkgdir"/usr/lib "$subpkgdir"/usr/share/dotnet "$subpkgdir"/usr/share/licenses/dotnet-host + + bsdtar -xf dotnet-sdk-*.tar.gz -C "${subpkgdir}"/usr/share/dotnet/ --no-same-owner dotnet host + bsdtar -xf dotnet-sdk-*.tar.gz -C "${subpkgdir}"/usr/share/licenses/dotnet-host/ --no-same-owner LICENSE.txt ThirdPartyNotices.txt + ln -s /usr/share/dotnet/dotnet "${subpkgdir}"/usr/bin/dotnet + ln -s /usr/share/dotnet/host/fxr/${pkgver}/libhostfxr.so "${subpkgdir}"/usr/lib/libhostfxr.so + install -Dm 644 "${srcdir}"/dotnet.sh -t "${subpkgdir}"/etc/profile.d/ +} + +runtime() { + pkgdesc='The .NET Core runtime' + makedepends=' + icu-dev + krb5-dev + libunwind-dev + zlib-dev + openssl-dev + ' + depends=' + dotnet-host-5.0 + libgcc + musl + icu + krb5-libs + libunwind + zlib + openssl + ' + # XXX: This is a hack to allow this abuild to depend on itself. Adding "dotnet" + # # to makedepends would not work, because abuild implicitly removes $pkgname + # # and $subpackages from the abuild's dependencies. + # + provides="dotnet-bootstrap-runtime-5.0=$pkgver-r$pkgrel" + + cd "$builddir"/artifacts/x64/Release + + install -dm 755 "$subpkgdir"/usr/share/dotnet "$subpkgdir"/usr/share/licenses + bsdtar -xf dotnet-sdk-*.tar.gz -C "${subpkgdir}"/usr/share/dotnet/ --no-same-owner shared/Microsoft.NETCore.App + ln -s dotnet-host "${subpkgdir}"/usr/share/licenses/dotnet-runtime-5.0 +} + +aspnet_runtime() { + pkgdesc='The ASP.NET Core runtime' + depends='dotnet-runtime-5.0' + + cd "$builddir"/artifacts/x64/Release + + install -dm 755 "$subpkgdir"/usr/share/dotnet "$subpkgdir"/usr/share/licenses + bsdtar -xf dotnet-sdk-*.tar.gz -C "${subpkgdir}"/usr/share/dotnet/ --no-same-owner shared/Microsoft.AspNetCore.App + ln -s dotnet-host "${subpkgdir}"/usr/share/licenses/aspnet-runtime-5.0 +} + +netstandard_targeting_pack() { + pkgdesc='The .NET Standard targeting pack' + + cd "$builddir"/artifacts/x64/Release + + install -dm 755 "$subpkgdir"/usr/share/dotnet "$subpkgdir"/usr/share/licenses + bsdtar -xf dotnet-sdk-*.tar.gz -C "${subpkgdir}"/usr/share/dotnet/ --no-same-owner packs/NETStandard.Library.Ref + ln -s dotnet-host "${subpkgdir}"/usr/share/licenses/netstandard-targeting-pack-5.0 +} + +targeting_pack() { + pkgdesc='The .NET Core targeting pack' + depends='netstandard-targeting-pack-5.0' + + cd "$builddir"/artifacts/x64/Release + + install -dm 755 "$subpkgdir"/usr/share/dotnet "$subpkgdir"/usr/share/licenses + bsdtar -xf dotnet-sdk-*.tar.gz -C "${subpkgdir}"/usr/share/dotnet/ --no-same-owner packs/Microsoft.NETCore.App.Host.$_targetrid packs/Microsoft.NETCore.App.Ref + ln -s dotnet-host "${subpkgdir}"/usr/share/licenses/dotnet-targeting-pack-5.0 +} + +aspnet_targeting_pack() { + pkgdesc='The ASP.NET Core targeting pack' + depends='dotnet-targeting-pack-5.0' + + cd "$builddir"/artifacts/x64/Release + + install -dm 755 "$subpkgdir"/usr/share/dotnet "$subpkgdir"/usr/share/licenses + bsdtar -xf dotnet-sdk-*.tar.gz -C "${subpkgdir}"/usr/share/dotnet/ --no-same-owner packs/Microsoft.AspNetCore.App.Ref + ln -s dotnet-host "${subpkgdir}"/usr/share/licenses/aspnet-targeting-pack-5.0 +} + +# vim: ts=2 sw=2 et: +sha512sums="d4ef91c590b2a0f696ca0a49dd3d09505b0445b3252ebcd093f8cfec3defb988fe546afa9e493c2d48b3d05ad56c9f604b125402f117e18946768c1124c93ff5 dotnet-5.0-5.0.7.git.zip +ecab4809e617e9cd30940b1c1a700e16b37b5974c850a60da7f1a25bf81516850e4533ef39d2d8786381e0e4e325d3b53fbb2377ecaa6c0813bb00fc1c92b784 dotnet-install.sh +f58bd83b709dcb4b0b67830756069c34258a167b33cb290cbf30f21d69d75402d38e013fd7bbf00640fe19e397f78df6ff787cf8484ee8967d5b8809f033eafb dotnet.sh +ad57d02371d351106e043fa104e31afbb0d6799e7ce0ea1a26f585abbfbab7bcba734c7e70491c4af5bfbed965a9ed3235cf4bc1019f504baf482518193b10a7 runtime_link-order.patch +c96700138ea919c169c3a394f1bf9548c7f86b1ba42b193d6e7bb0a1e2bd6f7f202befbc61246a8720181cd40e1f7fa36a6c208eb19b03a23e21994136fb2507 sdk_telemetry-optout.patch +74767c34f15e0eaee3682516e093296621efaeeb6d84e62d826587db9b559fb7c00c42aafbf4fdfd34460d1cf16edad3fd5f720f2b37f8bf52b26d7f73f79d5e build_darc-fix-alpine.patch" diff --git a/apk/v3.13/main/dotnet-5.0/applications-insights_fix-net40-location.patch b/apk/v3.13/main/dotnet-5.0/applications-insights_fix-net40-location.patch new file mode 100644 index 0000000..753b310 --- /dev/null +++ b/apk/v3.13/main/dotnet-5.0/applications-insights_fix-net40-location.patch @@ -0,0 +1,17 @@ +From 387efb0ac01e40cd85cf9f5ce770be6437265ca4 Mon Sep 17 00:00:00 2001 +From: "build@apk-groulx" +Date: Fri, 4 Jun 2021 13:32:53 +0000 +Subject: [PATCH] FIxed Net40 location + +--- + src/Core/Managed/{Net40 => net40}/CorrelationHelper.cs | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + rename src/Core/Managed/{Net40 => net40}/CorrelationHelper.cs (100%) + +diff --git a/src/Core/Managed/Net40/CorrelationHelper.cs b/src/Core/Managed/net40/CorrelationHelper.cs +similarity index 100% +rename from src/Core/Managed/Net40/CorrelationHelper.cs +rename to src/Core/Managed/net40/CorrelationHelper.cs +-- +2.30.2 + diff --git a/apk/v3.13/main/dotnet-5.0/build_applicationinsights-alternative-source.patch b/apk/v3.13/main/dotnet-5.0/build_applicationinsights-alternative-source.patch new file mode 100644 index 0000000..324b837 --- /dev/null +++ b/apk/v3.13/main/dotnet-5.0/build_applicationinsights-alternative-source.patch @@ -0,0 +1,30 @@ +From f8861719b8a4a64df0228bb63dcec72ceb08d562 Mon Sep 17 00:00:00 2001 +From: "build@apk-groulx" +Date: Thu, 3 Jun 2021 20:10:24 +0000 +Subject: [PATCH] Fixed problematic version of ApplicationInsights-dotnet, + pushed to v2.2.0 + +--- + eng/Version.Details.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml +index 0b7309c6..bc626e4b 100644 +--- a/eng/Version.Details.xml ++++ b/eng/Version.Details.xml +@@ -73,9 +73,9 @@ + 0e89c2116ad28e404ba56c14d1c3f938caa25a01 + clicommandlineparser + +- ++ +- https://github.com/Microsoft/ApplicationInsights-dotnet ++ https://github.com/SergeyRazmyslov/ApplicationInsights-dotnet +- 53b80940842204f78708a538628288ff5d741a1d ++ 53b80940842204f78708a538628288ff5d741a1d + application-insights + + +-- +2.30.2 + diff --git a/apk/v3.13/main/dotnet-5.0/build_darc-fix-alpine.patch b/apk/v3.13/main/dotnet-5.0/build_darc-fix-alpine.patch new file mode 100644 index 0000000..9731c43 --- /dev/null +++ b/apk/v3.13/main/dotnet-5.0/build_darc-fix-alpine.patch @@ -0,0 +1,26 @@ +From d07d50c6f8a5793badc50fb2c964b87dec87a3a1 Mon Sep 17 00:00:00 2001 +From: "build@apk-groulx" +Date: Thu, 15 Jul 2021 15:37:33 +0000 +Subject: [PATCH 1/1] Fixed darc init for Alpine + +--- + eng/common/darc-init.sh | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh +index 82b2b57..5227a37 100755 +--- a/eng/common/darc-init.sh ++++ b/eng/common/darc-init.sh +@@ -77,6 +77,9 @@ function InstallDarcCli { + else + echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity --tool-path "$toolpath") + fi ++ for i in win* ubuntu.1* rhel-x64 osx fedora-x64 debian*; do ++ rm -R $toolpath/.store/microsoft.dotnet.darc/*/microsoft.dotnet.darc/*/tools/netcoreapp3.0/any/runtimes/${i} ++ done + } + + InstallDarcCli +-- +2.30.2 + diff --git a/apk/v3.13/main/dotnet-5.0/dotnet.sh b/apk/v3.13/main/dotnet-5.0/dotnet.sh new file mode 100644 index 0000000..085d677 --- /dev/null +++ b/apk/v3.13/main/dotnet-5.0/dotnet.sh @@ -0,0 +1,13 @@ +# Set location for AppHost lookup +[ -z "$DOTNET_ROOT" ] && export DOTNET_ROOT=/usr/share/dotnet + +# 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/apk/v3.13/main/dotnet-5.0/runtime_alpine-non-portable-rid-fix.patch b/apk/v3.13/main/dotnet-5.0/runtime_alpine-non-portable-rid-fix.patch new file mode 100644 index 0000000..23a7e2c --- /dev/null +++ b/apk/v3.13/main/dotnet-5.0/runtime_alpine-non-portable-rid-fix.patch @@ -0,0 +1,25 @@ +From bc6f00bf2734cf900b456c505ae59e70bfb7bdbd Mon Sep 17 00:00:00 2001 +From: "build@apk-groulx" +Date: Thu, 3 Jun 2021 18:19:15 +0000 +Subject: [PATCH] Fix last version digit present on alpine non-portable build + +--- + eng/native/init-distro-rid.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/eng/native/init-distro-rid.sh b/eng/native/init-distro-rid.sh +index f71aa8640b1..bef677c77d4 100644 +--- a/eng/native/init-distro-rid.sh ++++ b/eng/native/init-distro-rid.sh +@@ -41,7 +41,7 @@ initNonPortableDistroRid() + # We have forced __PortableBuild=0. This is because -portablebuld + # has been passed as false. + if (( isPortable == 0 )); then +- if [ "${ID}" = "rhel" ]; then ++ if [ "${ID}" = "rhel" ] || [ "${ID}" = "alpine" ]; then + # remove the last version digit + VERSION_ID="${VERSION_ID%.*}" + fi +-- +2.30.2 + diff --git a/apk/v3.13/main/dotnet-5.0/runtime_illink-target-fix.patch b/apk/v3.13/main/dotnet-5.0/runtime_illink-target-fix.patch new file mode 100644 index 0000000..d15899f --- /dev/null +++ b/apk/v3.13/main/dotnet-5.0/runtime_illink-target-fix.patch @@ -0,0 +1,27 @@ +From c82d6ad7fa2dfbfa4168adb6b6adf1c5c1b1214d Mon Sep 17 00:00:00 2001 +From: "build@apk-groulx" +Date: Sat, 17 Jul 2021 14:28:50 +0000 +Subject: [PATCH 1/1] hardcode illink target + +--- + eng/illink.targets | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/eng/illink.targets b/eng/illink.targets +index 928e9934858..3aff0f38dbd 100644 +--- a/eng/illink.targets ++++ b/eng/illink.targets +@@ -289,8 +289,8 @@ + RootAssemblyNames="" + OutputDirectory="$(ILLinkTrimOutputPath)" + ExtraArgs="$(ILLinkArgs)" +- ToolExe="$(_DotNetHostFileName)" +- ToolPath="$(_DotNetHostDirectory)" /> ++ ToolExe="dotnet" ++ ToolPath="$(DotNetRoot)" /> + + + +-- +2.30.2 + diff --git a/apk/v3.13/main/dotnet-5.0/runtime_link-order.patch b/apk/v3.13/main/dotnet-5.0/runtime_link-order.patch new file mode 100644 index 0000000..bcf86c4 --- /dev/null +++ b/apk/v3.13/main/dotnet-5.0/runtime_link-order.patch @@ -0,0 +1,19 @@ +--- runtime.f27d33729518f5aa478aa818b7b4f54a4d50bef1.orig/src/installer/corehost/cli/apphost/static/CMakeLists.txt 2021-03-16 15:05:11.692543567 +0000 ++++ runtime.f27d33729518f5aa478aa818b7b4f54a4d50bef1/src/installer/corehost/cli/apphost/static/CMakeLists.txt 2021-03-16 15:06:51.581738910 +0000 +@@ -207,12 +207,12 @@ target_link_libraries( + libhostcommon + ${CORECLR_LIBRARIES} + +- ${ZLIB_LIBRARIES} +- ${LIBGSS} +- ${NATIVE_LIBS_EXTRA} +- + ${START_WHOLE_ARCHIVE} + ${RUNTIMEINFO_LIB} + ${NATIVE_LIBS} + ${END_WHOLE_ARCHIVE} ++ ++ ${ZLIB_LIBRARIES} ++ ${LIBGSS} ++ ${NATIVE_LIBS_EXTRA} + ) diff --git a/apk/v3.13/main/dotnet-5.0/sdk_telemetry-optout.patch b/apk/v3.13/main/dotnet-5.0/sdk_telemetry-optout.patch new file mode 100644 index 0000000..c15a6e3 --- /dev/null +++ b/apk/v3.13/main/dotnet-5.0/sdk_telemetry-optout.patch @@ -0,0 +1,12 @@ +diff -rupN sdk.51369266643769f9f0c1184e89715cd1045126d0.orig/src/Cli/dotnet/Program.cs sdk.51369266643769f9f0c1184e89715cd1045126d0/src/Cli/dotnet/Program.cs +--- sdk.51369266643769f9f0c1184e89715cd1045126d0.orig/src/Cli/dotnet/Program.cs 2021-04-15 07:25:31.290095535 +0000 ++++ sdk.51369266643769f9f0c1184e89715cd1045126d0/src/Cli/dotnet/Program.cs 2021-04-15 07:27:01.742066297 +0000 +@@ -187,7 +187,7 @@ namespace Microsoft.DotNet.Cli + bool generateAspNetCertificate = + environmentProvider.GetEnvironmentVariableAsBool("DOTNET_GENERATE_ASPNET_CERTIFICATE", defaultValue: true); + bool telemetryOptout = +- environmentProvider.GetEnvironmentVariableAsBool("DOTNET_CLI_TELEMETRY_OPTOUT", defaultValue: false); ++ environmentProvider.GetEnvironmentVariableAsBool("DOTNET_CLI_TELEMETRY_OPTOUT", defaultValue: true); + bool addGlobalToolsToPath = + environmentProvider.GetEnvironmentVariableAsBool("DOTNET_ADD_GLOBAL_TOOLS_TO_PATH", defaultValue: true); + bool nologo =