From 3e6ec137db6a9a416c076239cdd22deecb9e87a1 Mon Sep 17 00:00:00 2001 From: "build@apk-groulx" Date: Sat, 4 Dec 2021 22:29:12 +0000 Subject: [PATCH] Cleaning up --- apk/v3.15/testing/dotnet-3.1/APKBUILD | 351 ------------------ ...ications-insights_fix-net40-location.patch | 17 - ...plicationinsights-alternative-source.patch | 30 -- .../dotnet-3.1/build_coreclr-tools-path.patch | 44 --- .../dotnet-3.1/build_darc-fix-alpine.patch | 26 -- ...-setup_attempt-fix-transport-runtime.patch | 26 -- ...reclr_fix-build-on-Alpine-edge-45352.patch | 31 -- .../dotnet-3.1/corefx_fix-build-clang10.patch | 25 -- apk/v3.15/testing/dotnet-3.1/dotnet.sh | 12 - .../3.1.17-servicing | 1 - .../3.1.17-servicing | 1 - .../xliff-tasks_use-netcoreapp21.patch | 67 ---- apk/v3.15/testing/dotnet-5.0/APKBUILD | 325 ---------------- ...lication-insights_fix-net40-location.patch | 17 - ...plicationinsights-alternative-source.patch | 30 -- .../dotnet-5.0/build_darc-fix-alpine.patch | 26 -- .../build_remove-runtime-install.patch | 26 -- apk/v3.15/testing/dotnet-5.0/dotnet.sh | 13 - .../runtime_add-rid-for-alpine-315.patch | 200 ---------- .../runtime_alpine-non-portable-rid-fix.patch | 25 -- ...time_fix-build-on-alpine-linux-45352.patch | 35 -- ...digit-present-on-alpine-non-portable.patch | 25 -- .../runtime_illink-target-fix.patch | 27 -- .../dotnet-5.0/runtime_link-order.patch | 19 - .../dotnet-5.0/sdk_telemetry-optout.patch | 12 - .../0001-Final-good-version-of-dotnet.patch | 25 -- apk/v3.15/testing/git-annex/APKBUILD | 12 +- 27 files changed, 6 insertions(+), 1442 deletions(-) delete mode 100644 apk/v3.15/testing/dotnet-3.1/APKBUILD delete mode 100644 apk/v3.15/testing/dotnet-3.1/applications-insights_fix-net40-location.patch delete mode 100644 apk/v3.15/testing/dotnet-3.1/build_applicationinsights-alternative-source.patch delete mode 100644 apk/v3.15/testing/dotnet-3.1/build_coreclr-tools-path.patch delete mode 100644 apk/v3.15/testing/dotnet-3.1/build_darc-fix-alpine.patch delete mode 100644 apk/v3.15/testing/dotnet-3.1/core-setup_attempt-fix-transport-runtime.patch delete mode 100644 apk/v3.15/testing/dotnet-3.1/coreclr_fix-build-on-Alpine-edge-45352.patch delete mode 100644 apk/v3.15/testing/dotnet-3.1/corefx_fix-build-clang10.patch delete mode 100644 apk/v3.15/testing/dotnet-3.1/dotnet.sh delete mode 120000 apk/v3.15/testing/dotnet-3.1/packages/restored/transport.runtime.linux-musl-x64.microsoft.netcore.jit/3.1.17-servicing delete mode 120000 apk/v3.15/testing/dotnet-3.1/packages/restored/transport.runtime.linux-musl-x64.microsoft.netcore.runtime.coreclr/3.1.17-servicing delete mode 100644 apk/v3.15/testing/dotnet-3.1/xliff-tasks_use-netcoreapp21.patch delete mode 100644 apk/v3.15/testing/dotnet-5.0/APKBUILD delete mode 100644 apk/v3.15/testing/dotnet-5.0/application-insights_fix-net40-location.patch delete mode 100644 apk/v3.15/testing/dotnet-5.0/build_applicationinsights-alternative-source.patch delete mode 100644 apk/v3.15/testing/dotnet-5.0/build_darc-fix-alpine.patch delete mode 100644 apk/v3.15/testing/dotnet-5.0/build_remove-runtime-install.patch delete mode 100644 apk/v3.15/testing/dotnet-5.0/dotnet.sh delete mode 100644 apk/v3.15/testing/dotnet-5.0/runtime_add-rid-for-alpine-315.patch delete mode 100644 apk/v3.15/testing/dotnet-5.0/runtime_alpine-non-portable-rid-fix.patch delete mode 100644 apk/v3.15/testing/dotnet-5.0/runtime_fix-build-on-alpine-linux-45352.patch delete mode 100644 apk/v3.15/testing/dotnet-5.0/runtime_fix-last-version-digit-present-on-alpine-non-portable.patch delete mode 100644 apk/v3.15/testing/dotnet-5.0/runtime_illink-target-fix.patch delete mode 100644 apk/v3.15/testing/dotnet-5.0/runtime_link-order.patch delete mode 100644 apk/v3.15/testing/dotnet-5.0/sdk_telemetry-optout.patch delete mode 100644 apk/v3.15/testing/git-annex/0001-Final-good-version-of-dotnet.patch diff --git a/apk/v3.15/testing/dotnet-3.1/APKBUILD b/apk/v3.15/testing/dotnet-3.1/APKBUILD deleted file mode 100644 index 6d0aeea..0000000 --- a/apk/v3.15/testing/dotnet-3.1/APKBUILD +++ /dev/null @@ -1,351 +0,0 @@ -# Maintainer: Antoine Martin (ayakael) - -# Based on Archlinux PKGBUILD by: -# Maxime Gauduin -# Kristian Mosegaard -# Max Liebkies -# Krzysztof Bogacki - -# Build vars -_bootstrap=false -_bootstrap_runtime='3.1.17-r2' -_bootstrap_sdk='3.1.115' -_targetrid=linux-musl-x64 -_coreclrver=3.1.17-servicing -_coreclrbld=21304.2 -_llvmver=12 - -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=$_bootstrap_runtime - " -fi - -#depends=' -# icu-libs -# krb5-libs -# libgcc -# #libgdiplus -# libintl -# libssl1.1 -# libstdc++zlib -# -subpackages="dotnet-sdk-3.1:sdk 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} - corefx_fix-build-clang10.patch - xliff-tasks_use-netcoreapp21.patch - coreclr_fix-build-on-Alpine-edge-45352.patch - applications-insights_fix-net40-location.patch - build_coreclr-tools-path.patch - build_applicationinsights-alternative-source.patch - build_darc-fix-alpine.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 ../$pkgname \ - /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 - dotnet-runtime-3.1 - dotnet-targeting-pack-3.1 - aspnet-runtime-3.1 - aspnet-targeting-pack-3.1 - netstandard-targeting-pack - ' - mkdir -p "${pkgdir}" -} - -sdk() { - depends=' - dotnet-runtime-3.1 - dotnet-targeting-pack-3.1 - musl - libgcc - netstandard-targeting-pack - 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' - - 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 -} - -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-${pkgver%.*}.*-$_targetrid.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-3.1 -} - -# vim: ts=2 sw=2 et: -sha512sums=" -55f67eba5b88048cb1d0c1d858efdc394904a2a5a3fc8f704f1741efc19607af98f3821afb8b11b0b95922ef3cc8e173bd0a1681ae861f206300c5a8c2a5490d dotnet-3.1-3.1.17.git.zip -e61b9e3e5a2305646a616d598378230c9755c5dd5363692cc363f8f4add3807563c324dd86f3a7ae9d358c82d730608e7b293935a2b6c81c0c0f62d752a0a1cf dotnet.sh -594cbbbd4f127bf370a6d99b2786897a6d5ad881fd859a6408d9e6fd250ca578c94f11061325538845ee1c785b053099ad15848bba1bfa98b7557dff9505729e corefx_fix-build-clang10.patch -8cdde0fee68e867aa859facfbb809099a317b371593e55f6c20a53c976b48b18a39a3c527ab13d534f6d7505813fdc47ebdf507c1e05c4dcd26c58c9f9e5cad1 xliff-tasks_use-netcoreapp21.patch -b3475c0b727c5258c7bc6f4c53305f9ced991e57f9f46a2ad323bed40627662eb8bf57286bf6a22d9a22bfdea9282da4630dd094166f0805c783aece5df5dff3 coreclr_fix-build-on-Alpine-edge-45352.patch -0469d571d0f7634d3794761f04e1cbff9d27d642d134a11a13560574280e5cab6f366eb8820e61a449eca99470fdea8d9f6a7d97b633059b2fe25257ed1579e6 applications-insights_fix-net40-location.patch -eda3e6453d2137d3b62635068583e7c91010cdaebf55da25f43081ecc135fae00aff41d65d99f15783ecc9087c8be4653687451e56a63ab98e09df0bec2b3b5c build_coreclr-tools-path.patch -58a3e93e5fb6247569c291f86db127cbbc6cc6842eaf0973c2a211d4806f08dcabd9781b7da567088d820a337d58d6375230ade991dcc77e170266675c4a97e5 build_applicationinsights-alternative-source.patch -74767c34f15e0eaee3682516e093296621efaeeb6d84e62d826587db9b559fb7c00c42aafbf4fdfd34460d1cf16edad3fd5f720f2b37f8bf52b26d7f73f79d5e build_darc-fix-alpine.patch -" diff --git a/apk/v3.15/testing/dotnet-3.1/applications-insights_fix-net40-location.patch b/apk/v3.15/testing/dotnet-3.1/applications-insights_fix-net40-location.patch deleted file mode 100644 index 753b310..0000000 --- a/apk/v3.15/testing/dotnet-3.1/applications-insights_fix-net40-location.patch +++ /dev/null @@ -1,17 +0,0 @@ -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.15/testing/dotnet-3.1/build_applicationinsights-alternative-source.patch b/apk/v3.15/testing/dotnet-3.1/build_applicationinsights-alternative-source.patch deleted file mode 100644 index 324b837..0000000 --- a/apk/v3.15/testing/dotnet-3.1/build_applicationinsights-alternative-source.patch +++ /dev/null @@ -1,30 +0,0 @@ -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.15/testing/dotnet-3.1/build_coreclr-tools-path.patch b/apk/v3.15/testing/dotnet-3.1/build_coreclr-tools-path.patch deleted file mode 100644 index dc21199..0000000 --- a/apk/v3.15/testing/dotnet-3.1/build_coreclr-tools-path.patch +++ /dev/null @@ -1,44 +0,0 @@ -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.15/testing/dotnet-3.1/build_darc-fix-alpine.patch b/apk/v3.15/testing/dotnet-3.1/build_darc-fix-alpine.patch deleted file mode 100644 index 9731c43..0000000 --- a/apk/v3.15/testing/dotnet-3.1/build_darc-fix-alpine.patch +++ /dev/null @@ -1,26 +0,0 @@ -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.15/testing/dotnet-3.1/core-setup_attempt-fix-transport-runtime.patch b/apk/v3.15/testing/dotnet-3.1/core-setup_attempt-fix-transport-runtime.patch deleted file mode 100644 index 2bcf1e2..0000000 --- a/apk/v3.15/testing/dotnet-3.1/core-setup_attempt-fix-transport-runtime.patch +++ /dev/null @@ -1,26 +0,0 @@ -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.15/testing/dotnet-3.1/coreclr_fix-build-on-Alpine-edge-45352.patch b/apk/v3.15/testing/dotnet-3.1/coreclr_fix-build-on-Alpine-edge-45352.patch deleted file mode 100644 index b4a701e..0000000 --- a/apk/v3.15/testing/dotnet-3.1/coreclr_fix-build-on-Alpine-edge-45352.patch +++ /dev/null @@ -1,31 +0,0 @@ -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.15/testing/dotnet-3.1/corefx_fix-build-clang10.patch b/apk/v3.15/testing/dotnet-3.1/corefx_fix-build-clang10.patch deleted file mode 100644 index 2ed1ea0..0000000 --- a/apk/v3.15/testing/dotnet-3.1/corefx_fix-build-clang10.patch +++ /dev/null @@ -1,25 +0,0 @@ -From cfd492403e5a0f8d7d170937ca71a2bbe40563a3 Mon Sep 17 00:00:00 2001 -From: "build@apk-groulx" -Date: Thu, 29 Jul 2021 19:49:08 +0000 -Subject: [PATCH 1/1] fix build clang10 - ---- - src/Native/Unix/CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/Native/Unix/CMakeLists.txt b/src/Native/Unix/CMakeLists.txt -index c5772c7e02..910823581d 100644 ---- a/src/Native/Unix/CMakeLists.txt -+++ b/src/Native/Unix/CMakeLists.txt -@@ -26,6 +26,8 @@ add_compile_options(-Wno-empty-translation-unit) - 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(-I${CMAKE_CURRENT_SOURCE_DIR}/Common) - add_compile_options(-I${CMAKE_CURRENT_BINARY_DIR}/Common) - add_compile_options(-g) --- -2.32.0 - diff --git a/apk/v3.15/testing/dotnet-3.1/dotnet.sh b/apk/v3.15/testing/dotnet-3.1/dotnet.sh deleted file mode 100644 index fcc0bfd..0000000 --- a/apk/v3.15/testing/dotnet-3.1/dotnet.sh +++ /dev/null @@ -1,12 +0,0 @@ -# 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.15/testing/dotnet-3.1/packages/restored/transport.runtime.linux-musl-x64.microsoft.netcore.jit/3.1.17-servicing b/apk/v3.15/testing/dotnet-3.1/packages/restored/transport.runtime.linux-musl-x64.microsoft.netcore.jit/3.1.17-servicing deleted file mode 120000 index 9356f59..0000000 --- a/apk/v3.15/testing/dotnet-3.1/packages/restored/transport.runtime.linux-musl-x64.microsoft.netcore.jit/3.1.17-servicing +++ /dev/null @@ -1 +0,0 @@ -../transport.runtime.linux-musl-x64.microsoft.netcore.jit/3.1.17-servicing.21304.5 \ No newline at end of file diff --git a/apk/v3.15/testing/dotnet-3.1/packages/restored/transport.runtime.linux-musl-x64.microsoft.netcore.runtime.coreclr/3.1.17-servicing b/apk/v3.15/testing/dotnet-3.1/packages/restored/transport.runtime.linux-musl-x64.microsoft.netcore.runtime.coreclr/3.1.17-servicing deleted file mode 120000 index 53360dd..0000000 --- a/apk/v3.15/testing/dotnet-3.1/packages/restored/transport.runtime.linux-musl-x64.microsoft.netcore.runtime.coreclr/3.1.17-servicing +++ /dev/null @@ -1 +0,0 @@ -../transport.runtime.linux-musl-x64.microsoft.netcore.runtime.coreclr/3.1.17-servicing.21304.5 \ No newline at end of file diff --git a/apk/v3.15/testing/dotnet-3.1/xliff-tasks_use-netcoreapp21.patch b/apk/v3.15/testing/dotnet-3.1/xliff-tasks_use-netcoreapp21.patch deleted file mode 100644 index 1129b81..0000000 --- a/apk/v3.15/testing/dotnet-3.1/xliff-tasks_use-netcoreapp21.patch +++ /dev/null @@ -1,67 +0,0 @@ -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.15/testing/dotnet-5.0/APKBUILD b/apk/v3.15/testing/dotnet-5.0/APKBUILD deleted file mode 100644 index 7ace1e4..0000000 --- a/apk/v3.15/testing/dotnet-5.0/APKBUILD +++ /dev/null @@ -1,325 +0,0 @@ -# Maintainer: Antoine Martin (ayakael) - -# Based on Archlinux PKGBUILD by: -# Maxime Gauduin -# Kristian Mosegaard -# Max Liebkies -# Krzysztof Bogacki - -# Build vars -_bootstrap=false -_bootstrap_sdk=5.0.8-r1 -_bootstrap_runtime=3.1.17-r2 -_targetrid=alpine.3.15-x64 -_llvmver=12 - -pkgname=dotnet-5.0 -pkgdesc='The .NET Core SDK' -pkgver=5.0.12 -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=$_bootstrap_runtime - dotnet-bootstrap-sdk-5.0=$_bootstrap_sdk - " -fi - -#depends=' -# icu-libs -# krb5-libs -# libgcc -# #libgdiplus -# libintl -# libssl1.1 -# libstdc++zlib -#' -subpackages="dotnet-sdk-5.0:sdk dotnet-host:host dotnet-runtime-5.0:runtime aspnet-runtime-5.0:aspnet_runtime:noarch netstandard-targeting-pack:netstandard_targeting_pack:noarch dotnet-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 - dotnet.sh - https://dot.net/v1/dotnet-install.sh -" -# Patches -source=" - ${source} - runtime_link-order.patch - runtime_add-rid-for-alpine-315.patch - runtime_fix-last-version-digit-present-on-alpine-non-portable.patch - application-insights_fix-net40-location.patch - sdk_telemetry-optout.patch - build_darc-fix-alpine.patch - build_remove-runtime-install.patch - build_applicationinsights-alternative-source.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 - chmod +x "${srcdir}"/dotnet-install.sh - "$srcdir"/dotnet-install.sh --version ${_bootstrap_sdk} --install-dir ./ - "$srcdir"/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 - - 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" - - export SOURCE_BUILD_SKIP_SUBMODULE_CHECK=1 - - ./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 - dotnet-runtime-5.0 - dotnet-targetting-pack-5.0 - aspnet-runtime-5.0 - aspnet-targeting-pack-5.0 - netstandard-targeting-pack - ' - mkdir -p "${pkgdir}" -} - -sdk() { - depends=' - dotnet-runtime-5.0 - dotnet-targeting-pack-5.0 - musl - libgcc - netstandard-targeting-pack - 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-bootstrap-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 - 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' - - 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=" -8ad768f65bd0358282ed80a1e60cfccbe003b9fdd087918d56839701a02a2fe9ebf00bde0213293743fbb7602db5064de10251419b7b53df0fdd708e761a0d15 dotnet-5.0-5.0.12.git.zip -f58bd83b709dcb4b0b67830756069c34258a167b33cb290cbf30f21d69d75402d38e013fd7bbf00640fe19e397f78df6ff787cf8484ee8967d5b8809f033eafb dotnet.sh -ecab4809e617e9cd30940b1c1a700e16b37b5974c850a60da7f1a25bf81516850e4533ef39d2d8786381e0e4e325d3b53fbb2377ecaa6c0813bb00fc1c92b784 dotnet-install.sh -ad57d02371d351106e043fa104e31afbb0d6799e7ce0ea1a26f585abbfbab7bcba734c7e70491c4af5bfbed965a9ed3235cf4bc1019f504baf482518193b10a7 runtime_link-order.patch -ab2293a581e5ffaba2fd6c82dd83c4d00ea1f032c00587a38bbaa50411d32bbf5009a0ee754bdde81862079c4961f9ee70025dc63c8abe6cd833a5d9c289030c runtime_add-rid-for-alpine-315.patch -944461da9ed50d536195ab3572b15fdfa74713344a4ca5e31bed627f09fbf328dd0d1f66599553d474e766cacdba7146c701180810383245fcdce1aba39bfef3 runtime_fix-last-version-digit-present-on-alpine-non-portable.patch -0469d571d0f7634d3794761f04e1cbff9d27d642d134a11a13560574280e5cab6f366eb8820e61a449eca99470fdea8d9f6a7d97b633059b2fe25257ed1579e6 application-insights_fix-net40-location.patch -c96700138ea919c169c3a394f1bf9548c7f86b1ba42b193d6e7bb0a1e2bd6f7f202befbc61246a8720181cd40e1f7fa36a6c208eb19b03a23e21994136fb2507 sdk_telemetry-optout.patch -74767c34f15e0eaee3682516e093296621efaeeb6d84e62d826587db9b559fb7c00c42aafbf4fdfd34460d1cf16edad3fd5f720f2b37f8bf52b26d7f73f79d5e build_darc-fix-alpine.patch -b3bf420ddd2bba28a012800af3bb740429b19b81fe7ca7c252de9fa65ee99d601f9d2484ac516d224799fc8586e9ce00cd730f9f6113d0411fe326f149ec7e3c build_remove-runtime-install.patch -58a3e93e5fb6247569c291f86db127cbbc6cc6842eaf0973c2a211d4806f08dcabd9781b7da567088d820a337d58d6375230ade991dcc77e170266675c4a97e5 build_applicationinsights-alternative-source.patch -" diff --git a/apk/v3.15/testing/dotnet-5.0/application-insights_fix-net40-location.patch b/apk/v3.15/testing/dotnet-5.0/application-insights_fix-net40-location.patch deleted file mode 100644 index 753b310..0000000 --- a/apk/v3.15/testing/dotnet-5.0/application-insights_fix-net40-location.patch +++ /dev/null @@ -1,17 +0,0 @@ -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.15/testing/dotnet-5.0/build_applicationinsights-alternative-source.patch b/apk/v3.15/testing/dotnet-5.0/build_applicationinsights-alternative-source.patch deleted file mode 100644 index 324b837..0000000 --- a/apk/v3.15/testing/dotnet-5.0/build_applicationinsights-alternative-source.patch +++ /dev/null @@ -1,30 +0,0 @@ -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.15/testing/dotnet-5.0/build_darc-fix-alpine.patch b/apk/v3.15/testing/dotnet-5.0/build_darc-fix-alpine.patch deleted file mode 100644 index 9731c43..0000000 --- a/apk/v3.15/testing/dotnet-5.0/build_darc-fix-alpine.patch +++ /dev/null @@ -1,26 +0,0 @@ -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.15/testing/dotnet-5.0/build_remove-runtime-install.patch b/apk/v3.15/testing/dotnet-5.0/build_remove-runtime-install.patch deleted file mode 100644 index 6245058..0000000 --- a/apk/v3.15/testing/dotnet-5.0/build_remove-runtime-install.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 47d5121ae6ec33de1d2fe48d5700999ec0b685da Mon Sep 17 00:00:00 2001 -From: "build@apk-groulx" -Date: Sat, 31 Jul 2021 21:44:44 +0000 -Subject: [PATCH 1/1] Remove runtime install - ---- - build.sh | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/build.sh b/build.sh -index b2fe4ad..99f8923 100755 ---- a/build.sh -+++ b/build.sh -@@ -125,9 +125,6 @@ fi - set -x - scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - --# runtime 3.1.1 required for darc --"$scriptroot/eng/common/dotnet-install.sh" -runtime dotnet -version 3.1.1 -- - if [ "$alternateTarget" == "true" ]; then - "$CLIPATH/dotnet" $SDKPATH/MSBuild.dll "$scriptroot/build.proj" /bl:source-build-test.binlog /flp:v=diag /clp:v=m "$@" - else --- -2.32.0 - diff --git a/apk/v3.15/testing/dotnet-5.0/dotnet.sh b/apk/v3.15/testing/dotnet-5.0/dotnet.sh deleted file mode 100644 index 085d677..0000000 --- a/apk/v3.15/testing/dotnet-5.0/dotnet.sh +++ /dev/null @@ -1,13 +0,0 @@ -# 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.15/testing/dotnet-5.0/runtime_add-rid-for-alpine-315.patch b/apk/v3.15/testing/dotnet-5.0/runtime_add-rid-for-alpine-315.patch deleted file mode 100644 index 3762e4c..0000000 --- a/apk/v3.15/testing/dotnet-5.0/runtime_add-rid-for-alpine-315.patch +++ /dev/null @@ -1,200 +0,0 @@ -From 09e477fd876de48614d728fbd6582db2a0f203b7 Mon Sep 17 00:00:00 2001 -From: "build@apk-groulx" -Date: Mon, 29 Nov 2021 20:39:25 +0000 -Subject: [PATCH 1/1] add RID for Alpine 3.15 - ---- - .../runtime.compatibility.json | 116 +++++++++++++++++- - .../Microsoft.NETCore.Platforms/runtime.json | 25 +++- - .../runtimeGroups.props | 2 +- - 3 files changed, 140 insertions(+), 3 deletions(-) - -diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json -index 844590f8022..7d7517f043b 100644 ---- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json -+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json -@@ -508,6 +508,120 @@ - "any", - "base" - ], -+ "alpine.3.15": [ -+ "alpine.3.15", -+ "alpine.3.14", -+ "alpine.3.13", -+ "alpine.3.12", -+ "alpine.3.11", -+ "alpine.3.10", -+ "alpine.3.9", -+ "alpine.3.8", -+ "alpine.3.7", -+ "alpine.3.6", -+ "alpine", -+ "linux-musl", -+ "linux", -+ "unix", -+ "any", -+ "base" -+ ], -+ "alpine.3.15-arm": [ -+ "alpine.3.15", -+ "alpine.3.15-arm", -+ "alpine.3.14-arm", -+ "alpine.3.14", -+ "alpine.3.13-arm", -+ "alpine.3.13", -+ "alpine.3.12-arm", -+ "alpine.3.12", -+ "alpine.3.11-arm", -+ "alpine.3.11", -+ "alpine.3.10-arm", -+ "alpine.3.10", -+ "alpine.3.9-arm", -+ "alpine.3.9", -+ "alpine.3.8-arm", -+ "alpine.3.8", -+ "alpine.3.7-arm", -+ "alpine.3.7", -+ "alpine.3.6-arm", -+ "alpine.3.6", -+ "alpine-arm", -+ "alpine", -+ "linux-musl-arm", -+ "linux-musl", -+ "linux-arm", -+ "linux", -+ "unix-arm", -+ "unix", -+ "any", -+ "base" -+ ], -+ "alpine.3.15-arm64": [ -+ "alpine.3.15-arm64", -+ "alpine.3.15", -+ "alpine.3.14-arm64", -+ "alpine.3.14", -+ "alpine.3.13-arm64", -+ "alpine.3.13", -+ "alpine.3.12-arm64", -+ "alpine.3.12", -+ "alpine.3.11-arm64", -+ "alpine.3.11", -+ "alpine.3.10-arm64", -+ "alpine.3.10", -+ "alpine.3.9-arm64", -+ "alpine.3.9", -+ "alpine.3.8-arm64", -+ "alpine.3.8", -+ "alpine.3.7-arm64", -+ "alpine.3.7", -+ "alpine.3.6-arm64", -+ "alpine.3.6", -+ "alpine-arm64", -+ "alpine", -+ "linux-musl-arm64", -+ "linux-musl", -+ "linux-arm64", -+ "linux", -+ "unix-arm64", -+ "unix", -+ "any", -+ "base" -+ ], -+ "alpine.3.15-x64": [ -+ "alpine.3.15-x64", -+ "alpine.3.15", -+ "alpine.3.14-x64", -+ "alpine.3.14", -+ "alpine.3.13-x64", -+ "alpine.3.13", -+ "alpine.3.12-x64", -+ "alpine.3.12", -+ "alpine.3.11-x64", -+ "alpine.3.11", -+ "alpine.3.10-x64", -+ "alpine.3.10", -+ "alpine.3.9-x64", -+ "alpine.3.9", -+ "alpine.3.8-x64", -+ "alpine.3.8", -+ "alpine.3.7-x64", -+ "alpine.3.7", -+ "alpine.3.6-x64", -+ "alpine.3.6", -+ "alpine-x64", -+ "alpine", -+ "linux-musl-x64", -+ "linux-musl", -+ "linux-x64", -+ "linux", -+ "unix-x64", -+ "unix", -+ "any", -+ "base" -+ ], - "alpine.3.6": [ - "alpine.3.6", - "alpine", -@@ -7239,4 +7353,4 @@ - "any", - "base" - ] --} -\ No newline at end of file -+} -diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json -index 7d6aa102b50..ea7eac422b8 100644 ---- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json -+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json -@@ -138,6 +138,29 @@ - "alpine.3.13-x64" - ] - }, -+ "alpine.3.15": { -+ "#import": [ -+ "alpine.3.14" -+ ] -+ }, -+ "alpine.3.15-arm": { -+ "#import": [ -+ "alpine.3.15", -+ "alpine.3.14-arm" -+ ] -+ }, -+ "alpine.3.15-arm64": { -+ "#import": [ -+ "alpine.3.15", -+ "alpine.3.14-arm64" -+ ] -+ }, -+ "alpine.3.15-x64": { -+ "#import": [ -+ "alpine.3.15", -+ "alpine.3.14-x64" -+ ] -+ }, - "alpine.3.6": { - "#import": [ - "alpine" -@@ -3196,4 +3219,4 @@ - ] - } - } --} -\ No newline at end of file -+} -diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props -index 3cb3d2df858..c7a346d1672 100644 ---- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props -+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props -@@ -16,7 +16,7 @@ - - linux-musl - x64;arm;arm64 -- 3.6;3.7;3.8;3.9;3.10;3.11;3.12;3.13;3.14 -+ 3.6;3.7;3.8;3.9;3.10;3.11;3.12;3.13;3.14;3.15 - - - --- -2.34.0 - diff --git a/apk/v3.15/testing/dotnet-5.0/runtime_alpine-non-portable-rid-fix.patch b/apk/v3.15/testing/dotnet-5.0/runtime_alpine-non-portable-rid-fix.patch deleted file mode 100644 index 23a7e2c..0000000 --- a/apk/v3.15/testing/dotnet-5.0/runtime_alpine-non-portable-rid-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -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.15/testing/dotnet-5.0/runtime_fix-build-on-alpine-linux-45352.patch b/apk/v3.15/testing/dotnet-5.0/runtime_fix-build-on-alpine-linux-45352.patch deleted file mode 100644 index 7d81961..0000000 --- a/apk/v3.15/testing/dotnet-5.0/runtime_fix-build-on-alpine-linux-45352.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 839ad29b16a8baf7b1470f13d7faa0ce941769b3 Mon Sep 17 00:00:00 2001 -From: Jan Vorlicek -Date: Mon, 30 Nov 2020 16:11:36 +0100 -Subject: [PATCH] Fix build on Alpine edge (#45352) - -The atoll definition in the pal.h was leaking into the PAL implementation and -on Alpine edge, the difference in throws() classification was causing a build -break. ---- - src/coreclr/src/pal/src/include/pal/palinternal.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/coreclr/src/pal/src/include/pal/palinternal.h b/src/coreclr/src/pal/src/include/pal/palinternal.h -index e73720bec73..4ad42a03a13 100644 ---- a/src/coreclr/src/pal/src/include/pal/palinternal.h -+++ b/src/coreclr/src/pal/src/include/pal/palinternal.h -@@ -170,6 +170,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 -@@ -357,6 +358,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.15/testing/dotnet-5.0/runtime_fix-last-version-digit-present-on-alpine-non-portable.patch b/apk/v3.15/testing/dotnet-5.0/runtime_fix-last-version-digit-present-on-alpine-non-portable.patch deleted file mode 100644 index 23a7e2c..0000000 --- a/apk/v3.15/testing/dotnet-5.0/runtime_fix-last-version-digit-present-on-alpine-non-portable.patch +++ /dev/null @@ -1,25 +0,0 @@ -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.15/testing/dotnet-5.0/runtime_illink-target-fix.patch b/apk/v3.15/testing/dotnet-5.0/runtime_illink-target-fix.patch deleted file mode 100644 index d15899f..0000000 --- a/apk/v3.15/testing/dotnet-5.0/runtime_illink-target-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -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.15/testing/dotnet-5.0/runtime_link-order.patch b/apk/v3.15/testing/dotnet-5.0/runtime_link-order.patch deleted file mode 100644 index bcf86c4..0000000 --- a/apk/v3.15/testing/dotnet-5.0/runtime_link-order.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- 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.15/testing/dotnet-5.0/sdk_telemetry-optout.patch b/apk/v3.15/testing/dotnet-5.0/sdk_telemetry-optout.patch deleted file mode 100644 index c15a6e3..0000000 --- a/apk/v3.15/testing/dotnet-5.0/sdk_telemetry-optout.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 = diff --git a/apk/v3.15/testing/git-annex/0001-Final-good-version-of-dotnet.patch b/apk/v3.15/testing/git-annex/0001-Final-good-version-of-dotnet.patch deleted file mode 100644 index a40efa4..0000000 --- a/apk/v3.15/testing/git-annex/0001-Final-good-version-of-dotnet.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 53eb29cdc73134e6d60dc55faf5ef9f2fa2f9b5c Mon Sep 17 00:00:00 2001 -From: "build@apk-groulx" -Date: Tue, 20 Jul 2021 20:03:20 +0000 -Subject: [PATCH 1/1] Final good version of dotnet - ---- - apk/v3.13/main/dotnet-5.0/APKBUILD | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/apk/v3.13/main/dotnet-5.0/APKBUILD b/apk/v3.13/main/dotnet-5.0/APKBUILD -index f5f0e1c..e769b2b 100644 ---- a/apk/v3.13/main/dotnet-5.0/APKBUILD -+++ b/apk/v3.13/main/dotnet-5.0/APKBUILD -@@ -57,7 +57,7 @@ fi - # 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" -+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:noarch dotnet-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" --- -2.34.0 - diff --git a/apk/v3.15/testing/git-annex/APKBUILD b/apk/v3.15/testing/git-annex/APKBUILD index 40fe3c9..c9bb1f1 100644 --- a/apk/v3.15/testing/git-annex/APKBUILD +++ b/apk/v3.15/testing/git-annex/APKBUILD @@ -5,7 +5,7 @@ # pkgname=git-annex -pkgver=8.20211123 +pkgver=8.20211203 pkgrel=0 pkgdesc="Manage files with git, without checking their contents into git" url="http://git-annex.branchable.com" @@ -13,12 +13,13 @@ arch="i686 x86_64" license="GPL3" depends="git lsof rsync curl gmp zlib gnupg file gnutls libxml2 openssh util-linux libidn libgsasl" makedepends="cabal ghc zlib-dev file-dev gnutls-dev libxml2-dev libgsasl-dev ncurses-dev happy alex libffi-dev" +_gittag=490689f122f4cce63cbd6aa29f5b59c6caf09d09 +_giturl=https://git.joeyh.name/index.cgi/git-annex.git source=" - https://git.joeyh.name/index.cgi/git-annex.git/snapshot/$pkgname-$pkgver.tar.gz - 0001-Added-dependency-for-ghc-9.0.1-for-cabal.patch + $_giturl/snapshot/$pkgname-${_gittag}.tar.gz " subpackages="$pkgname-doc" -builddir="$srcdir/$pkgname-$pkgver" +builddir="$srcdir/$pkgname-$_gittag" # # Build feature flags @@ -168,6 +169,5 @@ package() { sha512sums=" -cd5eb30e71bd580867b9a92d33dc2338f239919765a7c03f5caf1b772cf9059d6d4b6899087a62d141968546d1a6187dbac11858fe93ba7fabcaa543be863613 git-annex-8.20211123.tar.gz -67c231183468503202b064822eaabbf3597e6a8bec8c0f74596187b8ad804cf0bbdf056627d6e78f7d188c34ca099291a592ce640b1362b618fc2473cd464823 0001-Added-dependency-for-ghc-9.0.1-for-cabal.patch +329cdb1acd54d33298c528297e6e102b6f02618ca8b132e45fa9c5007bf3fce9c1d0d336ff5135e8e1f1bd7f3fd6fea641a7da1a1658721d89681d0f1249706d git-annex-490689f122f4cce63cbd6aa29f5b59c6caf09d09.tar.gz "