Commit 377d6401 authored by Rocky Automation's avatar Rocky Automation 📺
Browse files

import dotnet3.1-3.1.115-1.el8_4

parent 1b85276f
888025430ffdfffda636f91021430537041147b6 SOURCES/dotnet-v3.1.114-SDK.tar.gz
e6ef455f23890d0984537aa745a3ccb9b2c50c31 SOURCES/dotnet-v3.1.115-SDK.tar.gz
SOURCES/dotnet-v3.1.114-SDK.tar.gz
SOURCES/dotnet-v3.1.115-SDK.tar.gz
--- dotnet-v3.1.113-SDK/src/dotnet-corefx.9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-02-24 16:45:07.000000000 -0500
+++ dotnet-v3.1.113-SDK-mod/src/dotnet-corefx.9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-04-14 11:39:13.696935030 -0500
@@ -3085,6 +3085,81 @@
diff -Naurp dotnet-v3.1.114-SDK-orig/src/dotnet-corefx.6e37696a5420057596d61119614574db9037c652/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json dotnet-v3.1.114-SDK/src/dotnet-corefx.6e37696a5420057596d61119614574db9037c652/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
--- dotnet-v3.1.114-SDK-orig/src/dotnet-corefx.6e37696a5420057596d61119614574db9037c652/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-03-31 04:54:35.000000000 -0700
+++ dotnet-v3.1.114-SDK/src/dotnet-corefx.6e37696a5420057596d61119614574db9037c652/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-05-28 13:38:37.322564115 -0700
@@ -3141,6 +3141,236 @@
"any",
"base"
],
......@@ -50,8 +51,8 @@
+ "rocky.8-arm64",
+ "rocky.8",
+ "rocky-arm64",
+ "rhel.8-arm64",
+ "rocky",
+ "rhel.8-arm64",
+ "rhel.8",
+ "rhel-arm64",
+ "rhel",
......@@ -66,8 +67,60 @@
+ "rocky.8-x64",
+ "rocky.8",
+ "rocky-x64",
+ "rocky",
+ "rhel.8-x64",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.8.0": [
+ "rocky.8.0",
+ "rocky.8",
+ "rhel.8.0",
+ "rhel.8",
+ "rocky",
+ "rhel",
+ "linux",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.8.0-arm64": [
+ "rocky.8.0-arm64",
+ "rocky.8.0",
+ "rocky.8-arm64",
+ "rocky.8",
+ "rocky-arm64",
+ "rocky",
+ "rhel.8.0-arm64",
+ "rhel.8.0",
+ "rhel.8-arm64",
+ "rhel.8",
+ "rhel-arm64",
+ "rhel",
+ "linux-arm64",
+ "linux",
+ "unix-arm64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.8.0-x64": [
+ "rocky.8.0-x64",
+ "rocky.8.0",
+ "rocky.8-x64",
+ "rocky.8",
+ "rocky-x64",
+ "rocky",
+ "rhel.8.0-x64",
+ "rhel.8.0",
+ "rhel.8-x64",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
......@@ -78,39 +131,117 @@
+ "any",
+ "base"
+ ],
+
"sles": [
+ "rocky.8.1": [
+ "rocky.8.1",
+ "rocky.8.0",
+ "rocky.8",
+ "rocky",
+ "rhel.8.1",
+ "rhel.8.0",
+ "rhel.8",
+ "rhel",
+ "linux",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.8.1-arm64": [
+ "rocky.8.1-arm64",
+ "rocky.8.1",
+ "rocky.8.0-arm64",
+ "rocky.8.0",
+ "rocky.8-arm64",
+ "rocky.8",
+ "rocky-arm64",
+ "rocky",
+ "rhel.8.1-arm64",
+ "rhel.8.1",
+ "rhel.8.0-arm64",
+ "rhel.8.0",
+ "rhel.8-arm64",
+ "rhel.8",
+ "rhel-arm64",
+ "rhel",
+ "linux-arm64",
+ "linux",
+ "unix-arm64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.8.1-x64": [
+ "rocky.8.1-x64",
+ "rocky.8.1",
+ "rocky.8.0-x64",
+ "rocky.8.0",
+ "rocky.8-x64",
+ "rocky.8",
+ "rocky-x64",
+ "rocky",
+ "rhel.8.1-x64",
+ "rhel.8.1",
+ "rhel.8.0-x64",
+ "rhel.8.0",
+ "rhel.8-x64",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.9": [
+ "rocky.9",
+ "rhel.9",
+ "rocky",
+ "rhel",
+ "linux",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.9-arm64": [
+ "rocky.9-arm64",
+ "rocky.9",
+ "rocky-arm64",
+ "rocky",
+ "rhel.9-arm64",
+ "rhel.9",
+ "rhel-arm64",
+ "rhel",
+ "linux-arm64",
+ "linux",
+ "unix-arm64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.9-x64": [
+ "rocky.9-x64",
+ "rocky.9",
+ "rocky-x64",
+ "rocky",
+ "rhel.9-x64",
+ "rhel.9",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
"sles-x64": [
"sles-x64",
"sles",
"linux",
@@ -5106,4 +5181,4 @@
"any",
"base"
]
-}
\ No newline at end of file
+}
diff -ur dotnet-v3.1.113-SDK/src/dotnet-corefx.9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props dotnet-v3.1.113-SDK-mod/src/dotnet-corefx.9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
--- dotnet-v3.1.113-SDK/src/dotnet-corefx.9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-02-24 16:45:07.000000000 -0500
+++ dotnet-v3.1.113-SDK-mod/src/dotnet-corefx.9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-04-14 11:46:56.998806793 -0500
@@ -125,6 +125,14 @@
<Versions>9</Versions>
</RuntimeGroup>
+ <RuntimeGroup Include="rocky">
+ <Parent>rhel</Parent>
+ <Architectures>x64;arm64</Architectures>
+ <Versions>8</Versions>
+ <ApplyVersionsToParent>true</ApplyVersionsToParent>
+ <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
+ </RuntimeGroup>
+
<RuntimeGroup Include="sles">
<Parent>linux</Parent>
<Architectures>x64</Architectures>
diff -ur dotnet-v3.1.113-SDK/src/dotnet-corefx.9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e/pkg/Microsoft.NETCore.Platforms/runtime.json dotnet-v3.1.113-SDK-mod/src/dotnet-corefx.9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e/pkg/Microsoft.NETCore.Platforms/runtime.json
--- dotnet-v3.1.113-SDK/src/dotnet-corefx.9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-02-24 16:45:07.000000000 -0500
+++ dotnet-v3.1.113-SDK-mod/src/dotnet-corefx.9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-04-14 11:43:24.367703508 -0500
@@ -1367,6 +1367,43 @@
diff -Naurp dotnet-v3.1.114-SDK-orig/src/dotnet-corefx.6e37696a5420057596d61119614574db9037c652/pkg/Microsoft.NETCore.Platforms/runtime.json dotnet-v3.1.114-SDK/src/dotnet-corefx.6e37696a5420057596d61119614574db9037c652/pkg/Microsoft.NETCore.Platforms/runtime.json
--- dotnet-v3.1.114-SDK-orig/src/dotnet-corefx.6e37696a5420057596d61119614574db9037c652/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-03-31 04:54:35.000000000 -0700
+++ dotnet-v3.1.114-SDK/src/dotnet-corefx.6e37696a5420057596d61119614574db9037c652/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-05-28 13:53:24.153964344 -0700
@@ -1395,6 +1395,103 @@
"rhel-x64"
]
},
......@@ -150,14 +281,67 @@ diff -ur dotnet-v3.1.113-SDK/src/dotnet-corefx.9299d909ff6c03c664a3f9a3ef995a9fa
+ "rocky-x64",
+ "rhel.8-x64"
+ ]
+ },
+ "rocky.8.0": {
+ "#import": [
+ "rocky.8",
+ "rhel.8.0"
+ ]
+ },
+ "rocky.8.0-arm64": {
+ "#import": [
+ "rocky.8.0",
+ "rocky.8-arm64",
+ "rhel.8.0-arm64"
+ ]
+ },
+ "rocky.8.0-x64": {
+ "#import": [
+ "rocky.8.0",
+ "rocky.8-x64",
+ "rhel.8.0-x64"
+ ]
+ },
+ "rocky.8.1": {
+ "#import": [
+ "rocky.8.0",
+ "rhel.8.0"
+ ]
+ },
+ "rocky.8.1-arm64": {
+ "#import": [
+ "rocky.8.1",
+ "rocky.8-arm64",
+ "rhel.8.0-arm64"
+ ]
+ },
+ "rocky.8.1-x64": {
+ "#import": [
+ "rocky.8.1",
+ "rocky.8-x64",
+ "rhel.8.0-x64"
+ ]
+ },
+ "rocky.9": {
+ "#import": [
+ "rocky",
+ "rhel.9"
+ ]
+ },
+ "rocky.9-arm64": {
+ "#import": [
+ "rocky.9",
+ "rocky-arm64",
+ "rhel.9-arm64"
+ ]
+ },
+ "rocky.9-x64": {
+ "#import": [
+ "rocky.9",
+ "rocky-x64",
+ "rhel.9-x64"
+ ]
+ },
"sles": {
"#import": [
"linux"
@@ -2329,4 +2366,4 @@
]
}
}
-}
\ No newline at end of file
+}
......@@ -23,10 +23,10 @@
%endif
%global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g')
%global host_version 3.1.14
%global runtime_version 3.1.14
%global host_version 3.1.15
%global runtime_version 3.1.15
%global aspnetcore_runtime_version %{runtime_version}
%global sdk_version 3.1.114
%global sdk_version 3.1.115
%global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
%global host_rpm_version %{host_version}
......@@ -59,7 +59,7 @@
Name: dotnet3.1
Version: %{sdk_rpm_version}
Release: 2%{?dist}.rocky
Release: 1%{?dist}.rocky
Summary: .NET Core CLI tools and runtime
License: MIT and ASL 2.0 and BSD
URL: https://github.com/dotnet/
......@@ -453,8 +453,12 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
%dir %{_libdir}/dotnet/packs
%changelog
* Tue May 18 2021 Michael L. Young <elgueromexicano@gmail.com> - 3.1.114-2.rocky
- Add Rocky Runtime ID
* Fri May 28 2021 Louis Abel <label@rockylinux.org> - 3.1.115-1.rocky
- Add Rocky Runtime ID with minor numbers
* Wed Apr 28 2021 Omair Majid <omajid@redhat.com> - 3.1.115-1
- Update to .NET SDK 3.1.115 and Runtime 3.1.15
- Resolves: RHBZ#1954333
* Tue Apr 13 2021 Omair Majid <omajid@redhat.com> - 3.1.114-2
- Rebuild to tag into the correct location
......
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