rpms/dotnet6.0
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to .NET SDK 6.0.111 and Runtime 6.0.11

Browse Source
This commit is contained in:
Omair Majid 2022-11-10 20:02:46 -05:00
parent e7e5d89241
commit ba7293ef0c
4 changed files with 9 additions and 31 deletions

1
.gitignore vendored
View File

@ -23,3 +23,4 @@
/dotnet-v6.0.108.tar.gz
/dotnet-v6.0.109.tar.gz
/dotnet-v6.0.110.tar.gz
/dotnet-v6.0.111.tar.gz

14
dotnet6.0.spec
View File

@ -20,10 +20,10 @@
# until that's done, disable LTO. This has to happen before setting the flags below.
%define _lto_cflags %{nil}
%global host_version 6.0.10
%global runtime_version 6.0.10
%global host_version 6.0.11
%global runtime_version 6.0.11
%global aspnetcore_runtime_version %{runtime_version}
%global sdk_version 6.0.110
%global sdk_version 6.0.111
%global sdk_feature_band_version %(echo %{sdk_version} | sed -e 's|[[:digit:]][[:digit:]]$|00|')
%global templates_version %{runtime_version}
#%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
@ -60,7 +60,7 @@
Name: dotnet6.0
Version: %{sdk_rpm_version}
Release: 2%{?dist}
Release: 1%{?dist}
Summary: .NET Runtime and SDK
License: MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib
URL: https://github.com/dotnet/
@ -118,8 +118,6 @@ Patch1500: sdk-telemetry-optout.patch
# https://github.com/dotnet/sdk/pull/22373
Patch1501: sdk-22373-portablerid.patch
# https://github.com/dotnet/installer/pull/12516
Patch1600: installer-12516-portablerid.patch
%if 0%{?fedora} || 0%{?rhel} >= 8
@ -441,7 +439,6 @@ pushd src/sdk
popd
pushd src/installer
%patch1600 -p1
popd
@ -651,6 +648,9 @@ export COMPlus_LTTng=0
%changelog
* Thu Nov 10 2022 Omair Majid <omajid@redhat.com> - 6.0.111-1
- Update to .NET SDK 6.0.111 and Runtime 6.0.11
* Mon Oct 31 2022 Omair Majid <omajid@redhat.com> - 6.0.110-2
- Set OPENSSL_ENABLE_SHA1_SIGNATURES=1 when building

23
installer-12516-portablerid.patch
View File

@ -1,23 +0,0 @@
From 892222071f73062f969f4f6ed1df8f759b9327b7 Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Wed, 3 Nov 2021 15:12:59 +0100
Subject: [PATCH] GetRuntimeInformation.targets: determine
PortableProductMonikerRid based on HostOSName and Architecture.
---
src/redist/targets/GetRuntimeInformation.targets | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets
index 5133c3a3841..01f704c7d8e 100644
--- a/src/redist/targets/GetRuntimeInformation.targets
+++ b/src/redist/targets/GetRuntimeInformation.targets
@@ -28,6 +28,8 @@
'$(Rid)' == 'linux-musl-x64' ">$(Rid)</ProductMonikerRid>
<ProductMonikerRid Condition=" '$(ProductMonikerRid)' == '' ">$(OSName)-$(Architecture)</ProductMonikerRid>
+ <PortableProductMonikerRid Condition=" '$(PortableProductMonikerRid)' == '' ">$(HostOSName)-$(Architecture)</PortableProductMonikerRid>
+
<ArtifactNameSdk>dotnet-sdk-internal$(PgoTerm)</ArtifactNameSdk>
<ArtifactNameCombinedHostHostFxrFrameworkSdk>dotnet-sdk$(PgoTerm)</ArtifactNameCombinedHostHostFxrFrameworkSdk>

2
sources
View File

@ -1 +1 @@
SHA512 (dotnet-v6.0.110.tar.gz) = ed32ed75351645ff1b5b6c71253cec312b19f9385e6359274230866d7c125af5d373b4e2a1a5a59836e3c08abcb89011fcf46c0893ffdacea0b274c19a2dc104
SHA512 (dotnet-v6.0.111.tar.gz) = 4cce9a7cdf1c66322d222b6efd07186eef1013a89d7e68855baa5900584231557ab3d91cd5064c983815fb842db97cad950d337801322c5303d355596ebab54a