import dotnet6.0-6.0.114-1.el8_7

.dotnet6.0.metadata

@@ -1 +1 @@
-fa3960a7a58e87c1c7faf53772479e2f2025ccb2 SOURCES/dotnet-v6.0.108-SDK.tar.gz
+c712d8d1134e0af3a2730228ada9b6fffb79a569 SOURCES/dotnet-v6.0.114.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/dotnet-v6.0.108-SDK.tar.gz
+SOURCES/dotnet-v6.0.114.tar.gz

SOURCES/installer-12516-portablerid.patch

@@ -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>
- 

SOURCES/runtime-66594-s390x-debuginfo.patch

@@ -1,29 +0,0 @@
-diff --git a/src/mono/mono.proj b/src/mono/mono.proj
-index fb98ffc1896..d6a0c9a8ec2 100644
---- a/src/mono/mono.proj
-+++ b/src/mono/mono.proj
-@@ -519,17 +519,17 @@
-       <!-- if all else fails in finding a valid objcopy, fall back to no-prefix from $PATH (used for x64 on CentOS) -->
-       <_Objcopy Condition="'$(_ObjcopyFound)' != '0'">objcopy</_Objcopy>
-     </PropertyGroup>
--    <ItemGroup>
-+    <ItemGroup Condition="'$(KeepNativeSymbols)' != 'true'">
-       <FilesToStrip Include="$(_MonoRuntimeFilePath)" />
-       <FilesToStrip Include="$([System.IO.Directory]::GetParent($(_MonoRuntimeFilePath)))\libmono-component-*$(SharedLibExt)" />
-       <FilesToStrip Include="$([System.IO.Directory]::GetParent($(_MonoRuntimeFilePath)))\Mono*framework\**\Mono*" Exclude="$([System.IO.Directory]::GetParent($(_MonoRuntimeFilePath)))\Mono*framework\**\*.dwarf" />
-     </ItemGroup>
--    <Message Condition="'$(BuildMonoAOTCrossCompilerOnly)' != 'true' and ($([MSBuild]::IsOSPlatform('OSX')) or $([MSBuild]::IsOSPlatform('Linux')))" Text="Stripping debug symbols from %(FilesToStrip.Identity)" Importance="High"/>
--    <Exec Condition="!$([System.String]::Copy(%(FilesToStrip.Identity)).EndsWith('.a')) and '$(BuildMonoAOTCrossCompilerOnly)' != 'true' and ('$(TargetsOSX)' == 'true' or '$(TargetsMacCatalyst)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true')" Command="dsymutil --flat --minimize %(FilesToStrip.Identity)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(MonoObjDir)"/>
--    <Exec Condition="!$([System.String]::Copy(%(FilesToStrip.Identity)).EndsWith('.a')) and '$(BuildMonoAOTCrossCompilerOnly)' != 'true' and ('$(TargetsOSX)' == 'true' or '$(TargetsMacCatalyst)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true')" Command="strip -no_code_signature_warning -S %(FilesToStrip.Identity)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(MonoObjDir)"/>
--    <Exec Condition="!$([System.String]::Copy(%(FilesToStrip.Identity)).EndsWith('.a')) and '$(BuildMonoAOTCrossCompilerOnly)' != 'true' and ('$(TargetsLinux)' == 'true' or '$(TargetsAndroid)' == 'true')" Command="$(_Objcopy) --only-keep-debug %(FilesToStrip.Identity) %(FilesToStrip.Identity).dbg" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(MonoObjDir)"/>
--    <Exec Condition="!$([System.String]::Copy(%(FilesToStrip.Identity)).EndsWith('.a')) and '$(BuildMonoAOTCrossCompilerOnly)' != 'true' and ('$(TargetsLinux)' == 'true' or '$(TargetsAndroid)' == 'true')" Command="$(_Objcopy) --strip-unneeded %(FilesToStrip.Identity)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(MonoObjDir)"/>
--    <Exec Condition="!$([System.String]::Copy(%(FilesToStrip.Identity)).EndsWith('.a')) and '$(BuildMonoAOTCrossCompilerOnly)' != 'true' and ('$(TargetsLinux)' == 'true' or '$(TargetsAndroid)' == 'true')" Command="$(_Objcopy) --add-gnu-debuglink=%(FilesToStrip.Identity).dbg %(FilesToStrip.Identity)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(MonoObjDir)"/>
-+    <Message Condition="'@(FilesToStrip)' != '' and '$(BuildMonoAOTCrossCompilerOnly)' != 'true' and ($([MSBuild]::IsOSPlatform('OSX')) or $([MSBuild]::IsOSPlatform('Linux')))" Text="Stripping debug symbols from %(FilesToStrip.Identity)" Importance="High"/>
-+    <Exec Condition="'@(FilesToStrip)' != '' and !$([System.String]::Copy(%(FilesToStrip.Identity)).EndsWith('.a')) and '$(BuildMonoAOTCrossCompilerOnly)' != 'true' and ('$(TargetsOSX)' == 'true' or '$(TargetsMacCatalyst)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true')" Command="dsymutil --flat --minimize %(FilesToStrip.Identity)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(MonoObjDir)"/>
-+    <Exec Condition="'@(FilesToStrip)' != '' and !$([System.String]::Copy(%(FilesToStrip.Identity)).EndsWith('.a')) and '$(BuildMonoAOTCrossCompilerOnly)' != 'true' and ('$(TargetsOSX)' == 'true' or '$(TargetsMacCatalyst)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true')" Command="strip -no_code_signature_warning -S %(FilesToStrip.Identity)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(MonoObjDir)"/>
-+    <Exec Condition="'@(FilesToStrip)' != '' and !$([System.String]::Copy(%(FilesToStrip.Identity)).EndsWith('.a')) and '$(BuildMonoAOTCrossCompilerOnly)' != 'true' and ('$(TargetsLinux)' == 'true' or '$(TargetsAndroid)' == 'true')" Command="$(_Objcopy) --only-keep-debug %(FilesToStrip.Identity) %(FilesToStrip.Identity).dbg" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(MonoObjDir)"/>
-+    <Exec Condition="'@(FilesToStrip)' != '' and !$([System.String]::Copy(%(FilesToStrip.Identity)).EndsWith('.a')) and '$(BuildMonoAOTCrossCompilerOnly)' != 'true' and ('$(TargetsLinux)' == 'true' or '$(TargetsAndroid)' == 'true')" Command="$(_Objcopy) --strip-unneeded %(FilesToStrip.Identity)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(MonoObjDir)"/>
-+    <Exec Condition="'@(FilesToStrip)' != '' and !$([System.String]::Copy(%(FilesToStrip.Identity)).EndsWith('.a')) and '$(BuildMonoAOTCrossCompilerOnly)' != 'true' and ('$(TargetsLinux)' == 'true' or '$(TargetsAndroid)' == 'true')" Command="$(_Objcopy) --add-gnu-debuglink=%(FilesToStrip.Identity).dbg %(FilesToStrip.Identity)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(MonoObjDir)"/>
-   </Target>
- 
-   <!-- Build AOT cross compiler (if available) -->

SOURCES/sdk-22373-portablerid.patch

@@ -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)' == ''">

SPECS/dotnet6.0.spec

@@ -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.8
+%global host_version 6.0.14
-%global runtime_version 6.0.8
+%global runtime_version 6.0.14
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 6.0.108
+%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 }')
@@ -34,7 +34,7 @@
 %global sdk_rpm_version %{sdk_version}
 
 # upstream can update releases without revving the SDK version so these don't always match
-%global upstream_tag v%{sdk_version}-SDK
+%global upstream_tag v%{sdk_version}
 
 %if 0%{?fedora} || 0%{?rhel} < 8
 %global use_bundled_libunwind 0
@@ -87,8 +87,6 @@ Source11:       dotnet.sh.in
 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
 Patch101:       runtime-mono-remove-ilstrip.patch
-# https://github.com/dotnet/runtime/pull/66594
-Patch102:       runtime-66594-s390x-debuginfo.patch
 
 # Disable apphost, needed for s390x
 Patch500:       fsharp-no-apphost.patch
@@ -113,11 +111,7 @@ 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
 
-# https://github.com/dotnet/installer/pull/12516
-Patch1600:      installer-12516-portablerid.patch
 
 %if 0%{?fedora} || 0%{?rhel} >= 8
 ExclusiveArch:  aarch64 x86_64 s390x
@@ -338,7 +332,7 @@ applications using the .NET SDK.
 %dotnet_targeting_pack dotnet-apphost-pack-6.0 %{runtime_rpm_version} Microsoft.NETCore.App 6.0 Microsoft.NETCore.App.Host.%{runtime_id}
 %dotnet_targeting_pack dotnet-targeting-pack-6.0 %{runtime_rpm_version} Microsoft.NETCore.App 6.0 Microsoft.NETCore.App.Ref
 %dotnet_targeting_pack aspnetcore-targeting-pack-6.0 %{aspnetcore_runtime_rpm_version} Microsoft.AspNetCore.App 6.0 Microsoft.AspNetCore.App.Ref
-%dotnet_targeting_pack netstandard-targeting-pack-2.1 %{sdk_rpm_version} NETStandard.Library 2.1 NETStandard.Library.Ref
+#%%dotnet_targeting_pack netstandard-targeting-pack-2.1 %%{sdk_rpm_version} NETStandard.Library 2.1 NETStandard.Library.Ref
 
 
 %package -n dotnet-sdk-6.0-source-built-artifacts
@@ -399,7 +393,6 @@ sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime/src/native/corehost/
 pushd src/runtime
 %patch100 -p1
 %patch101 -p1
-%patch102 -p1
 popd
 
 pushd src/fsharp
@@ -432,11 +425,9 @@ popd
 
 pushd src/sdk
 %patch1500 -p1
-%patch1501 -p1
 popd
 
 pushd src/installer
-%patch1600 -p1
 popd
 
 
@@ -488,7 +479,7 @@ export EXTRA_CFLAGS="$CFLAGS"
 export EXTRA_CXXFLAGS="$CXXFLAGS"
 export EXTRA_LDFLAGS="$LDFLAGS"
 
-VERBOSE=1 ./build.sh \
+CheckEolTargetFramework=false VERBOSE=1 ./build.sh \
 %if %{without bootstrap}
     --with-sdk previously-built-dotnet \
 %endif
@@ -534,28 +525,33 @@ find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.targets' -exec chmod -x {}
 find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.txt' -exec chmod -x {} \;
 find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.xml' -exec chmod -x {} \;
 
-install -dm 0755 %{buildroot}%{_sysconfdir}/profile.d/
+# Provided by dotnet-host from another SRPM
-install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/
+#install -dm 0755 %%{buildroot}%%{_sysconfdir}/profile.d/
+#install dotnet.sh %%{buildroot}%%{_sysconfdir}/profile.d/
 
-install -dm 0755 %{buildroot}/%{_datadir}/bash-completion/completions
+# Provided by dotnet-host from another SRPM
+#install -dm 0755 %%{buildroot}/%%{_datadir}/bash-completion/completions
 # dynamic completion needs the file to be named the same as the base command
-install src/sdk/scripts/register-completions.bash %{buildroot}/%{_datadir}/bash-completion/completions/dotnet
+#install src/sdk/scripts/register-completions.bash %%{buildroot}/%%{_datadir}/bash-completion/completions/dotnet
 
 # TODO: the zsh completion script needs to be ported to use #compdef
 #install -dm 755 %%{buildroot}/%%{_datadir}/zsh/site-functions
 #install src/cli/scripts/register-completions.zsh %%{buildroot}/%%{_datadir}/zsh/site-functions/_dotnet
 
-install -dm 0755 %{buildroot}%{_bindir}
+# Provided by dotnet-host from another SRPM
-ln -s ../../%{_libdir}/dotnet/dotnet %{buildroot}%{_bindir}/
+#install -dm 0755 %%{buildroot}%%{_bindir}
+#ln -s ../../%%{_libdir}/dotnet/dotnet %%{buildroot}%%{_bindir}/
 
-install -dm 0755 %{buildroot}%{_mandir}/man1/
+# Provided by dotnet-host from another SRPM
-find -iname 'dotnet*.1' -type f -exec cp {} %{buildroot}%{_mandir}/man1/ \;
+#install -dm 0755 %%{buildroot}%%{_mandir}/man1/
+#find -iname 'dotnet*.1' -type f -exec cp {} %%{buildroot}%%{_mandir}/man1/ \;
 
-install -dm 0755 %{buildroot}%{_sysconfdir}/dotnet
+# Provided by dotnet-host from another SRPM
-echo "%{_libdir}/dotnet" >> install_location
+#install -dm 0755 %%{buildroot}%%{_sysconfdir}/dotnet
-install install_location %{buildroot}%{_sysconfdir}/dotnet/
+#echo "%%{_libdir}/dotnet" >> install_location
-echo "%{_libdir}/dotnet" >> install_location_%{runtime_arch}
+#install install_location %%{buildroot}%%{_sysconfdir}/dotnet/
-install install_location_%{runtime_arch} %{buildroot}%{_sysconfdir}/dotnet/
+#echo "%%{_libdir}/dotnet" >> install_location_%%{runtime_arch}
+#install install_location_%%{runtime_arch} %%{buildroot}%%{_sysconfdir}/dotnet/
 
 install -dm 0755 %{buildroot}%{_libdir}/dotnet/source-built-artifacts
 install -m 0644 artifacts/%{runtime_arch}/Release/Private.SourceBuilt.Artifacts.*.tar.gz %{buildroot}/%{_libdir}/dotnet/source-built-artifacts/
@@ -571,29 +567,17 @@ echo "Testing build results for debug symbols..."
 %{SOURCE10} -v %{buildroot}%{_libdir}/dotnet/
 
 
-
+# Self-check
-%check
 %{buildroot}%{_libdir}/dotnet/dotnet --info
 %{buildroot}%{_libdir}/dotnet/dotnet --version
 
+# Provided by dotnet-host from another SRPM
+rm %{buildroot}%{_libdir}/dotnet/LICENSE.txt
+rm %{buildroot}%{_libdir}/dotnet/ThirdPartyNotices.txt
+rm %{buildroot}%{_libdir}/dotnet/dotnet
 
-%files -n dotnet
+# Provided by netstandard-targeting-pack-2.1 from another SRPM
-# empty package useful for dependencies
+rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
-
-%files -n dotnet-host
-%dir %{_libdir}/dotnet
-%{_libdir}/dotnet/dotnet
-%dir %{_libdir}/dotnet/host
-%dir %{_libdir}/dotnet/host/fxr
-%{_bindir}/dotnet
-%license %{_libdir}/dotnet/LICENSE.txt
-%license %{_libdir}/dotnet/ThirdPartyNotices.txt
-%doc %{_mandir}/man1/dotnet*.1.gz
-%config(noreplace) %{_sysconfdir}/profile.d/dotnet.sh
-%config(noreplace) %{_sysconfdir}/dotnet
-%dir %{_datadir}/bash-completion
-%dir %{_datadir}/bash-completion/completions
-%{_datadir}/bash-completion/completions/dotnet
 
 %files -n dotnet-hostfxr-6.0
 %dir %{_libdir}/dotnet/host/fxr
@@ -627,6 +611,30 @@ echo "Testing build results for debug symbols..."
 
 
 %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
+
+* Thu Dec 01 2022 Omair Majid <omajid@redhat.com> - 6.0.112-1
+- Update to .NET SDK 6.0.112 and Runtime 6.0.12
+- Resolves: RHBZ#2150147
+
+* Wed Nov 02 2022 Omair Majid <omajid@redhat.com> - 6.0.111-1
+- Update to .NET SDK 6.0.111 and Runtime 6.0.11
+- Resolves: RHBZ#2138277
+
+* Sat Sep 17 2022 Omair Majid <omajid@redhat.com> - 6.0.109-3
+- Remove subpackages that are now provided by other packages
+- Related: RHBZ#2123787
+
+* Wed Sep 14 2022 Omair Majid <omajid@redhat.com> - 6.0.109-2
+- Update to .NET SDK 6.0.109 and Runtime 6.0.9
+- Resolves: RHBZ#2123787
+
 * Tue Aug 09 2022 Omair Majid <omajid@redhat.com> - 6.0.108-1
 - Update to .NET SDK 6.0.108 and Runtime 6.0.8
 - Resolves: RHBZ#2112408