From 7ec0b1d117059855f83ffada4ac87878429dec6d Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Thu, 16 Feb 2023 00:07:47 -0500 Subject: [PATCH] Update to .NET SDK 6.0.114 and Runtime 6.0.14 --- .gitignore | 1 + build-dotnet-tarball | 14 ++--- dotnet6.0.spec | 17 +++--- rename-tarball | 66 --------------------- runtime-82210-rid-fedora-39.patch | 98 +++++++++++++++++++++++++++++++ sdk-22373-portablerid.patch | 22 ------- sources | 2 +- tests/tests.yml | 5 +- update-release | 8 +-- 9 files changed, 124 insertions(+), 109 deletions(-) delete mode 100755 rename-tarball create mode 100644 runtime-82210-rid-fedora-39.patch delete mode 100644 sdk-22373-portablerid.patch diff --git a/.gitignore b/.gitignore index c54f104..c4e452f 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /dotnet-v6.0.111.tar.gz /dotnet-v6.0.112.tar.gz /dotnet-v6.0.113.tar.gz +/dotnet-v6.0.114.tar.gz diff --git a/build-dotnet-tarball b/build-dotnet-tarball index 948bb56..fafcd74 100755 --- a/build-dotnet-tarball +++ b/build-dotnet-tarball @@ -123,21 +123,21 @@ if [ ! -f "${unmodified_tarball_name}.tar.gz" ]; then git submodule update --init --recursive clean_dotnet_cache mkdir -p "../${unmodified_tarball_name}" - ./build.sh /p:ArcadeBuildTarball=true /p:TarballDir="$(readlink -f ../"${unmodified_tarball_name}")" - popd + ./build.sh /p:ArcadeBuildTarball=true + + mv artifacts/packages/Debug/Shipping/dotnet-sdk-source-6.*.tar.gz \ + ../../"${unmodified_tarball_name}.tar.gz" popd - - tar cf "${unmodified_tarball_name}.tar.gz" -C "${temp_dir}" "${unmodified_tarball_name}" + popd rm -rf "${temp_dir}" fi rm -rf "${tarball_name}" -tar xf "${unmodified_tarball_name}.tar.gz" -mv "${unmodified_tarball_name}" "${tarball_name}" - +mkdir -p "${tarball_name}" pushd "${tarball_name}" +tar xf ../"${unmodified_tarball_name}.tar.gz" if [[ ${build_bootstrap} == true ]]; then if [[ "$(wc -l < packages/archive/archiveArtifacts.txt)" != 1 ]]; then diff --git a/dotnet6.0.spec b/dotnet6.0.spec index 4ce011a..dcbb48f 100644 --- a/dotnet6.0.spec +++ b/dotnet6.0.spec @@ -20,10 +20,10 @@ # until that's done, disable LTO. This has to happen before setting the flags below. %define _lto_cflags %{nil} -%global host_version 6.0.13 -%global runtime_version 6.0.13 +%global host_version 6.0.14 +%global runtime_version 6.0.14 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 6.0.113 +%global sdk_version 6.0.114 %global sdk_feature_band_version %(echo %{sdk_version} | sed -e 's|[[:digit:]][[:digit:]]$|00|') %global templates_version %{runtime_version} #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') @@ -60,7 +60,7 @@ Name: dotnet6.0 Version: %{sdk_rpm_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: .NET Runtime and SDK License: MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib URL: https://github.com/dotnet/ @@ -86,6 +86,8 @@ Source11: dotnet.sh.in Patch100: runtime-arm64-lld-fix.patch # Mono still has a dependency on (now unbuildable) ILStrip which was removed from CoreCLR: https://github.com/dotnet/runtime/pull/60315 Patch101: runtime-mono-remove-ilstrip.patch +# https://github.com/dotnet/runtime/pull/82210 +Patch102: runtime-82210-rid-fedora-39.patch # Disable apphost, needed for s390x Patch500: fsharp-no-apphost.patch @@ -109,8 +111,6 @@ Patch1001: msbuild-no-systemconfiguration.patch # Disable telemetry by default; make it opt-in Patch1500: sdk-telemetry-optout.patch -# https://github.com/dotnet/sdk/pull/22373 -Patch1501: sdk-22373-portablerid.patch @@ -394,6 +394,7 @@ sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime/src/native/corehost/ pushd src/runtime %patch100 -p1 %patch101 -p1 +%patch102 -p1 popd pushd src/fsharp @@ -426,7 +427,6 @@ popd pushd src/sdk %patch1500 -p1 -%patch1501 -p1 popd pushd src/installer @@ -639,6 +639,9 @@ export COMPlus_LTTng=0 %changelog +* Wed Feb 15 2023 Omair Majid - 6.0.114-1 +- Update to .NET SDK 6.0.114 and Runtime 6.0.14 + * Thu Jan 19 2023 Fedora Release Engineering - 6.0.113-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/rename-tarball b/rename-tarball deleted file mode 100755 index 5bc1109..0000000 --- a/rename-tarball +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash - -# Usage: -# ./rename-tarball original-name.tar.gz new-name.tar.gz -# -# The generated new-name.tar.gz will always have a single main -# directory (named new-name to match the tarball name) in the archive. -# If the original tarball had multiple files in the main directory of -# the archive, all those files will be moved to under the new main -# directory. - -set -euo pipefail -IFS=$'\n\t' - -positional_args=() -while [[ "$#" -gt 0 ]]; do - arg="${1}" - case "${arg}" in - -h|--help) - print_usage - exit 0 - ;; - *) - positional_args+=("$1") - shift - ;; - esac -done - -if [[ -z "${positional_args[0]:-}" ]]; then - echo "error: missing original tarball name" - exit 1 -fi - -original_path=$(readlink -f "${positional_args[0]:-}") -original_name=$(basename "$original_path") - -new_name=${positional_args[1]:-} -if [[ -z ${new_name} ]]; then - echo "error: missing new tarball name" - exit 1 -fi - -original_name=${original_name/%.tar.gz} -new_name=${new_name/.tar.gz} - -echo "Original: ${original_name}.tar.gz" -echo "New name: ${new_name}.tar.gz" - -mkdir "temp-${new_name}" -pushd "temp-${new_name}" > /dev/null -tar xf "${original_path}" -# `find` always shows the current directory as one of the entries in -# the output. A total of 2 entries means there is only one main -# directory in the extracted archive, and we can just move it to the -# expected location. -if [[ $(find . -maxdepth 1 | wc -l) == 2 ]]; then - mv -- ./* ../"${new_name}" -else - mkdir -p ../"${new_name}" - mv -- ./* ../"${new_name}" -fi -popd > /dev/null -tar czf "${new_name}.tar.gz" "${new_name}" -rm -rf "${new_name}" -rmdir "temp-${new_name}" diff --git a/runtime-82210-rid-fedora-39.patch b/runtime-82210-rid-fedora-39.patch new file mode 100644 index 0000000..f88643f --- /dev/null +++ b/runtime-82210-rid-fedora-39.patch @@ -0,0 +1,98 @@ +From 5cfd86b95fcc7014803cef42cc92d296d023e05a Mon Sep 17 00:00:00 2001 +From: Omair Majid +Date: Wed, 15 Feb 2023 18:10:35 -0500 +Subject: [PATCH] Add a RID for Fedora 39 + +--- + .../src/runtime.compatibility.json | 32 +++++++++++++++++++ + .../src/runtime.json | 17 ++++++++++ + .../src/runtimeGroups.props | 2 +- + 3 files changed, 50 insertions(+), 1 deletion(-) + +diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json +index 83e1e8476c1..d49b40577f0 100644 +--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json ++++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json +@@ -4121,6 +4121,38 @@ + "any", + "base" + ], ++ "fedora.39": [ ++ "fedora.39", ++ "fedora", ++ "linux", ++ "unix", ++ "any", ++ "base" ++ ], ++ "fedora.39-arm64": [ ++ "fedora.39-arm64", ++ "fedora.39", ++ "fedora-arm64", ++ "fedora", ++ "linux-arm64", ++ "linux", ++ "unix-arm64", ++ "unix", ++ "any", ++ "base" ++ ], ++ "fedora.39-x64": [ ++ "fedora.39-x64", ++ "fedora.39", ++ "fedora-x64", ++ "fedora", ++ "linux-x64", ++ "linux", ++ "unix-x64", ++ "unix", ++ "any", ++ "base" ++ ], + "freebsd": [ + "freebsd", + "unix", +diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json +index 40c007f6157..ddba63053ee 100644 +--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json ++++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json +@@ -1411,6 +1411,23 @@ + "fedora-x64" + ] + }, ++ "fedora.39": { ++ "#import": [ ++ "fedora" ++ ] ++ }, ++ "fedora.39-arm64": { ++ "#import": [ ++ "fedora.39", ++ "fedora-arm64" ++ ] ++ }, ++ "fedora.39-x64": { ++ "#import": [ ++ "fedora.39", ++ "fedora-x64" ++ ] ++ }, + "freebsd": { + "#import": [ + "unix" +diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props +index 3de83acbcb1..6ddb8956684 100644 +--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props ++++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props +@@ -71,7 +71,7 @@ + + linux + x64;arm64 +- 23;24;25;26;27;28;29;30;31;32;33;34;35;36;37;38 ++ 23;24;25;26;27;28;29;30;31;32;33;34;35;36;37;38;39 + false + + +-- +2.39.1 + diff --git a/sdk-22373-portablerid.patch b/sdk-22373-portablerid.patch deleted file mode 100644 index 8b39eb3..0000000 --- a/sdk-22373-portablerid.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 499fcf6e3b0e4b01a9c340a06f00cfc3e1fcc5d2 Mon Sep 17 00:00:00 2001 -From: Tom Deseyn -Date: Tue, 5 Oct 2021 09:04:14 +0200 -Subject: [PATCH] Use the portable rid for --use-current-runtime. - ---- - .../targets/Microsoft.NET.RuntimeIdentifierInference.targets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets -index 17308aa9160..e764b2d9845 100644 ---- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets -+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets -@@ -62,7 +62,7 @@ Copyright (c) .NET Foundation. All rights reserved. - - - -- $(NETCoreSdkRuntimeIdentifier) -+ $(NETCoreSdkPortableRuntimeIdentifier) - - - diff --git a/sources b/sources index abfb0b2..4971431 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dotnet-v6.0.113.tar.gz) = a1bc48fce2fd12c01de502878a37c30f90436257d9316247cef2ae7d65b2837e146aed4aeb74c9c2b8292da66614fcd54ef2dbe3e8028cfa2fcea256c78f22cf +SHA512 (dotnet-v6.0.114.tar.gz) = 48402f8cc2398ef6f70b906db40c7e16ee4cd005290ebbe5e92bed6b08958b4159643d1f7c9c4b6ddab3aebed915e08cb79a7021153d4c4aa149a7f0bb0e7645 diff --git a/tests/tests.yml b/tests/tests.yml index f47f407..d281142 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -9,7 +9,7 @@ repositories: - repo: "https://github.com/redhat-developer/dotnet-regular-tests.git" dest: "dotnet-regular-tests" - version: main + version: "main" tests: - download_test_runner: dir: ./ @@ -19,7 +19,7 @@ run: dotnet turkey/Turkey.dll --version - regular: dir: ./ - run: dotnet turkey/Turkey.dll -l={{ remote_artifacts }} dotnet-regular-tests + run: dotnet turkey/Turkey.dll -l={{ remote_artifacts }} dotnet-regular-tests --timeout=1500 required_packages: - aspnetcore-runtime-6.0 - babeltrace @@ -31,6 +31,7 @@ - expect - file - findutils + - gcc-c++ - git - jq - lldb diff --git a/update-release b/update-release index 54c7307..ef8091c 100755 --- a/update-release +++ b/update-release @@ -71,13 +71,13 @@ if [[ -f "dotnet-${tag}-original.tar.gz" ]]; then echo "dotnet-${tag}-original.tar.gz alredy exists, not rebuilding tarball" else if [[ -n "${user_provided_tarball_name}" ]]; then - ./rename-tarball "$user_provided_tarball_name" "dotnet-${tag}-original.tar.gz" + cp -a "$user_provided_tarball_name" "dotnet-${tag}-original.tar.gz" elif [[ -f "dotnet-${sdk_version}-SDK.tar.gz" ]]; then - ./rename-tarball "dotnet-${sdk_version}-SDK.tar.gz" "dotnet-${tag}-original.tar.gz" + cp -a "dotnet-${sdk_version}-SDK.tar.gz" "dotnet-${tag}-original.tar.gz" elif [[ -f "dotnet-${sdk_version}.tar.gz" ]]; then - ./rename-tarball "dotnet-${sdk_version}.tar.gz" "dotnet-${tag}-original.tar.gz" + cp -a "dotnet-${sdk_version}.tar.gz" "dotnet-${tag}-original.tar.gz" elif [[ -f "dotnet-${runtime_version}.tar.gz" ]]; then - ./rename-tarball "dotnet-${runtime_version}.tar.gz" "dotnet-${tag}-original.tar.gz" + cp -a "dotnet-${runtime_version}.tar.gz" "dotnet-${tag}-original.tar.gz" fi fi