diff --git a/.gitignore b/.gitignore index c75b1a4..e1969c6 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,7 @@ /dotnet-prebuilts-8.0.100-preview.6.23330.14-arm64.tar.gz /dotnet-prebuilts-8.0.100-preview.6.23330.14-ppc64le.tar.gz /dotnet-prebuilts-8.0.100-preview.6.23330.14-s390x.tar.gz +/dotnet-v8.0.0-rc.1.23419.4-x64-bootstrap.tar.xz +/dotnet-prebuilts-8.0.100-rc.1.23410.12-arm64.tar.gz +/dotnet-prebuilts-8.0.100-rc.1.23410.12-ppc64le.tar.gz +/dotnet-prebuilts-8.0.100-rc.1.23410.12-s390x.tar.gz 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 5657dec..4cd640c 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 @@ -54,14 +54,14 @@ Name: dotnet%{dotnetver} Version: %{sdk_rpm_version} -Release: 0.2%{?dist} +Release: 0.1%{?dist} Summary: .NET Runtime and SDK License: 0BSD AND Apache-2.0 AND (Apache-2.0 WITH LLVM-exception) AND APSL-2.0 AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND BSL-1.0 AND bzip2-1.0.6 AND CC0-1.0 AND CC-BY-3.0 AND CC-BY-4.0 AND CC-PDDC AND CNRI-Python AND EPL-1.0 AND GPL-2.0-only AND (GPL-2.0-only WITH GCC-exception-2.0) AND GPL-2.0-or-later AND GPL-3.0-only AND ICU AND ISC AND LGPL-2.1-only AND LGPL-2.1-or-later AND LicenseRef-Fedora-Public-Domain AND LicenseRef-ISO-8879 AND MIT AND MIT-Wu AND MS-PL AND MS-RL AND NCSA AND OFL-1.1 AND OpenSSL AND Unicode-DFS-2015 AND Unicode-DFS-2016 AND W3C-19980720 AND X11 AND Zlib 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} @@ -495,12 +495,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,14 +516,14 @@ sed -e 's|[@]LIBDIR[@]|%{_libdir}|g' %{SOURCE21} > dotnet.sh %install 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/ +mkdir -p built-sdk +tar xf artifacts/%{runtime_arch}/Release/dotnet-sdk-%{sdk_version}-%{runtime_id}.tar.gz -C built-sdk/ -# 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 +# Convert hardlinks to actual copies. This takes up quite a bit of +# extra disk space, but works around RHEL issues in post-rpmbuild tools +# when they encounter hardlinks. +cp -r --preserve=mode,ownership,timestamps built-sdk/* %{buildroot}%{_libdir}/dotnet/ +ls %{buildroot}%{_libdir}/dotnet # Delete bundled certificates: we want to use the system store only, # except for when we have no other choice and ca-certificates doesn't @@ -543,9 +537,12 @@ 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 \ +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 {} \; #find %{buildroot}%{_libdir}/dotnet/ -type f -name 'containerize' -exec chmod +x {} \; @@ -667,6 +664,10 @@ 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 +- Resolves: RHEL-4074 + * Tue Aug 22 2023 Omair Majid - 8.0.100~preview.7-0.2 - Add patch to work around TypeLoadException in Mono - Related: RHBZ#2224124 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" } diff --git a/sources b/sources index a41d0d9..5192f3b 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (dotnet-v8.0.0-preview.7.23375.6-x64-bootstrap.tar.xz) = a74204fa107ad1b30847cc9d4d8c179936495079c1ac6c6f2fa0696cd430ba7dbeca5224db08bfc0dd84a222e8dbbc802241644507d58345e7c6a22a465aeb48 -SHA512 (dotnet-prebuilts-8.0.100-preview.6.23330.14-arm64.tar.gz) = d4aa1129ef9c36e38b2adaddf755d07f886e02b01df3eff54f9bc23b52f5b173e57c9d609d724f9826855b0e3db324e7a90ad8feec49292db46c6aa10b1f0ce3 -SHA512 (dotnet-prebuilts-8.0.100-preview.6.23330.14-ppc64le.tar.gz) = fa9fd7216f945ed112e1e2af184eac5680877c2b63c807c73a4ad992b428cd6dd2f000c537887af346564adeedf66ea9de75dd96089b5fe29c560d5da4bd638e -SHA512 (dotnet-prebuilts-8.0.100-preview.6.23330.14-s390x.tar.gz) = d625ef58a056879a6c1bbf6d598d1a74a86a15e301f6ec4db8fbed05f6659e5ebe221f5c5a56ac5b3df8b49d19fa65937af75d86ae49077a20cb6e34c95d2331 +SHA512 (dotnet-v8.0.0-rc.1.23419.4-x64-bootstrap.tar.xz) = 247d43ae0100753a6ed18f8302e818f450ea648120bee857ea5e9d8e0130a6cb9a48b76a6c39956cf5b18f9c1dc8645d2d4eed9ea3b791456cb65ec67314f807 +SHA512 (dotnet-prebuilts-8.0.100-rc.1.23410.12-arm64.tar.gz) = c57c8a249de603c8c6f62e7b3cb18d5a1ff32bdaaa6ac9fdd37a9a577cc89fdd0de82d7f099f754e566d473a32d19093003caeea9bff02865e51f46938271bb4 +SHA512 (dotnet-prebuilts-8.0.100-rc.1.23410.12-ppc64le.tar.gz) = 1252b993d0aed94cda53389f16b209656f161a43d77e1099d59e563afa1d74c1dab474e0c636d91e7a94f8c72df4e2430393f220363b5ef39811e9cd0d33d122 +SHA512 (dotnet-prebuilts-8.0.100-rc.1.23410.12-s390x.tar.gz) = 662c4689fa1b5752cae9c7a9f75e71f60e63ae013e130457c3f7d0a73fec0d58489ef32279d0a7e046ebba12cfb16ae6fa5e8f5bbbe3bc59b860207e132b3640