Update to .NET SDK 6.0.116 and Runtime 6.0.16

This commit is contained in:
Omair Majid 2023-04-13 07:01:49 -04:00
parent 7718b1fd64
commit eb22d9d231
4 changed files with 8 additions and 105 deletions

1
.gitignore vendored
View File

@ -28,3 +28,4 @@
/dotnet-v6.0.113.tar.gz /dotnet-v6.0.113.tar.gz
/dotnet-v6.0.114.tar.gz /dotnet-v6.0.114.tar.gz
/dotnet-v6.0.115.tar.gz /dotnet-v6.0.115.tar.gz
/dotnet-v6.0.116.tar.gz

View File

@ -20,10 +20,10 @@
# until that's done, disable LTO. This has to happen before setting the flags below. # until that's done, disable LTO. This has to happen before setting the flags below.
%define _lto_cflags %{nil} %define _lto_cflags %{nil}
%global host_version 6.0.15 %global host_version 6.0.16
%global runtime_version 6.0.15 %global runtime_version 6.0.16
%global aspnetcore_runtime_version %{runtime_version} %global aspnetcore_runtime_version %{runtime_version}
%global sdk_version 6.0.115 %global sdk_version 6.0.116
%global sdk_feature_band_version %(echo %{sdk_version} | sed -e 's|[[:digit:]][[:digit:]]$|00|') %global sdk_feature_band_version %(echo %{sdk_version} | sed -e 's|[[:digit:]][[:digit:]]$|00|')
%global templates_version %{runtime_version} %global templates_version %{runtime_version}
#%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
@ -86,8 +86,6 @@ Source11: dotnet.sh.in
Patch100: runtime-arm64-lld-fix.patch 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 # 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 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 # Disable apphost, needed for s390x
Patch500: fsharp-no-apphost.patch Patch500: fsharp-no-apphost.patch
@ -394,7 +392,6 @@ sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime/src/native/corehost/
pushd src/runtime pushd src/runtime
%patch100 -p1 %patch100 -p1
%patch101 -p1 %patch101 -p1
%patch102 -p1
popd popd
pushd src/fsharp pushd src/fsharp
@ -639,6 +636,9 @@ export COMPlus_LTTng=0
%changelog %changelog
* Wed Apr 12 2023 Omair Majid <omajid@redhat.com> - 6.0.116-1
- Update to .NET SDK 6.0.116 and Runtime 6.0.16
* Wed Mar 15 2023 Omair Majid <omajid@redhat.com> - 6.0.115-1 * Wed Mar 15 2023 Omair Majid <omajid@redhat.com> - 6.0.115-1
- Update to .NET SDK 6.0.115 and Runtime 6.0.15 - Update to .NET SDK 6.0.115 and Runtime 6.0.15

View File

@ -1,98 +0,0 @@
From 5cfd86b95fcc7014803cef42cc92d296d023e05a Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
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 @@
<RuntimeGroup Include="fedora">
<Parent>linux</Parent>
<Architectures>x64;arm64</Architectures>
- <Versions>23;24;25;26;27;28;29;30;31;32;33;34;35;36;37;38</Versions>
+ <Versions>23;24;25;26;27;28;29;30;31;32;33;34;35;36;37;38;39</Versions>
<TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
</RuntimeGroup>
--
2.39.1

View File

@ -1 +1 @@
SHA512 (dotnet-v6.0.115.tar.gz) = 3aae63274cc145ee9bca14c7434295763388ef9e787def7e222e082406e08e8ce8e2caaa7f6a1f10abdad33ada92605c480dd4c472c2f3c2fe02c2d02bb256f5 SHA512 (dotnet-v6.0.116.tar.gz) = 810bb6846dc3f7d6895c0f1bab40055343e1fe8b69ac10dd5db8afbaa9e27089380f78d83566583c754fcc613895f4017c97cea312b0613a42e0073b342133e7