From 1c903a1bc8bf667354ef8df835b1b59b74154573 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Fri, 15 Sep 2023 18:34:48 -0400 Subject: [PATCH] Update to .NET 8 RC 1 --- copr-build | 2 +- dotnet8.0.spec | 51 ++++++++++++++++++++++---------------------------- release.json | 10 +++++----- 3 files changed, 28 insertions(+), 35 deletions(-) diff --git a/copr-build b/copr-build index 9d7da01..2ee2805 100755 --- a/copr-build +++ b/copr-build @@ -10,4 +10,4 @@ srpm_name=$(grep 'Wrote: ' fedpkg.output | cut -d' ' -f 2) ls -alh "${srpm_name}" -copr-cli --debug build @dotnet-sig/dotnet-preview "${srpm_name}" +copr-cli --debug build @dotnet-sig/dotnet-preview "${srpm_name}" --timeout 36000 diff --git a/dotnet8.0.spec b/dotnet8.0.spec index f4cf52b..469e415 100644 --- a/dotnet8.0.spec +++ b/dotnet8.0.spec @@ -8,22 +8,22 @@ %global dotnetver 8.0 -%global host_version 8.0.0-preview.7.23375.6 -%global runtime_version 8.0.0-preview.7.23375.6 -%global aspnetcore_runtime_version 8.0.0-preview.7.23375.9 -%global sdk_version 8.0.100-preview.7.23376.1 +%global host_version 8.0.0-rc.1.23419.4 +%global runtime_version 8.0.0-rc.1.23419.4 +%global aspnetcore_runtime_version 8.0.0-rc.1.23421.29 +%global sdk_version 8.0.100-rc.1.23455.1 %global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|') -%global templates_version 8.0.0-preview.7.23375.9 +%global templates_version 8.0.0-rc.1.23421.29 #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') -# upstream can update releases without revving the SDK version so these don't always match -%global upstream_tag v8.0.0-preview.7.23375.6 +# upstream can produce releases with a different tag than the SDK version +%global upstream_tag v8.0.0-rc.1.23419.4 %global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||') -%global host_rpm_version 8.0.0~preview.7 -%global runtime_rpm_version 8.0.0~preview.7 -%global aspnetcore_runtime_rpm_version 8.0.0~preview.7 -%global sdk_rpm_version 8.0.100~preview.7 +%global host_rpm_version 8.0.0~rc.1 +%global runtime_rpm_version 8.0.0~rc.1 +%global aspnetcore_runtime_rpm_version 8.0.0~rc.1 +%global sdk_rpm_version 8.0.100~rc.1 %if 0%{?fedora} || 0%{?rhel} < 8 %global use_bundled_libunwind 0 @@ -61,7 +61,7 @@ License: 0BSD AND Apache-2.0 AND (Apache-2.0 WITH LLVM-exception) AND APS URL: https://github.com/dotnet/ %if %{with bootstrap} -%global bootstrap_sdk_version 8.0.100-preview.6.23330.14 +%global bootstrap_sdk_version 8.0.100-rc.1.23410.12 %global tarball_name dotnet-%{upstream_tag}-x64-bootstrap # The source is generated on a Fedora box via: # ./build-dotnet-tarball --bootstrap %%{upstream_tag} @@ -87,9 +87,9 @@ Source20: check-debug-symbols.py Source21: dotnet.sh.in # Disable apphost; there's no net6.0 apphost for ppc64le -Patch1: roslyn-analyzers-ppc64le-apphost.patch +Patch1: roslyn-analyzers-ppc64le-apphost.patch # https://github.com/dotnet/source-build/discussions/3481 -Patch2: vstest-intent-net8.0.patch +Patch2: vstest-intent-net8.0.patch %if 0%{?fedora} || 0%{?rhel} >= 8 ExclusiveArch: aarch64 ppc64le s390x x86_64 @@ -493,12 +493,6 @@ export EXTRA_LDFLAGS="$LDFLAGS" # suggested compile-time change doesn't work, unfortunately. export COMPlus_LTTng=0 -# OpenSSL 3.0 in RHEL 9 and newer versions of Fedora has disabled -# SHA1, used by .NET for strong name signing. See -# https://github.com/dotnet/runtime/issues/67304 -# https://gitlab.com/redhat/centos-stream/rpms/openssl/-/commit/78fb78d30755ae18fdaef28ef392f4e67c662ff6 -export OPENSSL_ENABLE_SHA1_SIGNATURES=1 - VERBOSE=1 ./build.sh \ %if %{without bootstrap} --with-sdk previously-built-dotnet \ @@ -522,13 +516,6 @@ install -dm 0755 %{buildroot}%{_libdir}/dotnet ls artifacts/%{runtime_arch}/Release tar xf artifacts/%{runtime_arch}/Release/dotnet-sdk-%{sdk_version}-%{runtime_id}.tar.gz -C %{buildroot}%{_libdir}/dotnet/ -# See https://github.com/dotnet/source-build/issues/2579 -find %{buildroot}%{_libdir}/dotnet/ -type f -name 'testhost.x86' -delete -find %{buildroot}%{_libdir}/dotnet/ -type f -name 'vstest.console' -delete - -# https://github.com/dotnet/source-build/issues/3452 -find %{buildroot}%{_libdir}/dotnet/ -type f -name 'containerize' -delete - # Delete bundled certificates: we want to use the system store only, # except for when we have no other choice and ca-certificates doesn't # provide it. Currently ca-ceritificates has no support for @@ -541,8 +528,11 @@ if [[ $(find %{buildroot}%{_libdir}/dotnet -name '*.pem' -print | wc -l) != 1 ]] fi # Install managed symbols -tar xf artifacts/%{runtime_arch}/Release/runtime/dotnet-runtime-symbols-%{runtime_id}-%{runtime_version}.tar.gz \ - -C %{buildroot}/%{_libdir}/dotnet/shared/Microsoft.NETCore.App/%{runtime_version}/ +tar xf artifacts/%{runtime_arch}/Release/dotnet-runtime-symbols-%{runtime_id}-%{runtime_version}.tar.gz \ + -C %{buildroot}%{_libdir}/dotnet/shared/Microsoft.NETCore.App/%{runtime_version}/ + +# Remove static files +find %{buildroot}%{_libdir}/dotnet/ -type f -name 'libmono-*.a' -exec rm {} \; # Fix executable permissions on files find %{buildroot}%{_libdir}/dotnet/ -type f -name 'apphost' -exec chmod +x {} \; @@ -665,6 +655,9 @@ export COMPlus_LTTng=0 %changelog +* Fri Sep 15 2023 Omair Majid - 8.0.100~rc.1-0.1 +- Update to .NET SDK 8.0.100 RC 1 and Runtime 8.0.0 RC 1 + * Fri Aug 11 2023 Omair Majid - 8.0.100~preview.7-0.1 - Update to .NET SDK 8.0.100 Preview 7 and Runtime 8.0.0 Preview 7 diff --git a/release.json b/release.json index 2c639f2..0e58494 100644 --- a/release.json +++ b/release.json @@ -1,9 +1,9 @@ { - "release": "8.0.0-preview.7", + "release": "8.0.0-rc.1", "channel": "8.0", - "tag": "v8.0.0-preview.7.23375.6", - "sdkVersion": "8.0.100-preview.7.23376.3", - "runtimeVersion": "8.0.0-preview.7.23375.6", + "tag": "v8.0.0-rc.1.23419.4", + "sdkVersion": "8.0.100-rc.1.23455.8", + "runtimeVersion": "8.0.0-rc.1.23419.4", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "a4e1c155baee463805c5af89adb4cb1165df9ad0" + "sourceVersion": "113d797bc90104bb4f1cc51e1a462cf3d4ef18fc" }