Commit 1919c8ca authored by Rocky Automation's avatar Rocky Automation 📺
Browse files

import dotnet3.1-3.1.119-1.el8_4

parent cf36a904
ccc393389b53e9e1cdf5e3a754e0e6b61d7895e2 SOURCES/dotnet-v3.1.118-SDK.tar.gz 4eb6c063a95a6c91f2f0a7c8c2633c00b4e5f178 SOURCES/dotnet-v3.1.119-SDK.tar.gz
SOURCES/dotnet-v3.1.118-SDK.tar.gz SOURCES/dotnet-v3.1.119-SDK.tar.gz
diff -Naurp dotnet-v3.1.118-SDK-orig/src/dotnet-coreclr.2aee3eb10b6303dff09cbe5ac99b6fae4644f346/init-distro-rid.sh dotnet-v3.1.118-SDK/src/dotnet-coreclr.2aee3eb10b6303dff09cbe5ac99b6fae4644f346/init-distro-rid.sh diff -Naurp dotnet-v3.1.119-SDK-orig/src/dotnet-coreclr.bb01933c496758887ca03572c8e2a16a82a1779a/init-distro-rid.sh dotnet-v3.1.119-SDK/src/dotnet-coreclr.bb01933c496758887ca03572c8e2a16a82a1779a/init-distro-rid.sh
--- dotnet-v3.1.118-SDK-orig/src/dotnet-coreclr.2aee3eb10b6303dff09cbe5ac99b6fae4644f346/init-distro-rid.sh 2021-07-29 11:51:27.000000000 -0700 --- dotnet-v3.1.119-SDK-orig/src/dotnet-coreclr.bb01933c496758887ca03572c8e2a16a82a1779a/init-distro-rid.sh 2021-07-29 11:51:27.000000000 -0700
+++ dotnet-v3.1.118-SDK/src/dotnet-coreclr.2aee3eb10b6303dff09cbe5ac99b6fae4644f346/init-distro-rid.sh 2021-08-11 16:09:37.673740318 -0700 +++ dotnet-v3.1.119-SDK/src/dotnet-coreclr.bb01933c496758887ca03572c8e2a16a82a1779a/init-distro-rid.sh 2021-08-11 16:09:37.673740318 -0700
@@ -51,7 +51,7 @@ initNonPortableDistroRid() @@ -51,7 +51,7 @@ initNonPortableDistroRid()
# We have forced __PortableBuild=0. This is because -portablebuld # We have forced __PortableBuild=0. This is because -portablebuld
# has been passed as false. # has been passed as false.
...@@ -17,9 +17,9 @@ diff -Naurp dotnet-v3.1.118-SDK-orig/src/dotnet-coreclr.2aee3eb10b6303dff09cbe5a ...@@ -17,9 +17,9 @@ diff -Naurp dotnet-v3.1.118-SDK-orig/src/dotnet-coreclr.2aee3eb10b6303dff09cbe5a
-} -}
\ No newline at end of file \ No newline at end of file
+} +}
diff -Naurp dotnet-v3.1.118-SDK-orig/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f434030849419f1e/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json dotnet-v3.1.118-SDK/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f434030849419f1e/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json diff -Naurp dotnet-v3.1.119-SDK-orig/src/dotnet-corefx.7711b939317ae5cb3ffa4f19a39119876aafd30e/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json dotnet-v3.1.119-SDK/src/dotnet-corefx.7711b939317ae5cb3ffa4f19a39119876aafd30e/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
--- dotnet-v3.1.118-SDK-orig/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f434030849419f1e/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-07-29 11:51:44.000000000 -0700 --- dotnet-v3.1.119-SDK-orig/src/dotnet-corefx.7711b939317ae5cb3ffa4f19a39119876aafd30e/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-07-29 11:51:44.000000000 -0700
+++ dotnet-v3.1.118-SDK/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f434030849419f1e/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-08-11 16:12:33.225921253 -0700 +++ dotnet-v3.1.119-SDK/src/dotnet-corefx.7711b939317ae5cb3ffa4f19a39119876aafd30e/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-08-11 16:12:33.225921253 -0700
@@ -3204,6 +3204,75 @@ @@ -3204,6 +3204,75 @@
"any", "any",
"base" "base"
...@@ -103,9 +103,9 @@ diff -Naurp dotnet-v3.1.118-SDK-orig/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f ...@@ -103,9 +103,9 @@ diff -Naurp dotnet-v3.1.118-SDK-orig/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f
-} -}
\ No newline at end of file \ No newline at end of file
+} +}
diff -Naurp dotnet-v3.1.118-SDK-orig/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f434030849419f1e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props dotnet-v3.1.118-SDK/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f434030849419f1e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props diff -Naurp dotnet-v3.1.119-SDK-orig/src/dotnet-corefx.7711b939317ae5cb3ffa4f19a39119876aafd30e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props dotnet-v3.1.119-SDK/src/dotnet-corefx.7711b939317ae5cb3ffa4f19a39119876aafd30e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
--- dotnet-v3.1.118-SDK-orig/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f434030849419f1e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-07-29 11:51:44.000000000 -0700 --- dotnet-v3.1.119-SDK-orig/src/dotnet-corefx.7711b939317ae5cb3ffa4f19a39119876aafd30e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-07-29 11:51:44.000000000 -0700
+++ dotnet-v3.1.118-SDK/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f434030849419f1e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-08-11 16:13:16.146454465 -0700 +++ dotnet-v3.1.119-SDK/src/dotnet-corefx.7711b939317ae5cb3ffa4f19a39119876aafd30e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-08-11 16:13:16.146454465 -0700
@@ -137,6 +137,12 @@ @@ -137,6 +137,12 @@
<Versions>9</Versions> <Versions>9</Versions>
</RuntimeGroup> </RuntimeGroup>
...@@ -119,9 +119,9 @@ diff -Naurp dotnet-v3.1.118-SDK-orig/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f ...@@ -119,9 +119,9 @@ diff -Naurp dotnet-v3.1.118-SDK-orig/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f
<RuntimeGroup Include="sles"> <RuntimeGroup Include="sles">
<Parent>linux</Parent> <Parent>linux</Parent>
<Architectures>x64</Architectures> <Architectures>x64</Architectures>
diff -Naurp dotnet-v3.1.118-SDK-orig/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f434030849419f1e/pkg/Microsoft.NETCore.Platforms/runtime.json dotnet-v3.1.118-SDK/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f434030849419f1e/pkg/Microsoft.NETCore.Platforms/runtime.json diff -Naurp dotnet-v3.1.119-SDK-orig/src/dotnet-corefx.7711b939317ae5cb3ffa4f19a39119876aafd30e/pkg/Microsoft.NETCore.Platforms/runtime.json dotnet-v3.1.119-SDK/src/dotnet-corefx.7711b939317ae5cb3ffa4f19a39119876aafd30e/pkg/Microsoft.NETCore.Platforms/runtime.json
--- dotnet-v3.1.118-SDK-orig/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f434030849419f1e/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-07-29 11:51:44.000000000 -0700 --- dotnet-v3.1.119-SDK-orig/src/dotnet-corefx.7711b939317ae5cb3ffa4f19a39119876aafd30e/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-07-29 11:51:44.000000000 -0700
+++ dotnet-v3.1.118-SDK/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f434030849419f1e/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-08-11 16:13:54.429930073 -0700 +++ dotnet-v3.1.119-SDK/src/dotnet-corefx.7711b939317ae5cb3ffa4f19a39119876aafd30e/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-08-11 16:13:54.429930073 -0700
@@ -1428,6 +1428,40 @@ @@ -1428,6 +1428,40 @@
"rhel-x64" "rhel-x64"
] ]
...@@ -170,9 +170,9 @@ diff -Naurp dotnet-v3.1.118-SDK-orig/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f ...@@ -170,9 +170,9 @@ diff -Naurp dotnet-v3.1.118-SDK-orig/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f
-} -}
\ No newline at end of file \ No newline at end of file
+} +}
diff -Naurp dotnet-v3.1.118-SDK-orig/src/dotnet-core-setup.5d3919d34e0d8940ee50c36d823ddc28d6b1723c/src/corehost/build.sh dotnet-v3.1.118-SDK/src/dotnet-core-setup.5d3919d34e0d8940ee50c36d823ddc28d6b1723c/src/corehost/build.sh diff -Naurp dotnet-v3.1.119-SDK-orig/src/dotnet-core-setup.aae002469c4fe298a532e11faa01378048840aa9/src/corehost/build.sh dotnet-v3.1.119-SDK/src/dotnet-core-setup.aae002469c4fe298a532e11faa01378048840aa9/src/corehost/build.sh
--- dotnet-v3.1.118-SDK-orig/src/dotnet-core-setup.5d3919d34e0d8940ee50c36d823ddc28d6b1723c/src/corehost/build.sh 2021-07-29 11:51:50.000000000 -0700 --- dotnet-v3.1.119-SDK-orig/src/dotnet-core-setup.aae002469c4fe298a532e11faa01378048840aa9/src/corehost/build.sh 2021-07-29 11:51:50.000000000 -0700
+++ dotnet-v3.1.118-SDK/src/dotnet-core-setup.5d3919d34e0d8940ee50c36d823ddc28d6b1723c/src/corehost/build.sh 2021-08-11 16:14:31.400389369 -0700 +++ dotnet-v3.1.119-SDK/src/dotnet-core-setup.aae002469c4fe298a532e11faa01378048840aa9/src/corehost/build.sh 2021-08-11 16:14:31.400389369 -0700
@@ -21,7 +21,7 @@ init_rid_plat() @@ -21,7 +21,7 @@ init_rid_plat()
__rid_plat="" __rid_plat=""
if [ -e /etc/os-release ]; then if [ -e /etc/os-release ]; then
...@@ -182,9 +182,9 @@ diff -Naurp dotnet-v3.1.118-SDK-orig/src/dotnet-core-setup.5d3919d34e0d8940ee50c ...@@ -182,9 +182,9 @@ diff -Naurp dotnet-v3.1.118-SDK-orig/src/dotnet-core-setup.5d3919d34e0d8940ee50c
# remove the last version number # remove the last version number
VERSION_ID=${VERSION_ID%.*} VERSION_ID=${VERSION_ID%.*}
fi fi
diff -Naurp dotnet-v3.1.118-SDK-orig/src/dotnet-core-setup.5d3919d34e0d8940ee50c36d823ddc28d6b1723c/src/corehost/common/pal.unix.cpp dotnet-v3.1.118-SDK/src/dotnet-core-setup.5d3919d34e0d8940ee50c36d823ddc28d6b1723c/src/corehost/common/pal.unix.cpp diff -Naurp dotnet-v3.1.119-SDK-orig/src/dotnet-core-setup.aae002469c4fe298a532e11faa01378048840aa9/src/corehost/common/pal.unix.cpp dotnet-v3.1.119-SDK/src/dotnet-core-setup.aae002469c4fe298a532e11faa01378048840aa9/src/corehost/common/pal.unix.cpp
--- dotnet-v3.1.118-SDK-orig/src/dotnet-core-setup.5d3919d34e0d8940ee50c36d823ddc28d6b1723c/src/corehost/common/pal.unix.cpp 2021-07-29 11:51:50.000000000 -0700 --- dotnet-v3.1.119-SDK-orig/src/dotnet-core-setup.aae002469c4fe298a532e11faa01378048840aa9/src/corehost/common/pal.unix.cpp 2021-07-29 11:51:50.000000000 -0700
+++ dotnet-v3.1.118-SDK/src/dotnet-core-setup.5d3919d34e0d8940ee50c36d823ddc28d6b1723c/src/corehost/common/pal.unix.cpp 2021-08-11 16:15:47.296332247 -0700 +++ dotnet-v3.1.119-SDK/src/dotnet-core-setup.aae002469c4fe298a532e11faa01378048840aa9/src/corehost/common/pal.unix.cpp 2021-08-11 16:15:47.296332247 -0700
@@ -496,6 +496,7 @@ pal::string_t normalize_linux_rid(pal::s @@ -496,6 +496,7 @@ pal::string_t normalize_linux_rid(pal::s
{ {
pal::string_t rhelPrefix(_X("rhel.")); pal::string_t rhelPrefix(_X("rhel."));
...@@ -204,9 +204,9 @@ diff -Naurp dotnet-v3.1.118-SDK-orig/src/dotnet-core-setup.5d3919d34e0d8940ee50c ...@@ -204,9 +204,9 @@ diff -Naurp dotnet-v3.1.118-SDK-orig/src/dotnet-core-setup.5d3919d34e0d8940ee50c
if (lastVersionSeparatorIndex != std::string::npos) if (lastVersionSeparatorIndex != std::string::npos)
{ {
diff -Naurp dotnet-v3.1.118-SDK-orig/src/dotnet-core-setup.5d3919d34e0d8940ee50c36d823ddc28d6b1723c/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs dotnet-v3.1.118-SDK/src/dotnet-core-setup.5d3919d34e0d8940ee50c36d823ddc28d6b1723c/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs diff -Naurp dotnet-v3.1.119-SDK-orig/src/dotnet-core-setup.aae002469c4fe298a532e11faa01378048840aa9/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs dotnet-v3.1.119-SDK/src/dotnet-core-setup.aae002469c4fe298a532e11faa01378048840aa9/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs
--- dotnet-v3.1.118-SDK-orig/src/dotnet-core-setup.5d3919d34e0d8940ee50c36d823ddc28d6b1723c/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs 2021-07-29 11:51:50.000000000 -0700 --- dotnet-v3.1.119-SDK-orig/src/dotnet-core-setup.aae002469c4fe298a532e11faa01378048840aa9/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs 2021-07-29 11:51:50.000000000 -0700
+++ dotnet-v3.1.118-SDK/src/dotnet-core-setup.5d3919d34e0d8940ee50c36d823ddc28d6b1723c/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs 2021-08-11 16:16:25.319804622 -0700 +++ dotnet-v3.1.119-SDK/src/dotnet-core-setup.aae002469c4fe298a532e11faa01378048840aa9/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs 2021-08-11 16:16:25.319804622 -0700
@@ -181,7 +181,7 @@ namespace Microsoft.DotNet.PlatformAbstr @@ -181,7 +181,7 @@ namespace Microsoft.DotNet.PlatformAbstr
lastVersionNumberSeparatorIndex = distroInfo.VersionId.IndexOf('.', lastVersionNumberSeparatorIndex + 1); lastVersionNumberSeparatorIndex = distroInfo.VersionId.IndexOf('.', lastVersionNumberSeparatorIndex + 1);
} }
......
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
%endif %endif
%global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g') %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g')
%global host_version 3.1.18 %global host_version 3.1.19
%global runtime_version 3.1.18 %global runtime_version 3.1.19
%global aspnetcore_runtime_version %{runtime_version} %global aspnetcore_runtime_version %{runtime_version}
%global sdk_version 3.1.118 %global sdk_version 3.1.119
%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 }')
%global host_rpm_version %{host_version} %global host_rpm_version %{host_version}
...@@ -449,9 +449,13 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 ...@@ -449,9 +449,13 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
%dir %{_libdir}/dotnet/packs %dir %{_libdir}/dotnet/packs
%changelog %changelog
* Wed Aug 11 2021 Release Engineering <releng@rockylinux.org> - 3.1.118-1.rocky.1 * Wed Sep 15 2021 Release Engineering <releng@rockylinux.org> - 3.1.119-1.rocky.1
- Add Rocky Runtime ID with minor versions - Add Rocky Runtime ID with minor versions
* Thu Sep 02 2021 Omair Majid <omajid@redhat.com> - 3.1.119-1
- Update to .NET SDK 3.1.119 and Runtime 3.1.19
- Resolves: RHBZ#2000459
* Thu Aug 05 2021 Omair Majid <omajid@redhat.com> - 3.1.118-1 * Thu Aug 05 2021 Omair Majid <omajid@redhat.com> - 3.1.118-1
- Update to .NET SDK 3.1.118 and Runtime 3.1.18 - Update to .NET SDK 3.1.118 and Runtime 3.1.18
- Resolves: RHBZ#1990189 - Resolves: RHBZ#1990189
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment