Auto sync2gitlab import of dotnet6.0-6.0.114-1.el8_7.src.rpm

This commit is contained in:
CentOS Sources 2023-02-08 14:13:04 +00:00
parent d176e5f03b
commit 69f60f5242
4 changed files with 9 additions and 29 deletions

1
.gitignore vendored
View File

@ -8,3 +8,4 @@
/dotnet-v6.0.111.tar.gz
/dotnet-v6.0.112.tar.gz
/dotnet-v6.0.113.tar.gz
/dotnet-v6.0.114.tar.gz

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.13
%global runtime_version 6.0.13
%global host_version 6.0.14
%global runtime_version 6.0.14
%global aspnetcore_runtime_version %{runtime_version}
%global sdk_version 6.0.113
%global sdk_version 6.0.114
%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 }')
@ -111,8 +111,6 @@ Patch1001: msbuild-no-systemconfiguration.patch
# Disable telemetry by default; make it opt-in
Patch1500: sdk-telemetry-optout.patch
# https://github.com/dotnet/sdk/pull/22373
Patch1501: sdk-22373-portablerid.patch
%if 0%{?fedora} || 0%{?rhel} >= 8
@ -427,7 +425,6 @@ popd
pushd src/sdk
%patch1500 -p1
%patch1501 -p1
popd
pushd src/installer
@ -614,6 +611,10 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
%changelog
* Thu Feb 02 2023 Omair Majid <omajid@redhat.com> - 6.0.114-1
- Update to .NET SDK 6.0.114 and Runtime 6.0.14
- Resolves: RHBZ#2166769
* Mon Dec 19 2022 Omair Majid <omajid@redhat.com> - 6.0.113-1
- Update to .NET SDK 6.0.113 and Runtime 6.0.13
- Resolves: RHBZ#2154458

View File

@ -1,22 +0,0 @@
From 499fcf6e3b0e4b01a9c340a06f00cfc3e1fcc5d2 Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Tue, 5 Oct 2021 09:04:14 +0200
Subject: [PATCH] Use the portable rid for --use-current-runtime.
---
.../targets/Microsoft.NET.RuntimeIdentifierInference.targets | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
index 17308aa9160..e764b2d9845 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
@@ -62,7 +62,7 @@ Copyright (c) .NET Foundation. All rights reserved.
</PropertyGroup>
<PropertyGroup Condition="'$(UseCurrentRuntimeIdentifier)' == 'true'">
- <RuntimeIdentifier>$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
+ <RuntimeIdentifier>$(NETCoreSdkPortableRuntimeIdentifier)</RuntimeIdentifier>
</PropertyGroup>
<PropertyGroup Condition="'$(PlatformTarget)' == ''">

View File

@ -1 +1 @@
SHA512 (dotnet-v6.0.113.tar.gz) = 127c1b3ec3c6e1ddec2c891b1de976a806744dff2d31cb05599e1cac1b52798475a09d9213b0dc7bf4e9dc41d2c421d27744baca928859d306d31d58cd2a1eca
SHA512 (dotnet-v6.0.114.tar.gz) = 4b27729cfa037091329188dd1be812d20246ece9e009f8804836e2fa70beb00a4f32ab4e41dedb557c831c3c5f696181ef4615a37b60a7b8413fcd0061c68b8a