Update to .NET SDK 8.0.100 Preview 7 and Runtime 8.0.0 Preview 7
This commit is contained in:
Omair Majid
parent
cf4a97a2ac
commit
cebafb882b
@ -15,7 +15,7 @@ IFS=$'\n\t'
|
||||
|
||||
function print_usage {
|
||||
echo "Usage:"
|
||||
echo "$0 [--bootstrap] <tag-from-installer>"
|
||||
echo "$0 [--bootstrap] <tag-from-dotnet>"
|
||||
echo
|
||||
echo "Creates a source archive from a tag at https://github.com/dotnet/dotnet"
|
||||
echo ""
|
||||
|
||||
@ -8,22 +8,22 @@
|
||||
|
||||
%global dotnetver 8.0
|
||||
|
||||
%global host_version 8.0.0-preview.6.23329.7
|
||||
%global runtime_version 8.0.0-preview.6.23329.7
|
||||
%global aspnetcore_runtime_version 8.0.0-preview.6.23329.11
|
||||
%global sdk_version 8.0.100-preview.6.23330.1
|
||||
%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 sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|')
|
||||
%global templates_version 8.0.0-preview.6.23329.11
|
||||
%global templates_version 8.0.0-preview.7.23375.9
|
||||
#%%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.6.23329.7
|
||||
%global upstream_tag v8.0.0-preview.7.23375.6
|
||||
%global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||')
|
||||
|
||||
%global host_rpm_version 8.0.0~preview.6
|
||||
%global runtime_rpm_version 8.0.0~preview.6
|
||||
%global aspnetcore_runtime_rpm_version 8.0.0~preview.6
|
||||
%global sdk_rpm_version 8.0.100~preview.6
|
||||
%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
|
||||
|
||||
%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.5.23303.2
|
||||
%global bootstrap_sdk_version 8.0.100-preview.6.23330.14
|
||||
%global tarball_name dotnet-%{upstream_tag}-x64-bootstrap
|
||||
# The source is generated on a Fedora box via:
|
||||
# ./build-dotnet-tarball --bootstrap %%{upstream_tag}
|
||||
@ -76,9 +76,9 @@ Source3: dotnet-prebuilts-%{bootstrap_sdk_version}-s390x.tar.gz
|
||||
# For non-releases, the source is generated on a Fedora box via:
|
||||
# ./build-dotnet-tarball %%{upstream_tag} or commit
|
||||
%global tarball_name dotnet-sdk-source-%{upstream_tag}
|
||||
Source0: https://github.com/dotnet/dotnet/archive/refs/tags/%{upstream_tag}.tar.gz#/dotnet-%{upstream_tag_without_v}.tar.gz
|
||||
Source0: https://github.com/dotnet/dotnet/archive/refs/tags/%{upstream_tag}.tar.gz#/dotnet-%{upstream_tag}.tar.gz
|
||||
%endif
|
||||
Source5: https://github.com/dotnet/dotnet/releases/download/%{upstream_tag}/release.json
|
||||
Source5: https://github.com/dotnet/dotnet/releases/download/%{upstream_tag}/release.json
|
||||
|
||||
#Source10: %%{tarball_name}-nm-dev.tgz
|
||||
#Source11: %%{tarball_name}-nm-prod.tgz
|
||||
@ -90,8 +90,6 @@ Source21: dotnet.sh.in
|
||||
Patch1: roslyn-analyzers-ppc64le-apphost.patch
|
||||
# https://github.com/dotnet/source-build/discussions/3481
|
||||
Patch2: vstest-intent-net8.0.patch
|
||||
# https://github.com/dotnet/runtime/pull/88145
|
||||
Patch3: runtime-88145-ppc64le-build-failure.patch
|
||||
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
ExclusiveArch: aarch64 ppc64le s390x x86_64
|
||||
@ -387,8 +385,8 @@ find -iname '*.zip' -type f -delete
|
||||
rm -rf .dotnet/
|
||||
rm -rf packages/source-built
|
||||
|
||||
mkdir -p packages/archive
|
||||
ln -s %{_libdir}/dotnet/source-built-artifacts/Private.SourceBuilt.Artifacts.*.tar.gz packages/archive/
|
||||
mkdir -p prereqs/packages/archive
|
||||
ln -s %{_libdir}/dotnet/source-built-artifacts/Private.SourceBuilt.Artifacts.*.tar.gz prereqs/packages/archive/
|
||||
|
||||
%else
|
||||
|
||||
@ -667,6 +665,9 @@ export COMPlus_LTTng=0
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Aug 11 2023 Omair Majid <omajid@redhat.com> - 8.0.100~preview.7-0.1
|
||||
- Update to .NET SDK 8.0.100 Preview 7 and Runtime 8.0.0 Preview 7
|
||||
|
||||
* Tue Jul 18 2023 Omair Majid <omajid@redhat.com> - 8.0.100~preview.6-0.2
|
||||
- Remove lttng and other tracing-specific dependencies from the runtime package
|
||||
|
||||
|
||||
@ -5,6 +5,7 @@ decision_context: bodhi_update_push_testing
|
||||
subject_type: koji_build
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis}
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
@ -12,6 +13,7 @@ decision_context: bodhi_update_push_stable
|
||||
subject_type: koji_build
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis}
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-*
|
||||
|
||||
10
release.json
10
release.json
@ -1,9 +1,9 @@
|
||||
{
|
||||
"release": "8.0.0-preview.6",
|
||||
"release": "8.0.0-preview.7",
|
||||
"channel": "8.0",
|
||||
"tag": "v8.0.0-preview.6.23329.7",
|
||||
"sdkVersion": "8.0.100-preview.6.23330.14",
|
||||
"runtimeVersion": "8.0.0-preview.6.23329.7",
|
||||
"tag": "v8.0.0-preview.7.23375.6",
|
||||
"sdkVersion": "8.0.100-preview.7.23376.3",
|
||||
"runtimeVersion": "8.0.0-preview.7.23375.6",
|
||||
"sourceRepository": "https://github.com/dotnet/dotnet",
|
||||
"sourceVersion": "3869a558bdd561a40ad963a0d52f87b8c770be40"
|
||||
"sourceVersion": "a4e1c155baee463805c5af89adb4cb1165df9ad0"
|
||||
}
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
From 225ac9c2dfeba7e0c5eb1c04fac642515cb36cdd Mon Sep 17 00:00:00 2001
|
||||
From: Sapana Khemkar <Sapana.Khemkar@ibm.cm>
|
||||
Date: Wed, 28 Jun 2023 14:52:46 +0000
|
||||
Subject: [PATCH] remove ppc64/setcontext.S from libunwind sources as file does
|
||||
not exist any more
|
||||
|
||||
---
|
||||
src/native/external/libunwind.cmake | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/src/runtime/src/native/external/libunwind.cmake b/src/runtime/src/native/external/libunwind.cmake
|
||||
index dc40fc28c1f5b..3854f9b85a2b3 100644
|
||||
--- a/src/runtime/src/native/external/libunwind.cmake
|
||||
+++ b/src/runtime/src/native/external/libunwind.cmake
|
||||
@@ -373,7 +373,6 @@ set(libunwind_la_SOURCES_ppc64le_common
|
||||
set(libunwind_la_SOURCES_ppc64le
|
||||
${libunwind_la_SOURCES_ppc64le_common}
|
||||
${libunwind_la_SOURCES_local}
|
||||
- ppc64/setcontext.S
|
||||
ppc64/Lapply_reg_state.c ppc64/Lreg_states_iterate.c
|
||||
ppc64/Lcreate_addr_space.c ppc/Lget_save_loc.c ppc64/Lglobal.c
|
||||
ppc64/Linit.c ppc/Linit_local.c
|
||||
@ -63,8 +63,10 @@ host_version="$runtime_version"
|
||||
|
||||
if [[ "$runtime_version" == "3.1"* ]]; then
|
||||
tag=v${sdk_version}-SDK
|
||||
else
|
||||
elif [[ "$runtime_version" == "6.0"* ]] || [[ "$runtime_version" == "7.0"* ]]; then
|
||||
tag=v${sdk_version}
|
||||
else
|
||||
tag=v${runtime_version}
|
||||
fi
|
||||
|
||||
if [[ -f "dotnet-${tag}-original.tar.gz" ]]; then
|
||||
|
||||
Loading…
Reference in New Issue
Block a user