From 945591da435cc6ab85161a8b2ef3d6d3f142798f Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 26 Apr 2021 23:40:24 +0200 Subject: [PATCH 1/3] Stop harvesting old frameworks in more libraries The removed configurations (few netstandard1.x, portable*, netcore50, net46) of the touched packages aren't built anymore. Instead the already built matching binaries from the latest available packages are redistributed when packaging these libraries. Dropping these assets as the minimum supported set of platforms are ones that support netstandard2.0. For .NET Framework, there's still a net461 configuration present to avoid binding redirect issues. Contributes to https://github.com/dotnet/runtime/issues/47530 --- .../pkg/Microsoft.Win32.Registry.pkgproj | 7 ++----- .../pkg/System.Security.Principal.Windows.pkgproj | 7 ++----- .../pkg/System.Text.Encoding.CodePages.pkgproj | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/libraries/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.pkgproj b/src/libraries/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.pkgproj index 58a6e595e9cad5..0c82f94c890533 100644 --- a/src/libraries/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.pkgproj +++ b/src/libraries/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.pkgproj @@ -5,11 +5,8 @@ net461;uap10.0.16299;netcoreapp2.0;$(AllXamarinFrameworks) - - - netcore50 - - + + \ No newline at end of file diff --git a/src/libraries/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj b/src/libraries/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj index bfe20bca7a2135..dc12b23d464cad 100644 --- a/src/libraries/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj +++ b/src/libraries/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj @@ -5,11 +5,8 @@ net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) - - - - + + \ No newline at end of file diff --git a/src/libraries/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.pkgproj b/src/libraries/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.pkgproj index 5df72d916f2a47..eac52a84aeb980 100644 --- a/src/libraries/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.pkgproj +++ b/src/libraries/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.pkgproj @@ -7,8 +7,8 @@ net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) - - + + From 2f4140f383cac011468e97337a8994ccc1268218 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 27 Apr 2021 11:25:10 +0200 Subject: [PATCH 2/3] Add S.S.AccessControl and part of Pipes.ACL --- .../pkg/System.IO.Pipes.AccessControl.pkgproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.pkgproj b/src/libraries/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.pkgproj index 2bbf27b955d142..ce23756865fee5 100644 --- a/src/libraries/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.pkgproj +++ b/src/libraries/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.pkgproj @@ -4,13 +4,13 @@ $(NetCoreAppCurrent) - + - - + + \ No newline at end of file From c8e66d892b4baf516fa7a41fd32dbea804da7759 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 27 Apr 2021 13:51:58 +0200 Subject: [PATCH 3/3] S.Sec.ACL and remove dead code --- .../pkg/System.Security.AccessControl.pkgproj | 7 ++----- .../netcoreapp1.0/workaroundDowngrade.targets | 6 ------ .../netcoreapp1.0/workaroundDowngrade.targets | 6 ------ .../netcoreapp1.0/workaroundDowngrade.targets | 6 ------ .../netcoreapp1.0/workaroundDowngrade.targets | 6 ------ .../netcoreapp1.0/workaroundDowngrade.targets | 6 ------ 6 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 src/libraries/pkg/test/packageSettings/System.Buffers/netcoreapp1.0/workaroundDowngrade.targets delete mode 100644 src/libraries/pkg/test/packageSettings/System.Reflection.TypeExtensions/netcoreapp1.0/workaroundDowngrade.targets delete mode 100644 src/libraries/pkg/test/packageSettings/System.Runtime.WindowsRuntime/netcoreapp1.0/workaroundDowngrade.targets delete mode 100644 src/libraries/pkg/test/packageSettings/System.Security.Cryptography.Cng/netcoreapp1.0/workaroundDowngrade.targets delete mode 100644 src/libraries/pkg/test/packageSettings/System.Security.Principal.Windows/netcoreapp1.0/workaroundDowngrade.targets diff --git a/src/libraries/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj b/src/libraries/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj index 1ef45f103a6d65..6f398d889dd7fc 100644 --- a/src/libraries/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj +++ b/src/libraries/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj @@ -5,11 +5,8 @@ net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) - - - netcore50 - - + + \ No newline at end of file diff --git a/src/libraries/pkg/test/packageSettings/System.Buffers/netcoreapp1.0/workaroundDowngrade.targets b/src/libraries/pkg/test/packageSettings/System.Buffers/netcoreapp1.0/workaroundDowngrade.targets deleted file mode 100644 index 2f4f96679a9c79..00000000000000 --- a/src/libraries/pkg/test/packageSettings/System.Buffers/netcoreapp1.0/workaroundDowngrade.targets +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/libraries/pkg/test/packageSettings/System.Reflection.TypeExtensions/netcoreapp1.0/workaroundDowngrade.targets b/src/libraries/pkg/test/packageSettings/System.Reflection.TypeExtensions/netcoreapp1.0/workaroundDowngrade.targets deleted file mode 100644 index 2f4f96679a9c79..00000000000000 --- a/src/libraries/pkg/test/packageSettings/System.Reflection.TypeExtensions/netcoreapp1.0/workaroundDowngrade.targets +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/libraries/pkg/test/packageSettings/System.Runtime.WindowsRuntime/netcoreapp1.0/workaroundDowngrade.targets b/src/libraries/pkg/test/packageSettings/System.Runtime.WindowsRuntime/netcoreapp1.0/workaroundDowngrade.targets deleted file mode 100644 index 2f4f96679a9c79..00000000000000 --- a/src/libraries/pkg/test/packageSettings/System.Runtime.WindowsRuntime/netcoreapp1.0/workaroundDowngrade.targets +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/libraries/pkg/test/packageSettings/System.Security.Cryptography.Cng/netcoreapp1.0/workaroundDowngrade.targets b/src/libraries/pkg/test/packageSettings/System.Security.Cryptography.Cng/netcoreapp1.0/workaroundDowngrade.targets deleted file mode 100644 index 2f4f96679a9c79..00000000000000 --- a/src/libraries/pkg/test/packageSettings/System.Security.Cryptography.Cng/netcoreapp1.0/workaroundDowngrade.targets +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/libraries/pkg/test/packageSettings/System.Security.Principal.Windows/netcoreapp1.0/workaroundDowngrade.targets b/src/libraries/pkg/test/packageSettings/System.Security.Principal.Windows/netcoreapp1.0/workaroundDowngrade.targets deleted file mode 100644 index 2f4f96679a9c79..00000000000000 --- a/src/libraries/pkg/test/packageSettings/System.Security.Principal.Windows/netcoreapp1.0/workaroundDowngrade.targets +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file