diff --git a/docs/coding-guidelines/libraries-packaging.md b/docs/coding-guidelines/libraries-packaging.md index f8dd661f077650..51c5424583e686 100644 --- a/docs/coding-guidelines/libraries-packaging.md +++ b/docs/coding-guidelines/libraries-packaging.md @@ -10,7 +10,7 @@ The library should have both a `ref` and `src` project. Its reference assembly w Including a library in the shared framework only includes the best applicable TargetFramework build of that library: `$(NetCoreAppCurrent)` if it exists, but possibly `netstandard2.1` or another if that is best. If a library has builds for other frameworks those will only be shipped if the library also produces a [Nuget package](#nuget-package). -In some occasions we may want to include a library in the shared framework, but not expose it publicly. To do so, include the library in the `NetCoreAppLibraryNoReference` property in [NetCoreAppLibrary.props](../../src/libraries/NetCoreAppLibrary.props). The library should also be named in a way to discourage use at runtime, for example using the `System.Private` prefix. We should avoid hiding arbitrary public libraries as it complicates deployment and servicing, though some platform specific libraries are in this state due to historical reasons. +In some occasions we may want to include a library in the shared framework, but not expose it publicly. The library should be named in a way to discourage use at runtime, for example using the `System.Private` prefix. We should avoid hiding arbitrary public libraries as it complicates deployment and servicing. Libraries included in the shared framework should ensure all direct and transitive assembly references are also included in the shared framework. This will be validated as part of the build and errors raised if any dependencies are unsatisfied. diff --git a/eng/Versions.props b/eng/Versions.props index 7c4e7f2107e9a0..21bf781867ee1d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,41 +72,42 @@ 6.0.0-preview.6.21314.1 + 5.0.0 + 4.3.0 + 5.0.0 1.2.0-beta.304 - 4.3.0 4.5.1 4.3.0 - 4.3.0 5.0.0 - 4.8.1 + 4.8.2 + 4.5.0 4.3.0 - 4.3.0 - 4.3.0 - 4.3.0 4.3.0 + 5.0.0 + 5.0.0 4.3.0 4.5.4 - 4.3.4 4.3.1 4.5.0 - 4.3.0 5.0.0 - 4.3.0 + 4.7.0 + 4.7.0 + 4.7.0 4.3.1 4.3.1 4.3.0 4.3.0 4.3.0 + 5.0.0 4.3.1 - 4.7.0 - 4.7.0 + 5.0.0 + 5.0.0 + 5.0.0 + 4.8.1 6.0.0-preview.6.21314.1 6.0.0-preview.6.21314.1 - 4.3.0 4.5.4 4.5.0 - 1.1.1 - 4.3.0 6.0.0-preview.6.21314.1 6.0.0-beta.21307.1 diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props index f3ff8019dacb20..3efbe093fb75eb 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props @@ -68,7 +68,6 @@ - diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets index 0bb22a512a9379..051d90878db1af 100644 --- a/src/libraries/Directory.Build.targets +++ b/src/libraries/Directory.Build.targets @@ -41,8 +41,7 @@ $(NetCoreAppLibrary.Contains('$(AssemblyName);'))">true true + $(NetCoreAppLibrary.Contains('$(AssemblyName);'))">true - - - + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj b/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj index 6ce1218ec14c4c..f66a53a084091d 100644 --- a/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj +++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj @@ -12,8 +12,8 @@ - - - + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Win32.Registry/Directory.Build.props b/src/libraries/Microsoft.Win32.Registry/Directory.Build.props index e02d0c28b4c563..709a22a7537088 100644 --- a/src/libraries/Microsoft.Win32.Registry/Directory.Build.props +++ b/src/libraries/Microsoft.Win32.Registry/Directory.Build.props @@ -2,15 +2,6 @@ Microsoft - true windows - Provides support for accessing and modifying the Windows Registry. - -Commonly Used Types: -Microsoft.Win32.RegistryKey -Microsoft.Win32.Registry -Microsoft.Win32.RegistryValueKind -Microsoft.Win32.RegistryHive -Microsoft.Win32.RegistryView \ No newline at end of file diff --git a/src/libraries/Microsoft.Win32.Registry/NuGet.config b/src/libraries/Microsoft.Win32.Registry/NuGet.config deleted file mode 100644 index a66b7f9b013241..00000000000000 --- a/src/libraries/Microsoft.Win32.Registry/NuGet.config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/libraries/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.pkgproj b/src/libraries/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.pkgproj deleted file mode 100644 index 0c82f94c890533..00000000000000 --- a/src/libraries/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.pkgproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - - net461;uap10.0.16299;netcoreapp2.0;$(AllXamarinFrameworks) - - - - - - - \ No newline at end of file diff --git a/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj b/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj index 6c1d89fa6ad4ac..8d2c8aaa1e1b13 100644 --- a/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj +++ b/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj @@ -1,19 +1,12 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent) enable - - + - - - - - - - - + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.net461.cs b/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.net461.cs deleted file mode 100644 index 1fb81f88a9a284..00000000000000 --- a/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.net461.cs +++ /dev/null @@ -1,21 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// ------------------------------------------------------------------------------ -// Changes to this file must follow the https://aka.ms/api-review process. -// ------------------------------------------------------------------------------ - -using System.Runtime.CompilerServices; - -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.RegistryAccessRule))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.RegistryAuditRule))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.RegistryRights))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.RegistrySecurity))] -[assembly: TypeForwardedTo(typeof(Microsoft.Win32.Registry))] -[assembly: TypeForwardedTo(typeof(Microsoft.Win32.RegistryHive))] -[assembly: TypeForwardedTo(typeof(Microsoft.Win32.RegistryKey))] -[assembly: TypeForwardedTo(typeof(Microsoft.Win32.RegistryKeyPermissionCheck))] -[assembly: TypeForwardedTo(typeof(Microsoft.Win32.RegistryOptions))] -[assembly: TypeForwardedTo(typeof(Microsoft.Win32.RegistryValueKind))] -[assembly: TypeForwardedTo(typeof(Microsoft.Win32.RegistryValueOptions))] -[assembly: TypeForwardedTo(typeof(Microsoft.Win32.RegistryView))] -[assembly: TypeForwardedTo(typeof(Microsoft.Win32.SafeHandles.SafeRegistryHandle))] diff --git a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj index 4c759ebdffaaa7..2c5fa34fc434db 100644 --- a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj +++ b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj @@ -2,16 +2,15 @@ true $(DefineConstants);REGISTRY_ASSEMBLY - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent) $(NoWarn);CA2249 enable - true $(NoWarn);CA1823 - + - + - + - - @@ -87,11 +84,4 @@ - - - - - - - diff --git a/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj b/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj index bfe24efad01533..e88f97d0cb43cc 100644 --- a/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj +++ b/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj @@ -1,7 +1,7 @@ $(DefineConstants);REGISTRY_ASSEMBLY - $(NetCoreAppCurrent)-windows;net461-windows + $(NetCoreAppCurrent)-windows - - - \ No newline at end of file diff --git a/src/libraries/NetCoreAppLibrary.props b/src/libraries/NetCoreAppLibrary.props index c488a78a056559..cd44cc99317ab9 100644 --- a/src/libraries/NetCoreAppLibrary.props +++ b/src/libraries/NetCoreAppLibrary.props @@ -145,17 +145,9 @@ System.Xml.XPath; System.Xml.XPath.XDocument; - - Microsoft.Win32.Registry; - System.IO.FileSystem.AccessControl; - System.IO.Pipes.AccessControl; - System.Security.AccessControl; - System.Security.Principal.Windows; - - \ No newline at end of file diff --git a/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.csproj b/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.csproj index e3202214d8843a..b7a09b249da428 100644 --- a/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.csproj +++ b/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.csproj @@ -13,9 +13,14 @@ - - - - + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj index 16505436d47f13..4140b529697a18 100644 --- a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj +++ b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj @@ -7,11 +7,11 @@ - true - SR.PlatformNotSupported_OleDb - $(NoWarn);CS0618 + true + SR.PlatformNotSupported_OleDb + $(NoWarn);CS0618 - + System.Data.OleDb.OleDbMetaData.xml - + + + - + + - diff --git a/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj b/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj index 13d8dd886b589a..2631550443e3a7 100644 --- a/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj +++ b/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj @@ -1,6 +1,6 @@ - netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 @@ -8,7 +8,9 @@ - + + + diff --git a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj index 685306c24cdc05..14a4d33561620b 100644 --- a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj +++ b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0;net461 $(NoWarn);CA1838 @@ -103,14 +103,15 @@ - - + + - + + diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj index 598ae8322b0e6f..f66b352c9c1869 100644 --- a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj +++ b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj @@ -121,11 +121,12 @@ Link="Common\System\Diagnostics\NetFrameworkUtils.cs" /> - + + - + @@ -143,6 +144,7 @@ + diff --git a/src/libraries/System.DirectoryServices.AccountManagement/ref/System.DirectoryServices.AccountManagement.csproj b/src/libraries/System.DirectoryServices.AccountManagement/ref/System.DirectoryServices.AccountManagement.csproj index ec5bbccaa11dcb..46061476b9aeae 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/ref/System.DirectoryServices.AccountManagement.csproj +++ b/src/libraries/System.DirectoryServices.AccountManagement/ref/System.DirectoryServices.AccountManagement.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj index ddc9763b6315a3..da50980a2a536b 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj +++ b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj @@ -8,7 +8,7 @@ - SR.DirectoryServicesAccountManagement_PlatformNotSupported + SR.DirectoryServicesAccountManagement_PlatformNotSupported @@ -88,15 +88,15 @@ - - + + + + - - @@ -104,15 +104,18 @@ + + + diff --git a/src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj b/src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj index f7c8830a820326..7779fa037c4bee 100644 --- a/src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj +++ b/src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj b/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj index d3ee9bafa8edb5..ddd399cfcfd59e 100644 --- a/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj +++ b/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj @@ -81,8 +81,8 @@ Common\Interop\OSX\Interop.Libraries.cs - - + + @@ -97,6 +97,8 @@ + diff --git a/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj b/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj index 730a34adc19f4e..af21f39de271b5 100644 --- a/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj +++ b/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj @@ -9,10 +9,15 @@ - - - + + + + + + + + @@ -25,4 +30,9 @@ + + + + + \ No newline at end of file diff --git a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj index cc86d1cb724d80..4db82d2e78b000 100644 --- a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj +++ b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj @@ -143,12 +143,14 @@ - - - + + + + + - + @@ -158,6 +160,7 @@ + @@ -166,8 +169,10 @@ + + diff --git a/src/libraries/System.IO.FileSystem.AccessControl/Directory.Build.props b/src/libraries/System.IO.FileSystem.AccessControl/Directory.Build.props index 64a6b75c96c406..709a22a7537088 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/Directory.Build.props +++ b/src/libraries/System.IO.FileSystem.AccessControl/Directory.Build.props @@ -3,15 +3,5 @@ Microsoft windows - Provides types for managing access and audit control lists for files and directories. - -Commonly Used Types: -System.Security.AccessControl.DirectoryObjectSecurity -System.Security.AccessControl.DirectorySecurity -System.Security.AccessControl.FileSecurity -System.Security.AccessControl.FileSystemAccessRule -System.Security.AccessControl.FileSystemAuditRule -System.Security.AccessControl.FileSystemRights -System.Security.AccessControl.FileSystemSecurity \ No newline at end of file diff --git a/src/libraries/System.IO.FileSystem.AccessControl/NuGet.config b/src/libraries/System.IO.FileSystem.AccessControl/NuGet.config deleted file mode 100644 index a66b7f9b013241..00000000000000 --- a/src/libraries/System.IO.FileSystem.AccessControl/NuGet.config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/libraries/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.pkgproj b/src/libraries/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.pkgproj deleted file mode 100644 index f6c16d48b531e8..00000000000000 --- a/src/libraries/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.pkgproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - - net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) - - - - - - - \ No newline at end of file diff --git a/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.FileSystemAclExtensions.cs b/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.FileSystemAclExtensions.cs deleted file mode 100644 index 7bba41856ed222..00000000000000 --- a/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.FileSystemAclExtensions.cs +++ /dev/null @@ -1,23 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// ------------------------------------------------------------------------------ -// Changes to this file must follow the https://aka.ms/api-review process. -// ------------------------------------------------------------------------------ - -namespace System.IO -{ - public static partial class FileSystemAclExtensions - { - public static void Create(this System.IO.DirectoryInfo directoryInfo, System.Security.AccessControl.DirectorySecurity directorySecurity) { } - public static System.IO.FileStream Create(this System.IO.FileInfo fileInfo, System.IO.FileMode mode, System.Security.AccessControl.FileSystemRights rights, System.IO.FileShare share, int bufferSize, System.IO.FileOptions options, System.Security.AccessControl.FileSecurity fileSecurity) { throw null; } - public static System.IO.DirectoryInfo CreateDirectory(this System.Security.AccessControl.DirectorySecurity directorySecurity, string path) { throw null; } - public static System.Security.AccessControl.DirectorySecurity GetAccessControl(this System.IO.DirectoryInfo directoryInfo) { throw null; } - public static System.Security.AccessControl.DirectorySecurity GetAccessControl(this System.IO.DirectoryInfo directoryInfo, System.Security.AccessControl.AccessControlSections includeSections) { throw null; } - public static System.Security.AccessControl.FileSecurity GetAccessControl(this System.IO.FileInfo fileInfo) { throw null; } - public static System.Security.AccessControl.FileSecurity GetAccessControl(this System.IO.FileInfo fileInfo, System.Security.AccessControl.AccessControlSections includeSections) { throw null; } - public static System.Security.AccessControl.FileSecurity GetAccessControl(this System.IO.FileStream fileStream) { throw null; } - public static void SetAccessControl(this System.IO.DirectoryInfo directoryInfo, System.Security.AccessControl.DirectorySecurity directorySecurity) { } - public static void SetAccessControl(this System.IO.FileInfo fileInfo, System.Security.AccessControl.FileSecurity fileSecurity) { } - public static void SetAccessControl(this System.IO.FileStream fileStream, System.Security.AccessControl.FileSecurity fileSecurity) { } - } -} diff --git a/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.cs b/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.cs index 01990765c3afb0..64455bbc92ccb6 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.cs +++ b/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.cs @@ -4,6 +4,23 @@ // Changes to this file must follow the https://aka.ms/api-review process. // ------------------------------------------------------------------------------ +namespace System.IO +{ + public static partial class FileSystemAclExtensions + { + public static void Create(this System.IO.DirectoryInfo directoryInfo, System.Security.AccessControl.DirectorySecurity directorySecurity) { } + public static System.IO.FileStream Create(this System.IO.FileInfo fileInfo, System.IO.FileMode mode, System.Security.AccessControl.FileSystemRights rights, System.IO.FileShare share, int bufferSize, System.IO.FileOptions options, System.Security.AccessControl.FileSecurity fileSecurity) { throw null; } + public static System.IO.DirectoryInfo CreateDirectory(this System.Security.AccessControl.DirectorySecurity directorySecurity, string path) { throw null; } + public static System.Security.AccessControl.DirectorySecurity GetAccessControl(this System.IO.DirectoryInfo directoryInfo) { throw null; } + public static System.Security.AccessControl.DirectorySecurity GetAccessControl(this System.IO.DirectoryInfo directoryInfo, System.Security.AccessControl.AccessControlSections includeSections) { throw null; } + public static System.Security.AccessControl.FileSecurity GetAccessControl(this System.IO.FileInfo fileInfo) { throw null; } + public static System.Security.AccessControl.FileSecurity GetAccessControl(this System.IO.FileInfo fileInfo, System.Security.AccessControl.AccessControlSections includeSections) { throw null; } + public static System.Security.AccessControl.FileSecurity GetAccessControl(this System.IO.FileStream fileStream) { throw null; } + public static void SetAccessControl(this System.IO.DirectoryInfo directoryInfo, System.Security.AccessControl.DirectorySecurity directorySecurity) { } + public static void SetAccessControl(this System.IO.FileInfo fileInfo, System.Security.AccessControl.FileSecurity fileSecurity) { } + public static void SetAccessControl(this System.IO.FileStream fileStream, System.Security.AccessControl.FileSecurity fileSecurity) { } + } +} namespace System.Security.AccessControl { public abstract partial class DirectoryObjectSecurity : System.Security.AccessControl.ObjectSecurity diff --git a/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj b/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj index 5669c053515732..5aab0ab81639e0 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj +++ b/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj @@ -1,20 +1,13 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent) enable - - - + - - - - - - - + + \ No newline at end of file diff --git a/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.net461.cs b/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.net461.cs deleted file mode 100644 index 29364199c23857..00000000000000 --- a/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.net461.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// ------------------------------------------------------------------------------ -// Changes to this file must follow the https://aka.ms/api-review process. -// ------------------------------------------------------------------------------ - -using System.Runtime.CompilerServices; - -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.DirectoryObjectSecurity))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.DirectorySecurity))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.FileSecurity))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.FileSystemAccessRule))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.FileSystemAuditRule))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.FileSystemRights))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.FileSystemSecurity))] diff --git a/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj b/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj index 5a99e24dc5946c..6e662893f353c2 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj +++ b/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj @@ -1,20 +1,15 @@ - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent) enable - true true SR.PlatformNotSupported_AccessControl - - - - + - - - - + - - @@ -111,9 +101,4 @@ - - - - - diff --git a/src/libraries/System.IO.FileSystem.AccessControl/src/System/IO/FileSystemAclExtensions.net46.cs b/src/libraries/System.IO.FileSystem.AccessControl/src/System/IO/FileSystemAclExtensions.net46.cs deleted file mode 100644 index 5fdb118b406dae..00000000000000 --- a/src/libraries/System.IO.FileSystem.AccessControl/src/System/IO/FileSystemAclExtensions.net46.cs +++ /dev/null @@ -1,119 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using System.Security.AccessControl; - -namespace System.IO -{ - public static class FileSystemAclExtensions - { - public static FileStream Create(this FileInfo fileInfo, FileMode mode, FileSystemRights rights, FileShare share, int bufferSize, FileOptions options, FileSecurity fileSecurity) - { - if (fileInfo == null) - throw new ArgumentNullException(nameof(fileInfo)); - - if (fileSecurity == null) - throw new ArgumentNullException(nameof(fileSecurity)); - - return new FileStream(fileInfo.FullName, mode, rights, share, bufferSize, options, fileSecurity); - } - - public static void Create(this DirectoryInfo directoryInfo, DirectorySecurity directorySecurity) - { - if (directoryInfo == null) - throw new ArgumentNullException(nameof(directoryInfo)); - - if (directorySecurity == null) - throw new ArgumentNullException(nameof(directorySecurity)); - - directoryInfo.Create(directorySecurity); - } - - public static DirectoryInfo CreateDirectory(this DirectorySecurity directorySecurity, string path) - { - if (directorySecurity == null) - throw new ArgumentNullException(nameof(directorySecurity)); - - if (path == null) - throw new ArgumentNullException(nameof(path)); - - if (path.Length == 0) - throw new ArgumentException(SR.Arg_PathEmpty); - - return Directory.CreateDirectory(path, directorySecurity); - } - - public static DirectorySecurity GetAccessControl(this DirectoryInfo directoryInfo) - { - if (directoryInfo == null) - throw new ArgumentNullException(nameof(directoryInfo)); - - return directoryInfo.GetAccessControl(); - } - - public static DirectorySecurity GetAccessControl(this DirectoryInfo directoryInfo, AccessControlSections includeSections) - { - if (directoryInfo == null) - throw new ArgumentNullException(nameof(directoryInfo)); - - return directoryInfo.GetAccessControl(includeSections); - } - - public static void SetAccessControl(this DirectoryInfo directoryInfo, DirectorySecurity directorySecurity) - { - if (directoryInfo == null) - throw new ArgumentNullException(nameof(directoryInfo)); - - if (directorySecurity == null) - throw new ArgumentNullException(nameof(directorySecurity)); - - directoryInfo.SetAccessControl(directorySecurity); - } - - public static FileSecurity GetAccessControl(this FileInfo fileInfo) - { - if (fileInfo == null) - throw new ArgumentNullException(nameof(fileInfo)); - - return fileInfo.GetAccessControl(); - } - - public static FileSecurity GetAccessControl(this FileInfo fileInfo, AccessControlSections includeSections) - { - if (fileInfo == null) - throw new ArgumentNullException(nameof(fileInfo)); - - return fileInfo.GetAccessControl(includeSections); - } - - public static void SetAccessControl(this FileInfo fileInfo, FileSecurity fileSecurity) - { - if (fileInfo == null) - throw new ArgumentNullException(nameof(fileInfo)); - - if (fileSecurity == null) - throw new ArgumentNullException(nameof(fileSecurity)); - - fileInfo.SetAccessControl(fileSecurity); - } - - public static FileSecurity GetAccessControl(this FileStream fileStream) - { - if (fileStream == null) - throw new ArgumentNullException(nameof(fileStream)); - - return fileStream.GetAccessControl(); - } - - public static void SetAccessControl(this FileStream fileStream, FileSecurity fileSecurity) - { - if (fileStream == null) - throw new ArgumentNullException(nameof(fileStream)); - - if (fileSecurity == null) - throw new ArgumentNullException(nameof(fileSecurity)); - - fileStream.SetAccessControl(fileSecurity); - } - } -} diff --git a/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj b/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj index 8c4fa0e42afcd1..549173eee44fad 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj +++ b/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-windows;net461-windows + $(NetCoreAppCurrent)-windows @@ -17,11 +17,6 @@ - - - - - diff --git a/src/libraries/System.IO.Pipes.AccessControl/Directory.Build.props b/src/libraries/System.IO.Pipes.AccessControl/Directory.Build.props index 735766f4aa1013..709a22a7537088 100644 --- a/src/libraries/System.IO.Pipes.AccessControl/Directory.Build.props +++ b/src/libraries/System.IO.Pipes.AccessControl/Directory.Build.props @@ -3,12 +3,5 @@ Microsoft windows - Provides types for managing access and audit control lists for pipes. - -Commonly Used Types: -System.IO.Pipes.PipeSecurity -System.IO.Pipes.PipeAccessRule -System.IO.Pipes.PipeAuditRule -System.IO.Pipes.PipeAccessRights \ No newline at end of file diff --git a/src/libraries/System.IO.Pipes.AccessControl/NuGet.config b/src/libraries/System.IO.Pipes.AccessControl/NuGet.config deleted file mode 100644 index a66b7f9b013241..00000000000000 --- a/src/libraries/System.IO.Pipes.AccessControl/NuGet.config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - \ No newline at end of file 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 21720f8bdddc20..00000000000000 --- a/src/libraries/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.pkgproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - - net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) - - - - - - - \ No newline at end of file diff --git a/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.PipesAclExtensions.cs b/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.PipesAclExtensions.cs deleted file mode 100644 index cced321ba5ed60..00000000000000 --- a/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.PipesAclExtensions.cs +++ /dev/null @@ -1,14 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// ------------------------------------------------------------------------------ -// Changes to this file must follow the https://aka.ms/api-review process. -// ------------------------------------------------------------------------------ - -namespace System.IO.Pipes -{ - public static partial class PipesAclExtensions - { - public static System.IO.Pipes.PipeSecurity GetAccessControl(this System.IO.Pipes.PipeStream stream) { throw null; } - public static void SetAccessControl(this System.IO.Pipes.PipeStream stream, System.IO.Pipes.PipeSecurity pipeSecurity) { } - } -} diff --git a/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.cs b/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.cs index 22c07faa6e764b..775004246a5e00 100644 --- a/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.cs +++ b/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.cs @@ -6,6 +6,14 @@ namespace System.IO.Pipes { + public static class AnonymousPipeServerStreamAcl + { + public static System.IO.Pipes.AnonymousPipeServerStream Create(System.IO.Pipes.PipeDirection direction, System.IO.HandleInheritability inheritability, int bufferSize, System.IO.Pipes.PipeSecurity? pipeSecurity) { throw null; } + } + public static class NamedPipeServerStreamAcl + { + public static System.IO.Pipes.NamedPipeServerStream Create(string pipeName, System.IO.Pipes.PipeDirection direction, int maxNumberOfServerInstances, System.IO.Pipes.PipeTransmissionMode transmissionMode, System.IO.Pipes.PipeOptions options, int inBufferSize, int outBufferSize, System.IO.Pipes.PipeSecurity? pipeSecurity, System.IO.HandleInheritability inheritability = System.IO.HandleInheritability.None, System.IO.Pipes.PipeAccessRights additionalAccessRights = default) { throw null; } + } [System.FlagsAttribute] public enum PipeAccessRights { @@ -60,4 +68,9 @@ public void ResetAccessRule(System.IO.Pipes.PipeAccessRule rule) { } public void SetAccessRule(System.IO.Pipes.PipeAccessRule rule) { } public void SetAuditRule(System.IO.Pipes.PipeAuditRule rule) { } } + public static partial class PipesAclExtensions + { + public static System.IO.Pipes.PipeSecurity GetAccessControl(this System.IO.Pipes.PipeStream stream) { throw null; } + public static void SetAccessControl(this System.IO.Pipes.PipeStream stream, System.IO.Pipes.PipeSecurity pipeSecurity) { } + } } 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 04cc7921b00f20..685a31dbdf26ae 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,24 +1,13 @@ - $(NetCoreAppCurrent);net5.0;netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent) enable - - - - + - - - - - + - - - - - + \ No newline at end of file diff --git a/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.net461.cs b/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.net461.cs deleted file mode 100644 index 1268f736387ed0..00000000000000 --- a/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.net461.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// ------------------------------------------------------------------------------ -// Changes to this file must follow the https://aka.ms/api-review process. -// ------------------------------------------------------------------------------ - -using System.Runtime.CompilerServices; - -[assembly: TypeForwardedTo(typeof(System.IO.Pipes.PipeAccessRights))] -[assembly: TypeForwardedTo(typeof(System.IO.Pipes.PipeAccessRule))] -[assembly: TypeForwardedTo(typeof(System.IO.Pipes.PipeAuditRule))] -[assembly: TypeForwardedTo(typeof(System.IO.Pipes.PipeSecurity))] diff --git a/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.netcoreapp.cs b/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.netcoreapp.cs deleted file mode 100644 index ffa670b0b2cc5e..00000000000000 --- a/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.netcoreapp.cs +++ /dev/null @@ -1,17 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// ------------------------------------------------------------------------------ -// Changes to this file must follow the https://aka.ms/api-review process. -// ------------------------------------------------------------------------------ - -namespace System.IO.Pipes -{ - public static class AnonymousPipeServerStreamAcl - { - public static System.IO.Pipes.AnonymousPipeServerStream Create(System.IO.Pipes.PipeDirection direction, System.IO.HandleInheritability inheritability, int bufferSize, System.IO.Pipes.PipeSecurity? pipeSecurity) { throw null; } - } - public static class NamedPipeServerStreamAcl - { - public static System.IO.Pipes.NamedPipeServerStream Create(string pipeName, System.IO.Pipes.PipeDirection direction, int maxNumberOfServerInstances, System.IO.Pipes.PipeTransmissionMode transmissionMode, System.IO.Pipes.PipeOptions options, int inBufferSize, int outBufferSize, System.IO.Pipes.PipeSecurity? pipeSecurity, System.IO.HandleInheritability inheritability = System.IO.HandleInheritability.None, System.IO.Pipes.PipeAccessRights additionalAccessRights = default) { throw null; } - } -} diff --git a/src/libraries/System.IO.Pipes.AccessControl/src/Resources/Strings.resx b/src/libraries/System.IO.Pipes.AccessControl/src/Resources/Strings.resx index 64b603eb3d18ee..0140e48ff2d8cf 100644 --- a/src/libraries/System.IO.Pipes.AccessControl/src/Resources/Strings.resx +++ b/src/libraries/System.IO.Pipes.AccessControl/src/Resources/Strings.resx @@ -57,15 +57,6 @@ 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 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 bec5c79ce021e1..f43c090d0810bd 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 @@ -1,46 +1,21 @@ enable - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);net5.0-windows;net5.0;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0-windows;netstandard2.0;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent) SR.PlatformNotSupported_AccessControl - true + true true - - false - - - - - - - - - - - - - + + + true + - - - - - - - - - - - - - - diff --git a/src/libraries/System.IO.Pipes.AccessControl/src/System/IO/PipesAclExtensions.net461.cs b/src/libraries/System.IO.Pipes.AccessControl/src/System/IO/PipesAclExtensions.net461.cs deleted file mode 100644 index b55b5ab35de313..00000000000000 --- a/src/libraries/System.IO.Pipes.AccessControl/src/System/IO/PipesAclExtensions.net461.cs +++ /dev/null @@ -1,21 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -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); - } - } -} \ No newline at end of file diff --git a/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj b/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj index 9560e277889c4a..878c5e2a3f9887 100644 --- a/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj +++ b/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj @@ -4,15 +4,15 @@ $(DefineConstants);NOSPAN;SERIAL_PORTS true annotations - netstandard2.0-windows;netstandard2.0-Linux;netstandard2.0-OSX;netstandard2.0;net461-windows;netstandard2.0-FreeBSD + netstandard2.0-windows;netstandard2.0-Linux;netstandard2.0-OSX;netstandard2.0-FreeBSD;netstandard2.0;net461-windows - true - SR.PlatformNotSupported_IOPorts + true + SR.PlatformNotSupported_IOPorts true - + @@ -29,7 +29,7 @@ - + @@ -99,8 +99,6 @@ Link="Common\System\IO\Win32Marshal.cs" /> - - - + - + diff --git a/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj b/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj index 1267d77477c099..13d9cb01024af3 100644 --- a/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj +++ b/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj @@ -118,7 +118,6 @@ - diff --git a/src/libraries/System.Management/src/System.Management.csproj b/src/libraries/System.Management/src/System.Management.csproj index 28a2b20c61b3d9..9fac8892aed3ae 100644 --- a/src/libraries/System.Management/src/System.Management.csproj +++ b/src/libraries/System.Management/src/System.Management.csproj @@ -62,9 +62,10 @@ - + + diff --git a/src/libraries/System.Security.AccessControl/Directory.Build.props b/src/libraries/System.Security.AccessControl/Directory.Build.props index 8ea1b05c85d43a..709a22a7537088 100644 --- a/src/libraries/System.Security.AccessControl/Directory.Build.props +++ b/src/libraries/System.Security.AccessControl/Directory.Build.props @@ -2,15 +2,6 @@ Microsoft - true windows - Provides base classes that enable managing access and audit control lists on securable objects. - -Commonly Used Types: -System.Security.AccessControl.AccessRule -System.Security.AccessControl.AuditRule -System.Security.AccessControl.ObjectAccessRule -System.Security.AccessControl.ObjectAuditRule -System.Security.AccessControl.ObjectSecurity \ No newline at end of file diff --git a/src/libraries/System.Security.AccessControl/NuGet.config b/src/libraries/System.Security.AccessControl/NuGet.config deleted file mode 100644 index a66b7f9b013241..00000000000000 --- a/src/libraries/System.Security.AccessControl/NuGet.config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/libraries/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj b/src/libraries/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj deleted file mode 100644 index 6f398d889dd7fc..00000000000000 --- a/src/libraries/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - - net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) - - - - - - - \ No newline at end of file diff --git a/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.Evidence.cs b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.Evidence.cs new file mode 100644 index 00000000000000..2fa98a6f032305 --- /dev/null +++ b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.Evidence.cs @@ -0,0 +1,48 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// ------------------------------------------------------------------------------ +// Changes to this file must follow the https://aka.ms/api-review process. +// ------------------------------------------------------------------------------ + +#nullable enable + +namespace System.Security.Policy +{ + public sealed partial class Evidence : System.Collections.ICollection, System.Collections.IEnumerable + { + public Evidence() { } + [System.ObsoleteAttribute("This constructor is obsolete. Please use the constructor which takes arrays of EvidenceBase instead.")] + public Evidence(object[] hostEvidence, object[] assemblyEvidence) { } + public Evidence(System.Security.Policy.Evidence evidence) { } + public Evidence(System.Security.Policy.EvidenceBase[] hostEvidence, System.Security.Policy.EvidenceBase[] assemblyEvidence) { } + [System.ObsoleteAttribute("Evidence should not be treated as an ICollection. Please use GetHostEnumerator and GetAssemblyEnumerator to iterate over the evidence to collect a count.")] + public int Count { get { throw null; } } + public bool IsReadOnly { get { throw null; } } + public bool IsSynchronized { get { throw null; } } + public bool Locked { get { throw null; } set { } } + public object SyncRoot { get { throw null; } } + [System.ObsoleteAttribute("This method is obsolete. Please use AddAssemblyEvidence instead.")] + public void AddAssembly(object id) { } + public void AddAssemblyEvidence(T evidence) where T : System.Security.Policy.EvidenceBase { } + [System.ObsoleteAttribute("This method is obsolete. Please use AddHostEvidence instead.")] + public void AddHost(object id) { } + public void AddHostEvidence(T evidence) where T : System.Security.Policy.EvidenceBase { } + public void Clear() { } + public System.Security.Policy.Evidence? Clone() { throw null; } + [System.ObsoleteAttribute("Evidence should not be treated as an ICollection. Please use the GetHostEnumerator and GetAssemblyEnumerator methods rather than using CopyTo.")] + public void CopyTo(System.Array array, int index) { } + public System.Collections.IEnumerator GetAssemblyEnumerator() { throw null; } + public T? GetAssemblyEvidence() where T : System.Security.Policy.EvidenceBase { throw null; } + [System.ObsoleteAttribute("GetEnumerator is obsolete. Please use GetAssemblyEnumerator and GetHostEnumerator instead.")] + public System.Collections.IEnumerator GetEnumerator() { throw null; } + public System.Collections.IEnumerator GetHostEnumerator() { throw null; } + public T? GetHostEvidence() where T : System.Security.Policy.EvidenceBase { throw null; } + public void Merge(System.Security.Policy.Evidence evidence) { } + public void RemoveType(System.Type t) { } + } + public abstract partial class EvidenceBase + { + protected EvidenceBase() { } + public virtual System.Security.Policy.EvidenceBase? Clone() { throw null; } + } +} \ No newline at end of file diff --git a/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.cs b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.cs index f6bef32dfdbd45..b47ecfdc101652 100644 --- a/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.cs +++ b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.cs @@ -530,44 +530,3 @@ public void SetAudit(System.Security.AccessControl.AuditFlags auditFlags, System public void SetAudit(System.Security.Principal.SecurityIdentifier sid, System.Security.AccessControl.ObjectAuditRule rule) { } } } - -namespace System.Security.Policy -{ - public sealed partial class Evidence : System.Collections.ICollection, System.Collections.IEnumerable - { - public Evidence() { } - [System.ObsoleteAttribute("This constructor is obsolete. Please use the constructor which takes arrays of EvidenceBase instead.")] - public Evidence(object[] hostEvidence, object[] assemblyEvidence) { } - public Evidence(System.Security.Policy.Evidence evidence) { } - public Evidence(System.Security.Policy.EvidenceBase[] hostEvidence, System.Security.Policy.EvidenceBase[] assemblyEvidence) { } - [System.ObsoleteAttribute("Evidence should not be treated as an ICollection. Please use GetHostEnumerator and GetAssemblyEnumerator to iterate over the evidence to collect a count.")] - public int Count { get { throw null; } } - public bool IsReadOnly { get { throw null; } } - public bool IsSynchronized { get { throw null; } } - public bool Locked { get { throw null; } set { } } - public object SyncRoot { get { throw null; } } - [System.ObsoleteAttribute("This method is obsolete. Please use AddAssemblyEvidence instead.")] - public void AddAssembly(object id) { } - public void AddAssemblyEvidence(T evidence) where T : System.Security.Policy.EvidenceBase { } - [System.ObsoleteAttribute("This method is obsolete. Please use AddHostEvidence instead.")] - public void AddHost(object id) { } - public void AddHostEvidence(T evidence) where T : System.Security.Policy.EvidenceBase { } - public void Clear() { } - public System.Security.Policy.Evidence? Clone() { throw null; } - [System.ObsoleteAttribute("Evidence should not be treated as an ICollection. Please use the GetHostEnumerator and GetAssemblyEnumerator methods rather than using CopyTo.")] - public void CopyTo(System.Array array, int index) { } - public System.Collections.IEnumerator GetAssemblyEnumerator() { throw null; } - public T? GetAssemblyEvidence() where T : System.Security.Policy.EvidenceBase { throw null; } - [System.ObsoleteAttribute("GetEnumerator is obsolete. Please use GetAssemblyEnumerator and GetHostEnumerator instead.")] - public System.Collections.IEnumerator GetEnumerator() { throw null; } - public System.Collections.IEnumerator GetHostEnumerator() { throw null; } - public T? GetHostEvidence() where T : System.Security.Policy.EvidenceBase { throw null; } - public void Merge(System.Security.Policy.Evidence evidence) { } - public void RemoveType(System.Type t) { } - } - public abstract partial class EvidenceBase - { - protected EvidenceBase() { } - public virtual System.Security.Policy.EvidenceBase? Clone() { throw null; } - } -} \ No newline at end of file diff --git a/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj index 08c4e103327ffe..348ff2fe1971ed 100644 --- a/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj +++ b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj @@ -1,17 +1,13 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent) enable - - + + - + - - - - \ No newline at end of file diff --git a/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.net461.cs b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.net461.cs deleted file mode 100644 index 9fa292c50bbb76..00000000000000 --- a/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.net461.cs +++ /dev/null @@ -1,52 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// ------------------------------------------------------------------------------ -// Changes to this file must follow the https://aka.ms/api-review process. -// ------------------------------------------------------------------------------ - -using System.Runtime.CompilerServices; - -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.AccessControlActions))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.AccessControlModification))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.AccessControlSections))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.AccessControlType))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.AccessRule))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.AccessRule<>))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.AceEnumerator))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.AceFlags))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.AceQualifier))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.AceType))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.AuditFlags))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.AuditRule))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.AuditRule<>))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.AuthorizationRule))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.AuthorizationRuleCollection))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.CommonAce))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.CommonAcl))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.CommonObjectSecurity))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.CommonSecurityDescriptor))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.CompoundAce))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.CompoundAceType))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.ControlFlags))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.CustomAce))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.DiscretionaryAcl))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.GenericAce))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.GenericAcl))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.GenericSecurityDescriptor))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.InheritanceFlags))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.KnownAce))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.NativeObjectSecurity))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.ObjectAccessRule))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.ObjectAce))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.ObjectAceFlags))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.ObjectAuditRule))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.ObjectSecurity))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.ObjectSecurity<>))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.PrivilegeNotHeldException))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.PropagationFlags))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.QualifiedAce))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.RawAcl))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.RawSecurityDescriptor))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.ResourceType))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.SecurityInfos))] -[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.SystemAcl))] diff --git a/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj b/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj index 6516f5e72a68f6..ae2bd9f64570a4 100644 --- a/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj +++ b/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj @@ -1,15 +1,14 @@ true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent) enable - true SR.PlatformNotSupported_AccessControl - + @@ -79,7 +78,8 @@ - + + @@ -91,7 +91,4 @@ - - - diff --git a/src/libraries/System.Security.AccessControl/src/System/Security/Policy/Evidence.cs b/src/libraries/System.Security.AccessControl/src/System/Security/Policy/Evidence.cs index dfeaff878b84a7..ca197afd2f1bc4 100644 --- a/src/libraries/System.Security.AccessControl/src/System/Security/Policy/Evidence.cs +++ b/src/libraries/System.Security.AccessControl/src/System/Security/Policy/Evidence.cs @@ -1,6 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +#nullable enable + using System.Collections; namespace System.Security.Policy diff --git a/src/libraries/System.Security.AccessControl/src/System/Security/Policy/EvidenceBase.cs b/src/libraries/System.Security.AccessControl/src/System/Security/Policy/EvidenceBase.cs index b2790af0cd1f5f..12073ea4564f67 100644 --- a/src/libraries/System.Security.AccessControl/src/System/Security/Policy/EvidenceBase.cs +++ b/src/libraries/System.Security.AccessControl/src/System/Security/Policy/EvidenceBase.cs @@ -1,6 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +#nullable enable + namespace System.Security.Policy { public abstract partial class EvidenceBase diff --git a/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj b/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj index 0d9a67a1f32977..ef48b56e4d81af 100644 --- a/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj +++ b/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-windows;net461-windows + $(NetCoreAppCurrent)-windows diff --git a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj index d5bbc116baea78..88bce55ee444b9 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj +++ b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj @@ -8,8 +8,8 @@ - true - true + true + true true @@ -638,7 +638,7 @@ - + diff --git a/src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.csproj b/src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.csproj index a20d226ba0f1cc..dca38dde22bf8b 100644 --- a/src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.csproj +++ b/src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.csproj @@ -1,15 +1,21 @@ - netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.0;net461 - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Security.Cryptography.Xml/src/MatchingRefApiCompatBaseline.netstandard2.0.txt b/src/libraries/System.Security.Cryptography.Xml/src/MatchingRefApiCompatBaseline.txt similarity index 100% rename from src/libraries/System.Security.Cryptography.Xml/src/MatchingRefApiCompatBaseline.netstandard2.0.txt rename to src/libraries/System.Security.Cryptography.Xml/src/MatchingRefApiCompatBaseline.txt diff --git a/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj b/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj index 1f9a8ba6b4d842..0522510624ad26 100644 --- a/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj +++ b/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj @@ -1,11 +1,13 @@ true - netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.0;net461 - true + true + + $(NoWarn);SYSLIB0022 @@ -87,11 +89,32 @@ - - + + + + + + + + + + + + + + + + + + + + + - + + + diff --git a/src/libraries/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/CryptoHelpers.cs b/src/libraries/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/CryptoHelpers.cs index fb86b4c4b82847..0f9365f9e01642 100644 --- a/src/libraries/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/CryptoHelpers.cs +++ b/src/libraries/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/CryptoHelpers.cs @@ -22,7 +22,9 @@ public static object CreateFromKnownName(string name) => "urn:mpeg:mpeg21:2003:01-REL-R-NS:licenseTransform" => new XmlLicenseTransform(), "http://www.w3.org/2000/09/xmldsig# X509Data" => new KeyInfoX509Data(), "http://www.w3.org/2000/09/xmldsig# KeyName" => new KeyInfoName(), +#pragma warning disable CA1416 // This call site is reachable on all platforms. 'DSAKeyValue' is unsupported on: 'ios', 'maccatalyst', 'tvos' "http://www.w3.org/2000/09/xmldsig# KeyValue/DSAKeyValue" => new DSAKeyValue(), +#pragma warning restore CA1416 "http://www.w3.org/2000/09/xmldsig# KeyValue/RSAKeyValue" => new RSAKeyValue(), "http://www.w3.org/2000/09/xmldsig# RetrievalMethod" => new KeyInfoRetrievalMethod(), "http://www.w3.org/2001/04/xmlenc# EncryptedKey" => new KeyInfoEncryptedKey(), diff --git a/src/libraries/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/SignedXmlDebugLog.cs b/src/libraries/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/SignedXmlDebugLog.cs index 88333153fd4e73..5f7a5090097e92 100644 --- a/src/libraries/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/SignedXmlDebugLog.cs +++ b/src/libraries/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/SignedXmlDebugLog.cs @@ -220,10 +220,12 @@ private static string GetKeyName(object key) // string keyName = null; +#pragma warning disable CA1416 // This call site is reachable on all platforms. 'CspKeyContainerInfo.KeyContainerName' is supported on: 'windows'. if (cspKey != null && cspKey.CspKeyContainerInfo.KeyContainerName != null) { keyName = "\"" + cspKey.CspKeyContainerInfo.KeyContainerName + "\""; } +#pragma warning restore CA1416 else if (certificate2 != null) { keyName = "\"" + certificate2.GetNameInfo(X509NameType.SimpleName, false) + "\""; diff --git a/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.Forwards.cs b/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.Forwards.cs index 4d9a824761f533..ef7cb3ac3f7348 100644 --- a/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.Forwards.cs +++ b/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.Forwards.cs @@ -13,8 +13,10 @@ [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Permissions.SecurityAttribute))] [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Permissions.SecurityPermissionAttribute))] [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Permissions.SecurityPermissionFlag))] +#if NET6_0_OR_GREATER [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Policy.Evidence))] [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Policy.EvidenceBase))] +#endif #if NETCOREAPP [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.IStackWalk))] [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.PermissionSet))] diff --git a/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj b/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj index 37ede8ee4f07a9..278fb397b8d095 100644 --- a/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj +++ b/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj @@ -6,6 +6,7 @@ + @@ -18,24 +19,19 @@ - - + + + + - - - - - + - - - diff --git a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj index e07439d1445dc0..9b52b0725b35a6 100644 --- a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj +++ b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj @@ -130,6 +130,8 @@ + + @@ -198,8 +200,8 @@ - - + + @@ -211,6 +213,7 @@ + diff --git a/src/libraries/System.Security.Principal.Windows/Directory.Build.props b/src/libraries/System.Security.Principal.Windows/Directory.Build.props index b08e4ac5e46c1e..709a22a7537088 100644 --- a/src/libraries/System.Security.Principal.Windows/Directory.Build.props +++ b/src/libraries/System.Security.Principal.Windows/Directory.Build.props @@ -2,18 +2,6 @@ Microsoft - true windows - Provides classes for retrieving the current Windows user and for interacting with Windows users and groups. - -Commonly Used Types: -System.Security.Principal.WindowsIdentity -System.Security.Principal.SecurityIdentifier -System.Security.Principal.NTAccount -System.Security.Principal.WindowsPrincipal -System.Security.Principal.IdentityReference -System.Security.Principal.IdentityNotMappedException -System.Security.Principal.WindowsBuiltInRole -System.Security.Principal.WellKnownSidType \ No newline at end of file diff --git a/src/libraries/System.Security.Principal.Windows/NuGet.config b/src/libraries/System.Security.Principal.Windows/NuGet.config deleted file mode 100644 index a66b7f9b013241..00000000000000 --- a/src/libraries/System.Security.Principal.Windows/NuGet.config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - \ 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 deleted file mode 100644 index 51b8f66f72d9ac..00000000000000 --- a/src/libraries/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - - net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) - - - - - - - - \ No newline at end of file diff --git a/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj b/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj index 9ec2638f81ef66..955e29d0da1ff5 100644 --- a/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj +++ b/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj @@ -1,20 +1,14 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent) enable - - + - + - - - - - \ No newline at end of file diff --git a/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.net461.cs b/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.net461.cs deleted file mode 100644 index d29b0e76555c83..00000000000000 --- a/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.net461.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// ------------------------------------------------------------------------------ -// Changes to this file must follow the https://aka.ms/api-review process. -// ------------------------------------------------------------------------------ - -using System.Runtime.CompilerServices; - -[assembly: TypeForwardedTo(typeof(System.Security.Principal.IdentityNotMappedException))] -[assembly: TypeForwardedTo(typeof(System.Security.Principal.IdentityReference))] -[assembly: TypeForwardedTo(typeof(System.Security.Principal.IdentityReferenceCollection))] -[assembly: TypeForwardedTo(typeof(System.Security.Principal.NTAccount))] -[assembly: TypeForwardedTo(typeof(System.Security.Principal.SecurityIdentifier))] -[assembly: TypeForwardedTo(typeof(System.Security.Principal.TokenAccessLevels))] -[assembly: TypeForwardedTo(typeof(System.Security.Principal.WellKnownSidType))] -[assembly: TypeForwardedTo(typeof(System.Security.Principal.WindowsAccountType))] -[assembly: TypeForwardedTo(typeof(System.Security.Principal.WindowsBuiltInRole))] -[assembly: TypeForwardedTo(typeof(System.Security.Principal.WindowsIdentity))] -[assembly: TypeForwardedTo(typeof(System.Security.Principal.WindowsPrincipal))] -[assembly: TypeForwardedTo(typeof(Microsoft.Win32.SafeHandles.SafeAccessTokenHandle))] diff --git a/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj b/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj index ceba3103466f26..60b6dfd35510bc 100644 --- a/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj +++ b/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj @@ -1,16 +1,11 @@ true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1-Unix;netcoreapp3.1;netstandard2.0-windows;netstandard2.0-Unix;netstandard2.0;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) enable - - true - true - - SR.PlatformNotSupported_Principal @@ -18,7 +13,7 @@ annotations - + @@ -136,7 +131,7 @@ - + diff --git a/src/libraries/System.Security.Principal.Windows/src/System/Security/Principal/SID.cs b/src/libraries/System.Security.Principal.Windows/src/System/Security/Principal/SID.cs index 63906bad4dbc2a..025e1c8ef1c7b8 100644 --- a/src/libraries/System.Security.Principal.Windows/src/System/Security/Principal/SID.cs +++ b/src/libraries/System.Security.Principal.Windows/src/System/Security/Principal/SID.cs @@ -314,11 +314,7 @@ public sealed class SecurityIdentifier : IdentityReference, IComparable subAuthorities) -#endif { // // Check the number of subauthorities passed in @@ -350,11 +346,7 @@ private void CreateFromParts(IdentifierAuthority identifierAuthority, ReadOnlySp // _identifierAuthority = identifierAuthority; -#if NETSTANDARD2_0 - _subAuthorities = (int[])subAuthorities.Clone(); -#else _subAuthorities = subAuthorities.ToArray(); -#endif // // Compute and store the binary form @@ -462,12 +454,7 @@ private void CreateFromBinaryForm(byte[] binaryForm, int offset) throw new ArgumentException(SR.ArgumentOutOfRange_ArrayTooSmall, nameof(binaryForm)); } -#if NETSTANDARD2_0 - int[] subAuthorities = new int[subAuthoritiesLength]; -#else Span subAuthorities = stackalloc int[MaxSubAuthorities]; -#endif - IdentifierAuthority authority = (IdentifierAuthority)( (((long)binaryForm[offset + 2]) << 40) + (((long)binaryForm[offset + 3]) << 32) + @@ -494,11 +481,7 @@ private void CreateFromBinaryForm(byte[] binaryForm, int offset) CreateFromParts( authority, -#if NETSTANDARD2_0 - subAuthorities -#else subAuthorities.Slice(0, subAuthoritiesLength) -#endif ); return; @@ -657,11 +640,7 @@ public SecurityIdentifier(WellKnownSidType sidType, SecurityIdentifier? domainSi CreateFromBinaryForm(resultSid!, 0); } -#if NETSTANDARD2_0 - internal SecurityIdentifier(IdentifierAuthority identifierAuthority, int[] subAuthorities) -#else internal SecurityIdentifier(IdentifierAuthority identifierAuthority, ReadOnlySpan subAuthorities) -#endif { CreateFromParts(identifierAuthority, subAuthorities); } @@ -748,15 +727,6 @@ public override string ToString() // otherwise you would see this: "S-1-NTAuthority-32-544" // -#if NETSTANDARD2_0 - StringBuilder result = new StringBuilder(); - result.Append("S-1-").Append((ulong)_identifierAuthority); - for (int i = 0; i < SubAuthorityCount; i++) - { - result.Append('-').Append((uint)(_subAuthorities[i])); - } - _sddlForm = result.ToString(); -#else // length of buffer calculation // prefix = "S-1-".Length: 4; // authority: ulong.MaxValue.ToString("D") : 20; @@ -779,7 +749,6 @@ public override string ToString() length += written; } _sddlForm = result.Slice(0, length).ToString(); -#endif } return _sddlForm; diff --git a/src/libraries/System.Security.Principal.Windows/src/System/Security/Principal/WindowsPrincipal.cs b/src/libraries/System.Security.Principal.Windows/src/System/Security/Principal/WindowsPrincipal.cs index 4c76142ed362ac..ea6011b3f443c1 100644 --- a/src/libraries/System.Security.Principal.Windows/src/System/Security/Principal/WindowsPrincipal.cs +++ b/src/libraries/System.Security.Principal.Windows/src/System/Security/Principal/WindowsPrincipal.cs @@ -121,11 +121,7 @@ public virtual bool IsInRole(int rid) return IsInRole( new SecurityIdentifier( IdentifierAuthority.NTAuthority, -#if NETSTANDARD2_0 - new -#else stackalloc -#endif int[] { Interop.SecurityIdentifier.SECURITY_BUILTIN_DOMAIN_RID, rid } ) ); diff --git a/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj b/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj index a416eb154f72d7..aa42c6a8dcd2f1 100644 --- a/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj +++ b/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj @@ -1,13 +1,13 @@ true - $(NetCoreAppCurrent)-windows;net461-windows + $(NetCoreAppCurrent)-windows - + diff --git a/src/libraries/System.Security.Principal.Windows/tests/WellKnownSidTypeTests.cs b/src/libraries/System.Security.Principal.Windows/tests/WellKnownSidTypeTests.cs index 045b4143285a64..3bea9267ff4b2d 100644 --- a/src/libraries/System.Security.Principal.Windows/tests/WellKnownSidTypeTests.cs +++ b/src/libraries/System.Security.Principal.Windows/tests/WellKnownSidTypeTests.cs @@ -85,7 +85,6 @@ public void CanCreateSecurityIdentifierFromWellKnownSidType(WellKnownSidType sid } } -#if NETCOREAPP [ConditionalTheory(nameof(AccountIsDomainJoined))] [InlineData(WellKnownSidType.WinBuiltinDCOMUsersSid)] [InlineData(WellKnownSidType.WinBuiltinIUsersSid)] @@ -144,7 +143,6 @@ public void CreatingSecurityIdentifierOutsideWellKnownSidTypeDefinedRangeThrowsE var currentDomainSid = WindowsIdentity.GetCurrent().Owner.AccountDomainSid; AssertExtensions.Throws("sidType", () => new SecurityIdentifier(sidType, currentDomainSid)); } - #endif [Fact] public void MaxDefinedHasLegacyValue() diff --git a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj index 29f858996ce6f3..6f4e10d2e6ca8e 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj +++ b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj @@ -7,9 +7,9 @@ - true - true - SR.PlatformNotSupported_ServiceController + true + true + SR.PlatformNotSupported_ServiceController upstable_jpn.upsmap - - + + + diff --git a/src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj b/src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj index 439a5aac186c40..396bb7caf52f38 100644 --- a/src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj +++ b/src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj @@ -8,8 +8,8 @@ - - - + + + \ No newline at end of file diff --git a/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj b/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj index a63c89a8547292..4e2e14f344db1f 100644 --- a/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj +++ b/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj @@ -1,19 +1,19 @@ - netstandard2.0-windows;net461-windows;netstandard2.0 + netstandard2.0-windows;netstandard2.0;net461-windows true enable - SR.PlatformNotSupported_AccessControl - true + true + SR.PlatformNotSupported_AccessControl - + - + - + + + - - diff --git a/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj b/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj index bb025bbb309092..c8aba2d5355ed0 100644 --- a/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj +++ b/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj @@ -1,7 +1,6 @@  - 4.8.0 false This Windows Compatibility Pack provides access to APIs that were previously available only for .NET Framework. It can be used from both .NET Core as well as .NET Standard. @@ -15,7 +14,6 @@ - @@ -29,18 +27,14 @@ - - - - @@ -51,52 +45,58 @@ - - - - - - + + + + + + + + + + + + + - - $(ServiceModelVersion) - - - $(ServiceModelVersion) - - - $(ServiceModelVersion) - - - $(ServiceModelVersion) - - - $(ServiceModelVersion) - + + - - netcoreapp3.1 - - - netstandard2.0 - - - netstandard2.1 - + + + + - - netcoreapp3.1 - - - netstandard2.0 - - - netstandard2.1 - + + + + diff --git a/src/libraries/pkg/baseline/packageIndex.json b/src/libraries/pkg/baseline/packageIndex.json index bd71d21feea34d..b6bffe1a4f55dd 100644 --- a/src/libraries/pkg/baseline/packageIndex.json +++ b/src/libraries/pkg/baseline/packageIndex.json @@ -1392,16 +1392,17 @@ "4.7.0", "5.0.0" ], - "BaselineVersion": "6.0.0", - "InboxOn": {}, + "BaselineVersion": "5.0.0", + "InboxOn": { + "net6.0": "6.0.0.0" + }, "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.0.0", "4.0.1.0": "4.3.0", "4.1.0.0": "4.4.0", "4.1.1.0": "4.5.0", "4.1.2.0": "4.6.0", - "5.0.0.0": "5.0.0", - "6.0.0.0": "6.0.0" + "5.0.0.0": "5.0.0" } }, "Microsoft.Win32.Registry.AccessControl": { @@ -3507,16 +3508,17 @@ "4.6.0", "5.0.0" ], - "BaselineVersion": "6.0.0", - "InboxOn": {}, + "BaselineVersion": "5.0.0", + "InboxOn": { + "net6.0": "6.0.0.0" + }, "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.0.0", "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", - "5.0.0.0": "5.0.0", - "6.0.0.0": "6.0.0" + "5.0.0.0": "5.0.0" } }, "System.IO.FileSystem.DriveInfo": { @@ -3736,14 +3738,15 @@ "4.5.1", "5.0.0" ], - "BaselineVersion": "6.0.0", - "InboxOn": {}, + "BaselineVersion": "5.0.0", + "InboxOn": { + "net6.0": "6.0.0.0" + }, "AssemblyVersionInPackageVersion": { "4.0.1.0": "4.3.0", "4.0.2.0": "4.4.0", "4.0.3.0": "4.5.0", - "5.0.0.0": "5.0.0", - "6.0.0.0": "6.0.0" + "5.0.0.0": "5.0.0" } }, "System.IO.Ports": { @@ -5999,16 +6002,17 @@ "4.6.0", "5.0.0" ], - "BaselineVersion": "6.0.0", - "InboxOn": {}, + "BaselineVersion": "5.0.0", + "InboxOn": { + "net6.0": "6.0.0.0" + }, "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.0.0", "4.0.1.0": "4.3.0", "4.1.0.0": "4.4.0", "4.1.1.0": "4.5.0", "4.1.2.0": "4.6.0", - "5.0.0.0": "5.0.0", - "6.0.0.0": "6.0.0" + "5.0.0.0": "5.0.0" } }, "System.Security.Claims": { @@ -6390,8 +6394,10 @@ "4.6.0", "5.0.0" ], - "BaselineVersion": "6.0.0", - "InboxOn": {}, + "BaselineVersion": "5.0.0", + "InboxOn": { + "net6.0": "6.0.0.0" + }, "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.0.0", "4.0.1.0": "4.3.0", @@ -6399,8 +6405,7 @@ "4.1.1.0": "4.5.0", "4.1.1.1": "4.5.1", "4.1.2.0": "4.6.0", - "5.0.0.0": "5.0.0", - "6.0.0.0": "6.0.0" + "5.0.0.0": "5.0.0" } }, "System.Security.SecureString": { diff --git a/src/libraries/pkg/test/frameworkSettings/net6.0/settings.targets b/src/libraries/pkg/test/frameworkSettings/net6.0/settings.targets deleted file mode 100644 index a5d68f69b77e7f..00000000000000 --- a/src/libraries/pkg/test/frameworkSettings/net6.0/settings.targets +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - -