Update to .NET SDK 6.0.110 and Runtime 6.0.10

This commit is contained in:
Omair Majid 2022-10-28 16:52:30 -04:00
parent ef175b0e29
commit 6d2cfe1c34
4 changed files with 10 additions and 147 deletions

1
.gitignore vendored
View File

@ -22,3 +22,4 @@
/dotnet-v6.0.107.tar.gz /dotnet-v6.0.107.tar.gz
/dotnet-v6.0.108.tar.gz /dotnet-v6.0.108.tar.gz
/dotnet-v6.0.109.tar.gz /dotnet-v6.0.109.tar.gz
/dotnet-v6.0.110.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.9 %global host_version 6.0.10
%global runtime_version 6.0.9 %global runtime_version 6.0.10
%global aspnetcore_runtime_version %{runtime_version} %global aspnetcore_runtime_version %{runtime_version}
%global sdk_version 6.0.109 %global sdk_version 6.0.110
%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 }')
@ -88,12 +88,10 @@ Patch100: runtime-arm64-lld-fix.patch
Patch101: runtime-mono-remove-ilstrip.patch Patch101: runtime-mono-remove-ilstrip.patch
# https://github.com/dotnet/runtime/pull/66594 # https://github.com/dotnet/runtime/pull/66594
Patch102: runtime-66594-s390x-debuginfo.patch Patch102: runtime-66594-s390x-debuginfo.patch
# https://github.com/dotnet/runtime/pull/74383
Patch103: runtime-fedora-38-rid.patch
# https://github.com/dotnet/runtime/pull/73065 # https://github.com/dotnet/runtime/pull/73065
Patch104: runtime-clang15-support.patch Patch103: runtime-clang15-support.patch
# https://github.com/dotnet/runtime/pull/60675 # https://github.com/dotnet/runtime/pull/60675
Patch105: runtime-strerror.patch Patch104: runtime-strerror.patch
# Disable apphost, needed for s390x # Disable apphost, needed for s390x
Patch500: fsharp-no-apphost.patch Patch500: fsharp-no-apphost.patch
@ -407,7 +405,6 @@ pushd src/runtime
%patch102 -p1 %patch102 -p1
%patch103 -p1 %patch103 -p1
%patch104 -p1 %patch104 -p1
%patch105 -p1
popd popd
pushd src/fsharp pushd src/fsharp
@ -647,6 +644,9 @@ export COMPlus_LTTng=0
%changelog %changelog
* Fri Oct 28 2022 Omair Majid <omajid@redhat.com> - 6.0.110-1
- Update to .NET SDK 6.0.110 and Runtime 6.0.10
* Wed Oct 12 2022 Omair Majid <omajid@redhat.com> - 6.0.109-1 * Wed Oct 12 2022 Omair Majid <omajid@redhat.com> - 6.0.109-1
- Update to .NET SDK 6.0.109 and Runtime 6.0.9 - Update to .NET SDK 6.0.109 and Runtime 6.0.9

View File

@ -1,138 +0,0 @@
From d5aa0f0e93448a9defc901e98a70b00e26359d46 Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Mon, 22 Aug 2022 11:48:00 -0400
Subject: [PATCH] Add Fedora 38 RID
Fedora 38 is now in development:
$ podman run -it registry.fedoraproject.org/fedora:rawhide
[root@d3934d2b267b /]# cat /etc/os-release
NAME="Fedora Linux"
VERSION="38 (Container Image Prerelease)"
ID=fedora
VERSION_ID=38
VERSION_CODENAME=""
PLATFORM_ID="platform:f38"
PRETTY_NAME="Fedora Linux 38 (Container Image Prerelease)"
ANSI_COLOR="0;38;2;60;110;180"
LOGO=fedora-logo-icon
CPE_NAME="cpe:/o:fedoraproject:fedora:38"
DEFAULT_HOSTNAME="fedora"
HOME_URL="https://fedoraproject.org/"
DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora/rawhide/system-administrators-guide/"
SUPPORT_URL="https://ask.fedoraproject.org/"
BUG_REPORT_URL="https://bugzilla.redhat.com/"
REDHAT_BUGZILLA_PRODUCT="Fedora"
REDHAT_BUGZILLA_PRODUCT_VERSION=rawhide
REDHAT_SUPPORT_PRODUCT="Fedora"
REDHAT_SUPPORT_PRODUCT_VERSION=rawhide
VARIANT="Container Image"
VARIANT_ID=container
---
.../src/Microsoft.NETCore.Platforms.csproj | 3 +-
.../src/runtime.compatibility.json | 32 +++++++++++++++++++
.../src/runtime.json | 17 ++++++++++
.../src/runtimeGroups.props | 2 +-
4 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
index e324ea113d2..262b0aae1a8 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
@@ -19,7 +19,8 @@
<!-- When building from source, ensure the RID we're building for is part of the RID graph -->
<AdditionalRuntimeIdentifiers Condition="'$(DotNetBuildFromSource)' == 'true'">$(AdditionalRuntimeIdentifiers);$(OutputRID)</AdditionalRuntimeIdentifiers>
- <ServicingVersion>5</ServicingVersion>
+ <ServicingVersion>6</ServicingVersion>
+ <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
index f4aebcb7147..dce6a7f5346 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
@@ -3182,6 +3182,38 @@
"any",
"base"
],
+ "fedora.38": [
+ "fedora.38",
+ "fedora",
+ "linux",
+ "unix",
+ "any",
+ "base"
+ ],
+ "fedora.38-arm64": [
+ "fedora.38-arm64",
+ "fedora.38",
+ "fedora-arm64",
+ "fedora",
+ "linux-arm64",
+ "linux",
+ "unix-arm64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "fedora.38-x64": [
+ "fedora.38-x64",
+ "fedora.38",
+ "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 fb2ea2da7c0..a7867d81727 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
@@ -1186,6 +1186,23 @@
"fedora-x64"
]
},
+ "fedora.38": {
+ "#import": [
+ "fedora"
+ ]
+ },
+ "fedora.38-arm64": {
+ "#import": [
+ "fedora.38",
+ "fedora-arm64"
+ ]
+ },
+ "fedora.38-x64": {
+ "#import": [
+ "fedora.38",
+ "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 479e1397e7a..ce8cc1d22b7 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</Versions>
+ <Versions>23;24;25;26;27;28;29;30;31;32;33;34;35;36;37;38</Versions>
<TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
</RuntimeGroup>
--
2.37.2

View File

@ -1 +1 @@
SHA512 (dotnet-v6.0.109.tar.gz) = c467119fd06f4b59246d341c6bb7ab9341f501e063cd013f7749ab427bebca0974cb7fbab94ec211fab2b0e91d852360ab8562f4c9fd063328f218676fd45ffe SHA512 (dotnet-v6.0.110.tar.gz) = ed32ed75351645ff1b5b6c71253cec312b19f9385e6359274230866d7c125af5d373b4e2a1a5a59836e3c08abcb89011fcf46c0893ffdacea0b274c19a2dc104