From 45c3e68c7761af4f72d3d102336670c87590cca6 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Tue, 28 Aug 2018 15:22:39 -0700 Subject: [PATCH] Remove package for System.IO.Pipes.AccessControl We no longer need to ship an updated version of this package so remove it as well as all but the netcoreapp and uap build configurations. The API surface is frozen because it is inbox on uap so we cannot do anything beyond service the package which can happen in the servicing branches. If we need to make a larger change to this library we can always bring back the package and harvest all the older assets. Commit migrated from https://github.com/dotnet/corefx/commit/4e76a6c02552422ce07967f4249acad3b71b80ef --- .../pkg/System.IO.Pipes.AccessControl.pkgproj | 20 ------ .../ref/Configurations.props | 7 +- .../ref/System.IO.Pipes.AccessControl.csproj | 7 +- .../src/Configurations.props | 9 +-- .../src/Resources/Strings.resx | 76 ---------------------- .../src/System.IO.Pipes.AccessControl.csproj | 24 +------ .../src/System/IO/PipesAclExtensions.net46.cs | 22 ------- .../external/harvestPackages/harvestPackages.props | 3 - .../packageIndex.json | 4 +- 9 files changed, 8 insertions(+), 164 deletions(-) delete mode 100644 src/libraries/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.pkgproj delete mode 100644 src/libraries/System.IO.Pipes.AccessControl/src/Resources/Strings.resx delete mode 100644 src/libraries/System.IO.Pipes.AccessControl/src/System/IO/PipesAclExtensions.net46.cs 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 deleted file mode 100644 index 07d6f26..0000000 --- a/src/libraries/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.pkgproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - net461 - - - - - netcore50 - - - - - runtimes/win/lib/$(UAPvNextTFM) - - - - \ No newline at end of file diff --git a/src/libraries/System.IO.Pipes.AccessControl/ref/Configurations.props b/src/libraries/System.IO.Pipes.AccessControl/ref/Configurations.props index 512a1e8..c398e42 100644 --- a/src/libraries/System.IO.Pipes.AccessControl/ref/Configurations.props +++ b/src/libraries/System.IO.Pipes.AccessControl/ref/Configurations.props @@ -1,13 +1,8 @@  - - netstandard; - net461; - - $(PackageConfigurations) - netfx; + netstandard; \ No newline at end of file diff --git a/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj b/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj index cb10550..bed46e9 100644 --- a/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj +++ b/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj @@ -1,17 +1,12 @@ {994DCE47-4CF6-479D-AB1D-4EA6A2809C34} - true net461-Debug;net461-Release;netfx-Debug;netfx-Release;netstandard-Debug;netstandard-Release - - - - - + diff --git a/src/libraries/System.IO.Pipes.AccessControl/src/Configurations.props b/src/libraries/System.IO.Pipes.AccessControl/src/Configurations.props index a64a00a..13c2d59 100644 --- a/src/libraries/System.IO.Pipes.AccessControl/src/Configurations.props +++ b/src/libraries/System.IO.Pipes.AccessControl/src/Configurations.props @@ -1,16 +1,9 @@  - - net461-Windows_NT; - netcoreapp-Windows_NT; - netstandard-Windows_NT; - netstandard; - - $(PackageConfigurations); uap-Windows_NT; - netfx-Windows_NT; + netcoreapp-Windows_NT; \ No newline at end of file diff --git a/src/libraries/System.IO.Pipes.AccessControl/src/Resources/Strings.resx b/src/libraries/System.IO.Pipes.AccessControl/src/Resources/Strings.resx deleted file mode 100644 index 4592969..0000000 --- a/src/libraries/System.IO.Pipes.AccessControl/src/Resources/Strings.resx +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Invalid PipeAccessRights value. - - - This flag may not be set on a pipe. - - - Pipe hasn't been connected yet. - - - Pipe is broken. - - - Access Control List (ACL) APIs are part of resource management on Windows and are not supported on this platform. - - diff --git a/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj b/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj index fb244d0..2b18ca0 100644 --- a/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj +++ b/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj @@ -2,29 +2,11 @@ System.IO.Pipes.AccessControl {40059634-BB03-4A6F-8657-CCE2D376BC8B} - false - true - SR.PlatformNotSupported_AccessControl - true + false + true net461-Windows_NT-Debug;net461-Windows_NT-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard-Debug;netstandard-Release;netstandard-Windows_NT-Debug;netstandard-Windows_NT-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release - - - - - - - - - - - - - - - - - + diff --git a/src/libraries/System.IO.Pipes.AccessControl/src/System/IO/PipesAclExtensions.net46.cs b/src/libraries/System.IO.Pipes.AccessControl/src/System/IO/PipesAclExtensions.net46.cs deleted file mode 100644 index 2ff970f..0000000 --- a/src/libraries/System.IO.Pipes.AccessControl/src/System/IO/PipesAclExtensions.net46.cs +++ /dev/null @@ -1,22 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.IO; -using System.Security.AccessControl; - -namespace System.IO.Pipes -{ - public static class PipesAclExtensions - { - public static PipeSecurity GetAccessControl(PipeStream stream) - { - return stream.GetAccessControl(); - } - - public static void SetAccessControl(PipeStream stream, PipeSecurity pipeSecurity) - { - stream.SetAccessControl(pipeSecurity); - } - } -} diff --git a/src/libraries/external/harvestPackages/harvestPackages.props b/src/libraries/external/harvestPackages/harvestPackages.props index ae54243..71c34ee 100644 --- a/src/libraries/external/harvestPackages/harvestPackages.props +++ b/src/libraries/external/harvestPackages/harvestPackages.props @@ -91,9 +91,6 @@ 4.5.0 - - 4.5.1 - 4.5.0 diff --git a/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json index 606a634..b32ee95 100644 --- a/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json +++ b/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json @@ -2288,6 +2288,7 @@ "StableVersions": [ "4.3.0", "4.4.0", + "4.5.0", "4.5.1" ], "BaselineVersion": "4.5.1", @@ -2297,8 +2298,7 @@ "AssemblyVersionInPackageVersion": { "4.0.1.0": "4.3.0", "4.0.2.0": "4.4.0", - "4.0.3.0": "4.5.0", - "4.0.4.0": "4.6.0" + "4.0.3.0": "4.5.0" } }, "System.IO.Ports": { -- 2.7.4