diff --git a/eng/Configurations.props b/eng/Configurations.props index 59424f7cc30a64..3d123f81972aef 100644 --- a/eng/Configurations.props +++ b/eng/Configurations.props @@ -29,7 +29,6 @@ $(NetCoreAppCurrent) Microsoft.NETCore.App .NET $(NetCoreAppCurrentVersion) - WINDOWS7.0 diff --git a/eng/versioning.targets b/eng/versioning.targets index 9b3078d941565d..f0cbf0e228994f 100644 --- a/eng/versioning.targets +++ b/eng/versioning.targets @@ -25,7 +25,7 @@ - <_Parameter1>$(MinimiumSupportedWindowsPlatform) + <_Parameter1>windows diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.CoreCLR.cs b/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.CoreCLR.cs index b0c4eaaa6f29bb..994244c034dbe7 100644 --- a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.CoreCLR.cs +++ b/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.CoreCLR.cs @@ -307,7 +307,7 @@ public static IntPtr ReAllocHGlobal(IntPtr pv, IntPtr cb) /// /// Given a managed object that wraps an ITypeInfo, return its name. /// - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static string GetTypeInfoName(ITypeInfo typeInfo) { if (typeInfo is null) @@ -321,14 +321,14 @@ public static string GetTypeInfoName(ITypeInfo typeInfo) // This method is identical to Type.GetTypeFromCLSID. Since it's interop specific, we expose it // on Marshal for more consistent API surface. - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static Type? GetTypeFromCLSID(Guid clsid) => RuntimeType.GetTypeFromCLSIDImpl(clsid, null, throwOnError: false); /// /// Return the IUnknown* for an Object if the current context is the one /// where the RCW was first seen. Will return null otherwise. /// - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static IntPtr /* IUnknown* */ GetIUnknownForObject(object o) { if (o is null) @@ -352,7 +352,7 @@ public static string GetTypeInfoName(ITypeInfo typeInfo) /// /// Return the IDispatch* for an Object. /// - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static IntPtr /* IDispatch */ GetIDispatchForObject(object o) { if (o is null) @@ -370,7 +370,7 @@ public static string GetTypeInfoName(ITypeInfo typeInfo) /// Return the IUnknown* representing the interface for the Object. /// Object o should support Type T /// - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static IntPtr /* IUnknown* */ GetComInterfaceForObject(object o, Type T) { if (o is null) @@ -386,7 +386,7 @@ public static string GetTypeInfoName(ITypeInfo typeInfo) return GetComInterfaceForObjectNative(o, T, false, true); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static IntPtr GetComInterfaceForObject([DisallowNull] T o) => GetComInterfaceForObject(o!, typeof(TInterface)); /// @@ -394,7 +394,7 @@ public static string GetTypeInfoName(ITypeInfo typeInfo) /// Object o should support Type T, it refer the value of mode to /// invoke customized QueryInterface or not. /// - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static IntPtr /* IUnknown* */ GetComInterfaceForObject(object o, Type T, CustomQueryInterfaceMode mode) { if (o is null) @@ -417,7 +417,7 @@ public static string GetTypeInfoName(ITypeInfo typeInfo) /// /// Return the managed object representing the IUnknown* /// - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static object GetObjectForIUnknown(IntPtr /* IUnknown* */ pUnk) { if (pUnk == IntPtr.Zero) @@ -431,7 +431,7 @@ public static object GetObjectForIUnknown(IntPtr /* IUnknown* */ pUnk) [MethodImpl(MethodImplOptions.InternalCall)] private static extern object GetObjectForIUnknownNative(IntPtr /* IUnknown* */ pUnk); - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static object GetUniqueObjectForIUnknown(IntPtr unknown) { if (unknown == IntPtr.Zero) @@ -455,15 +455,15 @@ public static object GetUniqueObjectForIUnknown(IntPtr unknown) /// Return an Object for IUnknown, using the Type T. /// Type T should be either a COM imported Type or a sub-type of COM imported Type /// - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] [MethodImpl(MethodImplOptions.InternalCall)] public static extern object GetTypedObjectForIUnknown(IntPtr /* IUnknown* */ pUnk, Type t); - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] [MethodImpl(MethodImplOptions.InternalCall)] public static extern IntPtr CreateAggregatedObject(IntPtr pOuter, object o); - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static IntPtr CreateAggregatedObject(IntPtr pOuter, T o) where T : notnull { return CreateAggregatedObject(pOuter, (object)o); @@ -562,7 +562,7 @@ public static string PtrToStringBSTR(IntPtr ptr) /// Release the COM component and if the reference hits 0 zombie this object. /// Further usage of this Object might throw an exception /// - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static int ReleaseComObject(object o) { if (o is null) @@ -585,7 +585,7 @@ public static int ReleaseComObject(object o) /// Release the COM component and zombie this object. /// Further usage of this Object might throw an exception /// - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static int FinalReleaseComObject(object o) { if (o is null) @@ -604,7 +604,7 @@ public static int FinalReleaseComObject(object o) [MethodImpl(MethodImplOptions.InternalCall)] internal static extern void InternalFinalReleaseComObject(object o); - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static object? GetComObjectData(object obj, object key) { if (obj is null) @@ -630,7 +630,7 @@ public static int FinalReleaseComObject(object o) /// false if the data could not be added because there already was data for the /// specified key. /// - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static bool SetComObjectData(object obj, object key, object? data) { if (obj is null) @@ -654,7 +654,7 @@ public static bool SetComObjectData(object obj, object key, object? data) /// This method takes the given COM object and wraps it in an object /// of the specified type. The type must be derived from __ComObject. /// - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] [return: NotNullIfNotNull("o")] public static object? CreateWrapperOfType(object? o, Type t) { @@ -705,7 +705,7 @@ public static bool SetComObjectData(object obj, object key, object? data) return Wrapper; } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static TWrapper CreateWrapperOfType([AllowNull] T o) { return (TWrapper)CreateWrapperOfType(o, typeof(TWrapper))!; @@ -720,7 +720,7 @@ public static TWrapper CreateWrapperOfType([AllowNull] T o) [MethodImpl(MethodImplOptions.InternalCall)] public static extern bool IsTypeVisibleFromCom(Type t); - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static unsafe int QueryInterface(IntPtr pUnk, ref Guid iid, out IntPtr ppv) { if (pUnk == IntPtr.Zero) @@ -733,7 +733,7 @@ public static unsafe int QueryInterface(IntPtr pUnk, ref Guid iid, out IntPtr pp } } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static unsafe int AddRef(IntPtr pUnk) { if (pUnk == IntPtr.Zero) @@ -742,7 +742,7 @@ public static unsafe int AddRef(IntPtr pUnk) return ((delegate * stdcall )(*(*(void***)pUnk + 1 /* IUnknown.AddRef slot */)))(pUnk); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static unsafe int Release(IntPtr pUnk) { if (pUnk == IntPtr.Zero) @@ -751,32 +751,32 @@ public static unsafe int Release(IntPtr pUnk) return ((delegate * stdcall )(*(*(void***)pUnk + 2 /* IUnknown.Release slot */)))(pUnk); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] [MethodImpl(MethodImplOptions.InternalCall)] public static extern void GetNativeVariantForObject(object? obj, /* VARIANT * */ IntPtr pDstNativeVariant); - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static void GetNativeVariantForObject([AllowNull] T obj, IntPtr pDstNativeVariant) { GetNativeVariantForObject((object?)obj, pDstNativeVariant); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] [MethodImpl(MethodImplOptions.InternalCall)] public static extern object? GetObjectForNativeVariant(/* VARIANT * */ IntPtr pSrcNativeVariant); - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] [return: MaybeNull] public static T GetObjectForNativeVariant(IntPtr pSrcNativeVariant) { return (T)GetObjectForNativeVariant(pSrcNativeVariant)!; } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] [MethodImpl(MethodImplOptions.InternalCall)] public static extern object?[] GetObjectsForNativeVariants(/* VARIANT * */ IntPtr aSrcNativeVariant, int cVars); - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static T[] GetObjectsForNativeVariants(IntPtr aSrcNativeVariant, int cVars) { object?[] objects = GetObjectsForNativeVariants(aSrcNativeVariant, cVars); @@ -791,18 +791,18 @@ public static T[] GetObjectsForNativeVariants(IntPtr aSrcNativeVariant, int c /// Returns the first valid COM slot that GetMethodInfoForSlot will work on /// This will be 3 for IUnknown based interfaces and 7 for IDispatch based interfaces. /// - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] [MethodImpl(MethodImplOptions.InternalCall)] public static extern int GetStartComSlot(Type t); /// /// Returns the last valid COM slot that GetMethodInfoForSlot will work on. /// - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] [MethodImpl(MethodImplOptions.InternalCall)] public static extern int GetEndComSlot(Type t); - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static object BindToMoniker(string monikerName) { CreateBindCtx(0, out IBindCtx bindctx); @@ -822,7 +822,7 @@ public static object BindToMoniker(string monikerName) [DllImport(Interop.Libraries.Ole32, PreserveSig = false)] private static extern void BindMoniker(IMoniker pmk, uint grfOpt, ref Guid iidResult, [MarshalAs(UnmanagedType.Interface)] out object ppvResult); - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] [MethodImpl(MethodImplOptions.InternalCall)] public static extern void ChangeWrapperHandleStrength(object otp, bool fIsWeak); #endif // FEATURE_COMINTEROP diff --git a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.cs b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.cs index 1d53ffa8e46b39..29527d20cd521a 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.cs +++ b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.cs @@ -607,7 +607,7 @@ public DictionarySectionHandler() { } protected virtual string ValueAttributeName { get { throw null; } } public virtual object Create(object parent, object context, System.Xml.XmlNode section) { throw null; } } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public sealed partial class DpapiProtectedConfigurationProvider : System.Configuration.ProtectedConfigurationProvider { public DpapiProtectedConfigurationProvider() { } diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/DpapiProtectedConfigurationProvider.cs b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/DpapiProtectedConfigurationProvider.cs index 3a395e05b17c20..db546c8010316c 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/DpapiProtectedConfigurationProvider.cs +++ b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/DpapiProtectedConfigurationProvider.cs @@ -9,7 +9,7 @@ namespace System.Configuration { - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public sealed class DpapiProtectedConfigurationProvider : ProtectedConfigurationProvider { private bool _useMachineProtection = true; diff --git a/src/libraries/System.Console/ref/System.Console.cs b/src/libraries/System.Console/ref/System.Console.cs index 94cabc7a682738..6c17987a1b49d0 100644 --- a/src/libraries/System.Console/ref/System.Console.cs +++ b/src/libraries/System.Console/ref/System.Console.cs @@ -9,14 +9,14 @@ namespace System public static partial class Console { public static System.ConsoleColor BackgroundColor { get { throw null; } set { } } - public static int BufferHeight { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] set { } } - public static int BufferWidth { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] set { } } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + public static int BufferHeight { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] set { } } + public static int BufferWidth { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] set { } } + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static bool CapsLock { get { throw null; } } public static int CursorLeft { get { throw null; } set { } } - public static int CursorSize { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] set { } } + public static int CursorSize { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] set { } } public static int CursorTop { get { throw null; } set { } } - public static bool CursorVisible { [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] get { throw null; } set { } } + public static bool CursorVisible { [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] get { throw null; } set { } } public static System.IO.TextWriter Error { get { throw null; } } public static System.ConsoleColor ForegroundColor { get { throw null; } set { } } public static System.IO.TextReader In { get { throw null; } } @@ -27,25 +27,25 @@ public static partial class Console public static bool KeyAvailable { get { throw null; } } public static int LargestWindowHeight { get { throw null; } } public static int LargestWindowWidth { get { throw null; } } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static bool NumberLock { get { throw null; } } public static System.IO.TextWriter Out { get { throw null; } } public static System.Text.Encoding OutputEncoding { get { throw null; } set { } } - public static string Title { [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] get { throw null; } set { } } + public static string Title { [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] get { throw null; } set { } } public static bool TreatControlCAsInput { get { throw null; } set { } } - public static int WindowHeight { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] set { } } - public static int WindowLeft { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] set { } } - public static int WindowTop { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] set { } } - public static int WindowWidth { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] set { } } + public static int WindowHeight { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] set { } } + public static int WindowLeft { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] set { } } + public static int WindowTop { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] set { } } + public static int WindowWidth { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] set { } } public static event System.ConsoleCancelEventHandler? CancelKeyPress { add { } remove { } } public static void Beep() { } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static void Beep(int frequency, int duration) { } public static void Clear() { } public static (int Left, int Top) GetCursorPosition() { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static void MoveBufferArea(int sourceLeft, int sourceTop, int sourceWidth, int sourceHeight, int targetLeft, int targetTop) { } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static void MoveBufferArea(int sourceLeft, int sourceTop, int sourceWidth, int sourceHeight, int targetLeft, int targetTop, char sourceChar, System.ConsoleColor sourceForeColor, System.ConsoleColor sourceBackColor) { } public static System.IO.Stream OpenStandardError() { throw null; } public static System.IO.Stream OpenStandardError(int bufferSize) { throw null; } @@ -58,15 +58,15 @@ public static void MoveBufferArea(int sourceLeft, int sourceTop, int sourceWidth public static System.ConsoleKeyInfo ReadKey(bool intercept) { throw null; } public static string? ReadLine() { throw null; } public static void ResetColor() { } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static void SetBufferSize(int width, int height) { } public static void SetCursorPosition(int left, int top) { } public static void SetError(System.IO.TextWriter newError) { } public static void SetIn(System.IO.TextReader newIn) { } public static void SetOut(System.IO.TextWriter newOut) { } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static void SetWindowPosition(int left, int top) { } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static void SetWindowSize(int width, int height) { } public static void Write(bool value) { } public static void Write(char value) { } diff --git a/src/libraries/System.Console/src/System/Console.cs b/src/libraries/System.Console/src/System/Console.cs index d20ec813d7a4c0..ec589857c16138 100644 --- a/src/libraries/System.Console/src/System/Console.cs +++ b/src/libraries/System.Console/src/System/Console.cs @@ -277,17 +277,17 @@ static StrongBox EnsureInitialized() public static int CursorSize { get { return ConsolePal.CursorSize; } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] set { ConsolePal.CursorSize = value; } } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static bool NumberLock { get { return ConsolePal.NumberLock; } } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static bool CapsLock { get { return ConsolePal.CapsLock; } @@ -315,18 +315,18 @@ public static void ResetColor() public static int BufferWidth { get { return ConsolePal.BufferWidth; } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] set { ConsolePal.BufferWidth = value; } } public static int BufferHeight { get { return ConsolePal.BufferHeight; } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] set { ConsolePal.BufferHeight = value; } } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static void SetBufferSize(int width, int height) { ConsolePal.SetBufferSize(width, height); @@ -335,38 +335,38 @@ public static void SetBufferSize(int width, int height) public static int WindowLeft { get { return ConsolePal.WindowLeft; } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] set { ConsolePal.WindowLeft = value; } } public static int WindowTop { get { return ConsolePal.WindowTop; } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] set { ConsolePal.WindowTop = value; } } public static int WindowWidth { get { return ConsolePal.WindowWidth; } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] set { ConsolePal.WindowWidth = value; } } public static int WindowHeight { get { return ConsolePal.WindowHeight; } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] set { ConsolePal.WindowHeight = value; } } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static void SetWindowPosition(int left, int top) { ConsolePal.SetWindowPosition(left, top); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static void SetWindowSize(int width, int height) { ConsolePal.SetWindowSize(width, height); @@ -384,7 +384,7 @@ public static int LargestWindowHeight public static bool CursorVisible { - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] get { return ConsolePal.CursorVisible; } set { ConsolePal.CursorVisible = value; } } @@ -413,7 +413,7 @@ public static (int Left, int Top) GetCursorPosition() public static string Title { - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] get { return ConsolePal.Title; } set { @@ -426,19 +426,19 @@ public static void Beep() ConsolePal.Beep(); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static void Beep(int frequency, int duration) { ConsolePal.Beep(frequency, duration); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static void MoveBufferArea(int sourceLeft, int sourceTop, int sourceWidth, int sourceHeight, int targetLeft, int targetTop) { ConsolePal.MoveBufferArea(sourceLeft, sourceTop, sourceWidth, sourceHeight, targetLeft, targetTop, ' ', ConsoleColor.Black, BackgroundColor); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static void MoveBufferArea(int sourceLeft, int sourceTop, int sourceWidth, int sourceHeight, int targetLeft, int targetTop, char sourceChar, ConsoleColor sourceForeColor, ConsoleColor sourceBackColor) { ConsolePal.MoveBufferArea(sourceLeft, sourceTop, sourceWidth, sourceHeight, targetLeft, targetTop, sourceChar, sourceForeColor, sourceBackColor); diff --git a/src/libraries/System.Diagnostics.Process/ref/System.Diagnostics.Process.cs b/src/libraries/System.Diagnostics.Process/ref/System.Diagnostics.Process.cs index de9b9df74c839a..57c2a5cfc6128e 100644 --- a/src/libraries/System.Diagnostics.Process/ref/System.Diagnostics.Process.cs +++ b/src/libraries/System.Diagnostics.Process/ref/System.Diagnostics.Process.cs @@ -41,8 +41,8 @@ public Process() { } public System.Diagnostics.ProcessModule? MainModule { get { throw null; } } public System.IntPtr MainWindowHandle { get { throw null; } } public string MainWindowTitle { get { throw null; } } - public System.IntPtr MaxWorkingSet { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] set { } } - public System.IntPtr MinWorkingSet { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] set { } } + public System.IntPtr MaxWorkingSet { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] set { } } + public System.IntPtr MinWorkingSet { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] set { } } public System.Diagnostics.ProcessModuleCollection Modules { get { throw null; } } [System.ObsoleteAttribute("This property has been deprecated. Please use System.Diagnostics.Process.NonpagedSystemMemorySize64 instead. https://go.microsoft.com/fwlink/?linkid=14202")] public int NonpagedSystemMemorySize { get { throw null; } } @@ -116,10 +116,10 @@ public void Refresh() { } public static System.Diagnostics.Process Start(string fileName) { throw null; } public static System.Diagnostics.Process Start(string fileName, string arguments) { throw null; } [System.CLSCompliantAttribute(false)] - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static System.Diagnostics.Process Start(string fileName, string userName, System.Security.SecureString password, string domain) { throw null; } [System.CLSCompliantAttribute(false)] - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static System.Diagnostics.Process Start(string fileName, string arguments, string userName, System.Security.SecureString password, string domain) { throw null; } public override string ToString() { throw null; } public void WaitForExit() { } @@ -165,19 +165,19 @@ public ProcessStartInfo(string fileName, string arguments) { } public System.Collections.ObjectModel.Collection ArgumentList { get { throw null; } } public string Arguments { get { throw null; } set { } } public bool CreateNoWindow { get { throw null; } set { } } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public string Domain { get { throw null; } set { } } public System.Collections.Generic.IDictionary Environment { get { throw null; } } public System.Collections.Specialized.StringDictionary EnvironmentVariables { get { throw null; } } public bool ErrorDialog { get { throw null; } set { } } public System.IntPtr ErrorDialogParentHandle { get { throw null; } set { } } public string FileName { get { throw null; } set { } } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public bool LoadUserProfile { get { throw null; } set { } } [System.CLSCompliantAttribute(false)] - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public System.Security.SecureString? Password { get { throw null; } set { } } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public string? PasswordInClearText { get { throw null; } set { } } public bool RedirectStandardError { get { throw null; } set { } } public bool RedirectStandardInput { get { throw null; } set { } } @@ -202,9 +202,9 @@ internal ProcessThread() { } public int Id { get { throw null; } } public int IdealProcessor { set { } } public bool PriorityBoostEnabled { get { throw null; } set { } } - public System.Diagnostics.ThreadPriorityLevel PriorityLevel { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] set { } } + public System.Diagnostics.ThreadPriorityLevel PriorityLevel { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] set { } } public System.TimeSpan PrivilegedProcessorTime { get { throw null; } } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public System.IntPtr ProcessorAffinity { set { } } public System.IntPtr StartAddress { get { throw null; } } public System.DateTime StartTime { get { throw null; } } diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Unix.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Unix.cs index 2fa005cbdd4ef5..fee92705d93102 100644 --- a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Unix.cs +++ b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Unix.cs @@ -42,14 +42,14 @@ public static void LeaveDebugMode() } [CLSCompliant(false)] - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static Process Start(string fileName, string userName, SecureString password, string domain) { throw new PlatformNotSupportedException(SR.ProcessStartWithPasswordAndDomainNotSupported); } [CLSCompliant(false)] - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static Process Start(string fileName, string arguments, string userName, SecureString password, string domain) { throw new PlatformNotSupportedException(SR.ProcessStartWithPasswordAndDomainNotSupported); diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Windows.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Windows.cs index abd11001b0323a..af02b8a2b6141f 100644 --- a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Windows.cs +++ b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Windows.cs @@ -47,7 +47,7 @@ public static Process[] GetProcessesByName(string? processName, string machineNa } [CLSCompliant(false)] - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static Process? Start(string fileName, string userName, SecureString password, string domain) { ProcessStartInfo startInfo = new ProcessStartInfo(fileName); @@ -59,7 +59,7 @@ public static Process[] GetProcessesByName(string? processName, string machineNa } [CLSCompliant(false)] - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static Process? Start(string fileName, string arguments, string userName, SecureString password, string domain) { ProcessStartInfo startInfo = new ProcessStartInfo(fileName, arguments); diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.cs index aac6c7b1f9645e..6d33ac04877cd9 100644 --- a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.cs +++ b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.cs @@ -265,7 +265,7 @@ public IntPtr MaxWorkingSet EnsureWorkingSetLimits(); return _maxWorkingSet; } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] set { SetWorkingSetLimits(null, value); @@ -285,7 +285,7 @@ public IntPtr MinWorkingSet EnsureWorkingSetLimits(); return _minWorkingSet; } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] set { SetWorkingSetLimits(value, null); diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessStartInfo.Unix.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessStartInfo.Unix.cs index 9cbbd4009502aa..4c674caef0b1d3 100644 --- a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessStartInfo.Unix.cs +++ b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessStartInfo.Unix.cs @@ -14,21 +14,21 @@ public sealed partial class ProcessStartInfo { private const bool CaseSensitiveEnvironmentVariables = true; - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public string PasswordInClearText { get { throw new PlatformNotSupportedException(SR.Format(SR.ProcessStartSingleFeatureNotSupported, nameof(PasswordInClearText))); } set { throw new PlatformNotSupportedException(SR.Format(SR.ProcessStartSingleFeatureNotSupported, nameof(PasswordInClearText))); } } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public string Domain { get { throw new PlatformNotSupportedException(SR.Format(SR.ProcessStartSingleFeatureNotSupported, nameof(Domain))); } set { throw new PlatformNotSupportedException(SR.Format(SR.ProcessStartSingleFeatureNotSupported, nameof(Domain))); } } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public bool LoadUserProfile { get { throw new PlatformNotSupportedException(SR.Format(SR.ProcessStartSingleFeatureNotSupported, nameof(LoadUserProfile))); } @@ -40,7 +40,7 @@ public bool LoadUserProfile public string[] Verbs => Array.Empty(); [CLSCompliant(false)] - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public SecureString Password { get { throw new PlatformNotSupportedException(SR.Format(SR.ProcessStartSingleFeatureNotSupported, nameof(Password))); } diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessStartInfo.Windows.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessStartInfo.Windows.cs index ba3ab4eee48e3a..f786a0055eb883 100644 --- a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessStartInfo.Windows.cs +++ b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessStartInfo.Windows.cs @@ -12,21 +12,21 @@ public sealed partial class ProcessStartInfo private const bool CaseSensitiveEnvironmentVariables = false; - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public string? PasswordInClearText { get; set; } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public string Domain { get => _domain ?? string.Empty; set => _domain = value; } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public bool LoadUserProfile { get; set; } [CLSCompliant(false)] - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public SecureString? Password { get; set; } } } diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessThread.Unix.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessThread.Unix.cs index d1b8cdb978da80..ccee750841cd71 100644 --- a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessThread.Unix.cs +++ b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessThread.Unix.cs @@ -41,7 +41,7 @@ private bool PriorityBoostEnabledCore /// two, etc. For example, the value 1 means run on processor one, 2 means run on /// processor two, 3 means run on processor one or two. /// - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public IntPtr ProcessorAffinity { set { throw new PlatformNotSupportedException(); } // No ability to change the affinity of a thread in an arbitrary process diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessThread.Windows.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessThread.Windows.cs index db18cd7f4b2d0a..f46fd604e5e21a 100644 --- a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessThread.Windows.cs +++ b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessThread.Windows.cs @@ -100,7 +100,7 @@ private ThreadPriorityLevel PriorityLevelCore /// two, etc. For example, the value 1 means run on processor one, 2 means run on /// processor two, 3 means run on processor one or two. /// - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public IntPtr ProcessorAffinity { set diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessThread.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessThread.cs index b0a10b5e9a6ba3..f5ec77c8e56463 100644 --- a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessThread.cs +++ b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessThread.cs @@ -95,7 +95,7 @@ public ThreadPriorityLevel PriorityLevel } return _priorityLevel.Value; } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] set { PriorityLevelCore = value; diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/ref/System.IO.FileSystem.DriveInfo.cs b/src/libraries/System.IO.FileSystem.DriveInfo/ref/System.IO.FileSystem.DriveInfo.cs index b7d16e5d740dcd..19e8f51412b35f 100644 --- a/src/libraries/System.IO.FileSystem.DriveInfo/ref/System.IO.FileSystem.DriveInfo.cs +++ b/src/libraries/System.IO.FileSystem.DriveInfo/ref/System.IO.FileSystem.DriveInfo.cs @@ -18,7 +18,7 @@ public DriveInfo(string driveName) { } public long TotalFreeSpace { get { throw null; } } public long TotalSize { get { throw null; } } [System.Diagnostics.CodeAnalysis.AllowNullAttribute] - public string VolumeLabel { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] set { } } + public string VolumeLabel { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] set { } } public static System.IO.DriveInfo[] GetDrives() { throw null; } void System.Runtime.Serialization.ISerializable.GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } public override string ToString() { throw null; } diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/src/System/IO/DriveInfo.UnixOrBrowser.cs b/src/libraries/System.IO.FileSystem.DriveInfo/src/System/IO/DriveInfo.UnixOrBrowser.cs index bbfbd8bb4ac280..51892986a5df68 100644 --- a/src/libraries/System.IO.FileSystem.DriveInfo/src/System/IO/DriveInfo.UnixOrBrowser.cs +++ b/src/libraries/System.IO.FileSystem.DriveInfo/src/System/IO/DriveInfo.UnixOrBrowser.cs @@ -42,7 +42,7 @@ public string VolumeLabel { return Name; } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] set { throw new PlatformNotSupportedException(); diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/src/System/IO/DriveInfo.Windows.cs b/src/libraries/System.IO.FileSystem.DriveInfo/src/System/IO/DriveInfo.Windows.cs index ef89cd3763f224..d361611377ed15 100644 --- a/src/libraries/System.IO.FileSystem.DriveInfo/src/System/IO/DriveInfo.Windows.cs +++ b/src/libraries/System.IO.FileSystem.DriveInfo/src/System/IO/DriveInfo.Windows.cs @@ -139,7 +139,7 @@ public unsafe string VolumeLabel return new string(volumeName); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] set { uint oldMode; diff --git a/src/libraries/System.IO.FileSystem/ref/System.IO.FileSystem.cs b/src/libraries/System.IO.FileSystem/ref/System.IO.FileSystem.cs index 09e8f6d7639329..e6fbef2727e0ba 100644 --- a/src/libraries/System.IO.FileSystem/ref/System.IO.FileSystem.cs +++ b/src/libraries/System.IO.FileSystem/ref/System.IO.FileSystem.cs @@ -121,10 +121,10 @@ public static void Copy(string sourceFileName, string destFileName, bool overwri public static System.IO.FileStream Create(string path, int bufferSize) { throw null; } public static System.IO.FileStream Create(string path, int bufferSize, System.IO.FileOptions options) { throw null; } public static System.IO.StreamWriter CreateText(string path) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static void Decrypt(string path) { } public static void Delete(string path) { } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static void Encrypt(string path) { } public static bool Exists(string? path) { throw null; } public static System.IO.FileAttributes GetAttributes(string path) { throw null; } diff --git a/src/libraries/System.IO.FileSystem/src/System/IO/File.cs b/src/libraries/System.IO.FileSystem/src/System/IO/File.cs index 366e55a7b3998c..1b089a91ffc883 100644 --- a/src/libraries/System.IO.FileSystem/src/System/IO/File.cs +++ b/src/libraries/System.IO.FileSystem/src/System/IO/File.cs @@ -646,13 +646,13 @@ public static void Move(string sourceFileName, string destFileName, bool overwri FileSystem.MoveFile(fullSourceFileName, fullDestFileName, overwrite); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static void Encrypt(string path) { FileSystem.Encrypt(path ?? throw new ArgumentNullException(nameof(path))); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static void Decrypt(string path) { FileSystem.Decrypt(path ?? throw new ArgumentNullException(nameof(path))); diff --git a/src/libraries/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.cs b/src/libraries/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.cs index 22135ab9cdabf9..e112060f78498d 100644 --- a/src/libraries/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.cs +++ b/src/libraries/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.cs @@ -33,11 +33,11 @@ internal MemoryMappedFile() { } public static System.IO.MemoryMappedFiles.MemoryMappedFile CreateNew(string? mapName, long capacity) { throw null; } public static System.IO.MemoryMappedFiles.MemoryMappedFile CreateNew(string? mapName, long capacity, System.IO.MemoryMappedFiles.MemoryMappedFileAccess access) { throw null; } public static System.IO.MemoryMappedFiles.MemoryMappedFile CreateNew(string? mapName, long capacity, System.IO.MemoryMappedFiles.MemoryMappedFileAccess access, System.IO.MemoryMappedFiles.MemoryMappedFileOptions options, System.IO.HandleInheritability inheritability) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static System.IO.MemoryMappedFiles.MemoryMappedFile CreateOrOpen(string mapName, long capacity) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static System.IO.MemoryMappedFiles.MemoryMappedFile CreateOrOpen(string mapName, long capacity, System.IO.MemoryMappedFiles.MemoryMappedFileAccess access) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static System.IO.MemoryMappedFiles.MemoryMappedFile CreateOrOpen(string mapName, long capacity, System.IO.MemoryMappedFiles.MemoryMappedFileAccess access, System.IO.MemoryMappedFiles.MemoryMappedFileOptions options, System.IO.HandleInheritability inheritability) { throw null; } public System.IO.MemoryMappedFiles.MemoryMappedViewAccessor CreateViewAccessor() { throw null; } public System.IO.MemoryMappedFiles.MemoryMappedViewAccessor CreateViewAccessor(long offset, long size) { throw null; } @@ -47,11 +47,11 @@ internal MemoryMappedFile() { } public System.IO.MemoryMappedFiles.MemoryMappedViewStream CreateViewStream(long offset, long size, System.IO.MemoryMappedFiles.MemoryMappedFileAccess access) { throw null; } public void Dispose() { } protected virtual void Dispose(bool disposing) { } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static System.IO.MemoryMappedFiles.MemoryMappedFile OpenExisting(string mapName) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static System.IO.MemoryMappedFiles.MemoryMappedFile OpenExisting(string mapName, System.IO.MemoryMappedFiles.MemoryMappedFileRights desiredAccessRights) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static System.IO.MemoryMappedFiles.MemoryMappedFile OpenExisting(string mapName, System.IO.MemoryMappedFiles.MemoryMappedFileRights desiredAccessRights, System.IO.HandleInheritability inheritability) { throw null; } } public enum MemoryMappedFileAccess diff --git a/src/libraries/System.IO.MemoryMappedFiles/src/System/IO/MemoryMappedFiles/MemoryMappedFile.cs b/src/libraries/System.IO.MemoryMappedFiles/src/System/IO/MemoryMappedFiles/MemoryMappedFile.cs index fbd2fbc257c4c1..d2f04e84d27ef9 100644 --- a/src/libraries/System.IO.MemoryMappedFiles/src/System/IO/MemoryMappedFiles/MemoryMappedFile.cs +++ b/src/libraries/System.IO.MemoryMappedFiles/src/System/IO/MemoryMappedFiles/MemoryMappedFile.cs @@ -44,19 +44,19 @@ private MemoryMappedFile(SafeMemoryMappedFileHandle handle, FileStream fileStrea // the first override of this method. Note: having ReadWrite access to the object does not mean that we // have ReadWrite access to the pages mapping the file. The OS will check against the access on the pages // when a view is created. - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static MemoryMappedFile OpenExisting(string mapName) { return OpenExisting(mapName, MemoryMappedFileRights.ReadWrite, HandleInheritability.None); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static MemoryMappedFile OpenExisting(string mapName, MemoryMappedFileRights desiredAccessRights) { return OpenExisting(mapName, desiredAccessRights, HandleInheritability.None); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static MemoryMappedFile OpenExisting(string mapName, MemoryMappedFileRights desiredAccessRights, HandleInheritability inheritability) { @@ -295,21 +295,21 @@ public static MemoryMappedFile CreateNew(string? mapName, long capacity, MemoryM // memory mapped file if one exists with the same name. The capacity, options, and // memoryMappedFileSecurity arguments will be ignored in the case of the later. // This is ideal for P2P style IPC. - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static MemoryMappedFile CreateOrOpen(string mapName, long capacity) { return CreateOrOpen(mapName, capacity, MemoryMappedFileAccess.ReadWrite, MemoryMappedFileOptions.None, HandleInheritability.None); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static MemoryMappedFile CreateOrOpen(string mapName, long capacity, MemoryMappedFileAccess access) { return CreateOrOpen(mapName, capacity, access, MemoryMappedFileOptions.None, HandleInheritability.None); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static MemoryMappedFile CreateOrOpen(string mapName, long capacity, MemoryMappedFileAccess access, MemoryMappedFileOptions options, HandleInheritability inheritability) diff --git a/src/libraries/System.IO.Pipes/ref/System.IO.Pipes.cs b/src/libraries/System.IO.Pipes/ref/System.IO.Pipes.cs index 54b3486328a89d..8dfe980c49fba9 100644 --- a/src/libraries/System.IO.Pipes/ref/System.IO.Pipes.cs +++ b/src/libraries/System.IO.Pipes/ref/System.IO.Pipes.cs @@ -48,7 +48,7 @@ public sealed partial class NamedPipeClientStream : System.IO.Pipes.PipeStream public NamedPipeClientStream(string serverName, string pipeName, System.IO.Pipes.PipeDirection direction, System.IO.Pipes.PipeOptions options) : base (default(System.IO.Pipes.PipeDirection), default(int)) { } public NamedPipeClientStream(string serverName, string pipeName, System.IO.Pipes.PipeDirection direction, System.IO.Pipes.PipeOptions options, System.Security.Principal.TokenImpersonationLevel impersonationLevel) : base (default(System.IO.Pipes.PipeDirection), default(int)) { } public NamedPipeClientStream(string serverName, string pipeName, System.IO.Pipes.PipeDirection direction, System.IO.Pipes.PipeOptions options, System.Security.Principal.TokenImpersonationLevel impersonationLevel, System.IO.HandleInheritability inheritability) : base (default(System.IO.Pipes.PipeDirection), default(int)) { } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public int NumberOfServerInstances { get { throw null; } } protected internal override void CheckPipePropertyOperations() { } public void Connect() { } @@ -129,7 +129,7 @@ protected void InitializeHandle(Microsoft.Win32.SafeHandles.SafePipeHandle? hand public override int ReadByte() { throw null; } public override long Seek(long offset, System.IO.SeekOrigin origin) { throw null; } public override void SetLength(long value) { } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public void WaitForPipeDrain() { } public override void Write(byte[] buffer, int offset, int count) { } public override void Write(System.ReadOnlySpan buffer) { } @@ -141,7 +141,7 @@ public override void WriteByte(byte value) { } public enum PipeTransmissionMode { Byte = 0, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] Message = 1, } } diff --git a/src/libraries/System.IO.Pipes/src/System/IO/Pipes/NamedPipeClientStream.Unix.cs b/src/libraries/System.IO.Pipes/src/System/IO/Pipes/NamedPipeClientStream.Unix.cs index 89d8bb70179fc6..42fe518e0012e3 100644 --- a/src/libraries/System.IO.Pipes/src/System/IO/Pipes/NamedPipeClientStream.Unix.cs +++ b/src/libraries/System.IO.Pipes/src/System/IO/Pipes/NamedPipeClientStream.Unix.cs @@ -67,7 +67,7 @@ private bool TryConnect(int timeout, CancellationToken cancellationToken) return true; } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public int NumberOfServerInstances { get diff --git a/src/libraries/System.IO.Pipes/src/System/IO/Pipes/NamedPipeClientStream.Windows.cs b/src/libraries/System.IO.Pipes/src/System/IO/Pipes/NamedPipeClientStream.Windows.cs index a7f48949771748..a082a3da863972 100644 --- a/src/libraries/System.IO.Pipes/src/System/IO/Pipes/NamedPipeClientStream.Windows.cs +++ b/src/libraries/System.IO.Pipes/src/System/IO/Pipes/NamedPipeClientStream.Windows.cs @@ -108,7 +108,7 @@ private bool TryConnect(int timeout, CancellationToken cancellationToken) return true; } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public unsafe int NumberOfServerInstances { get diff --git a/src/libraries/System.IO.Pipes/src/System/IO/Pipes/PipeStream.Unix.cs b/src/libraries/System.IO.Pipes/src/System/IO/Pipes/PipeStream.Unix.cs index b84999c721e314..6e6fa8a5c1385f 100644 --- a/src/libraries/System.IO.Pipes/src/System/IO/Pipes/PipeStream.Unix.cs +++ b/src/libraries/System.IO.Pipes/src/System/IO/Pipes/PipeStream.Unix.cs @@ -220,7 +220,7 @@ private IOException GetIOExceptionForSocketException(SocketException e) } // Blocks until the other end of the pipe has read in all written buffer. - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public void WaitForPipeDrain() { CheckWriteOperations(); diff --git a/src/libraries/System.IO.Pipes/src/System/IO/Pipes/PipeStream.Windows.cs b/src/libraries/System.IO.Pipes/src/System/IO/Pipes/PipeStream.Windows.cs index 1060da2ea3725e..b221c9880b6cfa 100644 --- a/src/libraries/System.IO.Pipes/src/System/IO/Pipes/PipeStream.Windows.cs +++ b/src/libraries/System.IO.Pipes/src/System/IO/Pipes/PipeStream.Windows.cs @@ -179,7 +179,7 @@ private Task WriteAsyncCore(ReadOnlyMemory buffer, CancellationToken cance } // Blocks until the other end of the pipe has read in all written buffer. - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public void WaitForPipeDrain() { CheckWriteOperations(); diff --git a/src/libraries/System.IO.Pipes/src/System/IO/Pipes/PipeTransmissionMode.cs b/src/libraries/System.IO.Pipes/src/System/IO/Pipes/PipeTransmissionMode.cs index 8ed232d3b45890..c4d8f0956c0431 100644 --- a/src/libraries/System.IO.Pipes/src/System/IO/Pipes/PipeTransmissionMode.cs +++ b/src/libraries/System.IO.Pipes/src/System/IO/Pipes/PipeTransmissionMode.cs @@ -8,7 +8,7 @@ namespace System.IO.Pipes public enum PipeTransmissionMode { Byte = 0, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] Message = 1, } } diff --git a/src/libraries/System.Net.HttpListener/ref/System.Net.HttpListener.cs b/src/libraries/System.Net.HttpListener/ref/System.Net.HttpListener.cs index c93cc4941d5b59..27f33aac7a2aa2 100644 --- a/src/libraries/System.Net.HttpListener/ref/System.Net.HttpListener.cs +++ b/src/libraries/System.Net.HttpListener/ref/System.Net.HttpListener.cs @@ -139,11 +139,11 @@ public partial class HttpListenerTimeoutManager { internal HttpListenerTimeoutManager() { } public System.TimeSpan DrainEntityBody { get { throw null; } set { } } - public System.TimeSpan EntityBody { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] set { } } - public System.TimeSpan HeaderWait { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] set { } } + public System.TimeSpan EntityBody { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] set { } } + public System.TimeSpan HeaderWait { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] set { } } public System.TimeSpan IdleConnection { get { throw null; } set { } } - public long MinSendBytesPerSecond { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] set { } } - public System.TimeSpan RequestQueue { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] set { } } + public long MinSendBytesPerSecond { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] set { } } + public System.TimeSpan RequestQueue { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] set { } } } } namespace System.Net.WebSockets diff --git a/src/libraries/System.Net.HttpListener/src/System/Net/Managed/HttpListenerTimeoutManager.Managed.cs b/src/libraries/System.Net.HttpListener/src/System/Net/Managed/HttpListenerTimeoutManager.Managed.cs index 8734f93b145ff1..8dda7441040797 100644 --- a/src/libraries/System.Net.HttpListener/src/System/Net/Managed/HttpListenerTimeoutManager.Managed.cs +++ b/src/libraries/System.Net.HttpListener/src/System/Net/Managed/HttpListenerTimeoutManager.Managed.cs @@ -39,7 +39,7 @@ public TimeSpan IdleConnection public TimeSpan EntityBody { get => TimeSpan.Zero; - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] set { ValidateTimeout(value); @@ -50,7 +50,7 @@ public TimeSpan EntityBody public TimeSpan HeaderWait { get => TimeSpan.Zero; - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] set { ValidateTimeout(value); @@ -61,7 +61,7 @@ public TimeSpan HeaderWait public long MinSendBytesPerSecond { get => 0; - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] set { if (value < 0 || value > uint.MaxValue) @@ -75,7 +75,7 @@ public long MinSendBytesPerSecond public TimeSpan RequestQueue { get => TimeSpan.Zero; - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] set { ValidateTimeout(value); diff --git a/src/libraries/System.Net.HttpListener/src/System/Net/Windows/HttpListenerTimeoutManager.Windows.cs b/src/libraries/System.Net.HttpListener/src/System/Net/Windows/HttpListenerTimeoutManager.Windows.cs index 13da1e11e963fe..a1af5b35b71a84 100644 --- a/src/libraries/System.Net.HttpListener/src/System/Net/Windows/HttpListenerTimeoutManager.Windows.cs +++ b/src/libraries/System.Net.HttpListener/src/System/Net/Windows/HttpListenerTimeoutManager.Windows.cs @@ -83,7 +83,7 @@ public TimeSpan EntityBody { return GetTimeout(Interop.HttpApi.HTTP_TIMEOUT_TYPE.EntityBody); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] set { SetTimespanTimeout(Interop.HttpApi.HTTP_TIMEOUT_TYPE.EntityBody, value); @@ -121,7 +121,7 @@ public TimeSpan RequestQueue { return GetTimeout(Interop.HttpApi.HTTP_TIMEOUT_TYPE.RequestQueue); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] set { SetTimespanTimeout(Interop.HttpApi.HTTP_TIMEOUT_TYPE.RequestQueue, value); @@ -157,7 +157,7 @@ public TimeSpan HeaderWait { return GetTimeout(Interop.HttpApi.HTTP_TIMEOUT_TYPE.HeaderWait); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] set { SetTimespanTimeout(Interop.HttpApi.HTTP_TIMEOUT_TYPE.HeaderWait, value); @@ -177,7 +177,7 @@ public long MinSendBytesPerSecond // return _minSendBytesPerSecond; } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] set { // diff --git a/src/libraries/System.Net.Sockets/ref/System.Net.Sockets.cs b/src/libraries/System.Net.Sockets/ref/System.Net.Sockets.cs index c0d7c4e2dd1919..11d3309cf116df 100644 --- a/src/libraries/System.Net.Sockets/ref/System.Net.Sockets.cs +++ b/src/libraries/System.Net.Sockets/ref/System.Net.Sockets.cs @@ -8,70 +8,70 @@ namespace System.Net.Sockets { public enum IOControlCode : long { - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] EnableCircularQueuing = (long)671088642, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] Flush = (long)671088644, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] AddressListChange = (long)671088663, DataToRead = (long)1074030207, OobDataRead = (long)1074033415, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] GetBroadcastAddress = (long)1207959557, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] AddressListQuery = (long)1207959574, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] QueryTargetPnpHandle = (long)1207959576, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] AsyncIO = (long)2147772029, NonBlockingIO = (long)2147772030, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] AssociateHandle = (long)2281701377, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] MultipointLoopback = (long)2281701385, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] MulticastScope = (long)2281701386, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] SetQos = (long)2281701387, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] SetGroupQos = (long)2281701388, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] RoutingInterfaceChange = (long)2281701397, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] NamespaceChange = (long)2281701401, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] ReceiveAll = (long)2550136833, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] ReceiveAllMulticast = (long)2550136834, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] ReceiveAllIgmpMulticast = (long)2550136835, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] KeepAliveValues = (long)2550136836, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] AbsorbRouterAlert = (long)2550136837, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] UnicastInterface = (long)2550136838, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] LimitBroadcasts = (long)2550136839, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] BindToInterface = (long)2550136840, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] MulticastInterface = (long)2550136841, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] AddMulticastGroupOnInterface = (long)2550136842, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] DeleteMulticastGroupFromInterface = (long)2550136843, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] GetExtensionFunctionPointer = (long)3355443206, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] GetQos = (long)3355443207, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] GetGroupQos = (long)3355443208, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] TranslateHandle = (long)3355443213, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] RoutingInterfaceQuery = (long)3355443220, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] AddressListSort = (long)3355443225, } public partial struct IPPacketInformation @@ -254,7 +254,7 @@ public partial class Socket : System.IDisposable { public Socket(System.Net.Sockets.SafeSocketHandle handle) { } public Socket(System.Net.Sockets.AddressFamily addressFamily, System.Net.Sockets.SocketType socketType, System.Net.Sockets.ProtocolType protocolType) { } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public Socket(System.Net.Sockets.SocketInformation socketInformation) { } public Socket(System.Net.Sockets.SocketType socketType, System.Net.Sockets.ProtocolType protocolType) { } public System.Net.Sockets.AddressFamily AddressFamily { get { throw null; } } @@ -326,7 +326,7 @@ public void Disconnect(bool reuseSocket) { } public bool DisconnectAsync(System.Net.Sockets.SocketAsyncEventArgs e) { throw null; } public void Dispose() { } protected virtual void Dispose(bool disposing) { } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public System.Net.Sockets.SocketInformation DuplicateAndClose(int targetProcessId) { throw null; } public System.Net.Sockets.Socket EndAccept(out byte[] buffer, System.IAsyncResult asyncResult) { throw null; } public System.Net.Sockets.Socket EndAccept(out byte[] buffer, out int bytesTransferred, System.IAsyncResult asyncResult) { throw null; } @@ -391,7 +391,7 @@ public void SendFile(string? fileName, byte[]? preBuffer, byte[]? postBuffer, Sy public int SendTo(byte[] buffer, System.Net.EndPoint remoteEP) { throw null; } public int SendTo(byte[] buffer, System.Net.Sockets.SocketFlags socketFlags, System.Net.EndPoint remoteEP) { throw null; } public bool SendToAsync(System.Net.Sockets.SocketAsyncEventArgs e) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public void SetIPProtectionLevel(System.Net.Sockets.IPProtectionLevel level) { } public void SetRawSocketOption(int optionLevel, int optionName, System.ReadOnlySpan optionValue) { } public void SetSocketOption(System.Net.Sockets.SocketOptionLevel optionLevel, System.Net.Sockets.SocketOptionName optionName, bool optionValue) { } @@ -626,7 +626,7 @@ public TcpListener(System.Net.IPEndPoint localEP) { } public System.Threading.Tasks.Task AcceptSocketAsync() { throw null; } public System.Net.Sockets.TcpClient AcceptTcpClient() { throw null; } public System.Threading.Tasks.Task AcceptTcpClientAsync() { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public void AllowNatTraversal(bool allowed) { } public System.IAsyncResult BeginAcceptSocket(System.AsyncCallback? callback, object? state) { throw null; } public System.IAsyncResult BeginAcceptTcpClient(System.AsyncCallback? callback, object? state) { throw null; } @@ -644,11 +644,11 @@ public enum TransmitFileOptions UseDefaultWorkerThread = 0, Disconnect = 1, ReuseSocket = 2, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] WriteBehind = 4, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] UseSystemThread = 16, - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] UseKernelApc = 32, } public partial class UdpClient : System.IDisposable @@ -667,7 +667,7 @@ public UdpClient(string hostname, int port) { } public bool ExclusiveAddressUse { get { throw null; } set { } } public bool MulticastLoopback { get { throw null; } set { } } public short Ttl { get { throw null; } set { } } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public void AllowNatTraversal(bool allowed) { } public System.IAsyncResult BeginReceive(System.AsyncCallback? requestCallback, object? state) { throw null; } public System.IAsyncResult BeginSend(byte[] datagram, int bytes, System.AsyncCallback? requestCallback, object? state) { throw null; } diff --git a/src/libraries/System.Net.Sockets/src/System/Net/Sockets/IOControlCode.cs b/src/libraries/System.Net.Sockets/src/System/Net/Sockets/IOControlCode.cs index a2e4c9efd0ecda..0039c85553c3dd 100644 --- a/src/libraries/System.Net.Sockets/src/System/Net/Sockets/IOControlCode.cs +++ b/src/libraries/System.Net.Sockets/src/System/Net/Sockets/IOControlCode.cs @@ -7,70 +7,70 @@ namespace System.Net.Sockets { public enum IOControlCode : long { - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] AsyncIO = 0x8004667D, NonBlockingIO = 0x8004667E, // fionbio DataToRead = 0x4004667F, // fionread OobDataRead = 0x40047307, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] AssociateHandle = 0x88000001, // SIO_ASSOCIATE_HANDLE - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] EnableCircularQueuing = 0x28000002, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] Flush = 0x28000004, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] GetBroadcastAddress = 0x48000005, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] GetExtensionFunctionPointer = 0xC8000006, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] GetQos = 0xC8000007, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] GetGroupQos = 0xC8000008, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] MultipointLoopback = 0x88000009, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] MulticastScope = 0x8800000A, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] SetQos = 0x8800000B, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] SetGroupQos = 0x8800000C, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] TranslateHandle = 0xC800000D, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] RoutingInterfaceQuery = 0xC8000014, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] RoutingInterfaceChange = 0x88000015, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] AddressListQuery = 0x48000016, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] AddressListChange = 0x28000017, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] QueryTargetPnpHandle = 0x48000018, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] NamespaceChange = 0x88000019, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] AddressListSort = 0xC8000019, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] ReceiveAll = 0x98000001, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] ReceiveAllMulticast = 0x98000002, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] ReceiveAllIgmpMulticast = 0x98000003, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] KeepAliveValues = 0x98000004, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] AbsorbRouterAlert = 0x98000005, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] UnicastInterface = 0x98000006, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] LimitBroadcasts = 0x98000007, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] BindToInterface = 0x98000008, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] MulticastInterface = 0x98000009, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] AddMulticastGroupOnInterface = 0x9800000A, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] DeleteMulticastGroupFromInterface = 0x9800000B } } diff --git a/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Unix.cs b/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Unix.cs index e5905b7b70bf6d..fd9a6c80fcf417 100644 --- a/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Unix.cs +++ b/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Unix.cs @@ -10,7 +10,7 @@ namespace System.Net.Sockets { public partial class Socket { - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public Socket(SocketInformation socketInformation) { // This constructor works in conjunction with DuplicateAndClose, which is not supported on Unix. @@ -18,7 +18,7 @@ public Socket(SocketInformation socketInformation) throw new PlatformNotSupportedException(SR.net_sockets_duplicateandclose_notsupported); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public SocketInformation DuplicateAndClose(int targetProcessId) { // DuplicateAndClose is not supported on Unix, since passing file descriptors between processes diff --git a/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Windows.cs b/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Windows.cs index f4b87f2e4ff5e2..a8cb83dc651f8d 100644 --- a/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Windows.cs +++ b/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Windows.cs @@ -17,7 +17,7 @@ public partial class Socket internal void ReplaceHandleIfNecessaryAfterFailedConnect() { /* nop on Windows */ } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public Socket(SocketInformation socketInformation) { InitializeSockets(); @@ -106,7 +106,7 @@ private unsafe void LoadSocketTypeFromHandle( blocking = true; } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public SocketInformation DuplicateAndClose(int targetProcessId) { ThrowIfDisposed(); diff --git a/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs b/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs index ac327f86f709ca..9fbc3c4c9a28b6 100644 --- a/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs +++ b/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs @@ -1989,7 +1989,7 @@ public int GetRawSocketOption(int optionLevel, int optionName, Span option return realOptionLength; } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public void SetIPProtectionLevel(IPProtectionLevel level) { if (level == IPProtectionLevel.Unspecified) diff --git a/src/libraries/System.Net.Sockets/src/System/Net/Sockets/TCPListener.cs b/src/libraries/System.Net.Sockets/src/System/Net/Sockets/TCPListener.cs index b32a6d1050310c..adb1c3f06dc1f4 100644 --- a/src/libraries/System.Net.Sockets/src/System/Net/Sockets/TCPListener.cs +++ b/src/libraries/System.Net.Sockets/src/System/Net/Sockets/TCPListener.cs @@ -112,7 +112,7 @@ public bool ExclusiveAddressUse } } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public void AllowNatTraversal(bool allowed) { if (_active) diff --git a/src/libraries/System.Net.Sockets/src/System/Net/Sockets/TransmitFileOptions.cs b/src/libraries/System.Net.Sockets/src/System/Net/Sockets/TransmitFileOptions.cs index 418e7a6ab070cc..32b69e7e53ca64 100644 --- a/src/libraries/System.Net.Sockets/src/System/Net/Sockets/TransmitFileOptions.cs +++ b/src/libraries/System.Net.Sockets/src/System/Net/Sockets/TransmitFileOptions.cs @@ -11,11 +11,11 @@ public enum TransmitFileOptions UseDefaultWorkerThread = 0x00, Disconnect = 0x01, ReuseSocket = 0x02, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] WriteBehind = 0x04, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] UseSystemThread = 0x10, - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] UseKernelApc = 0x20, }; } diff --git a/src/libraries/System.Net.Sockets/src/System/Net/Sockets/UDPClient.cs b/src/libraries/System.Net.Sockets/src/System/Net/Sockets/UDPClient.cs index 4b19c4bf00633a..e27a77da1f81db 100644 --- a/src/libraries/System.Net.Sockets/src/System/Net/Sockets/UDPClient.cs +++ b/src/libraries/System.Net.Sockets/src/System/Net/Sockets/UDPClient.cs @@ -193,7 +193,7 @@ public bool ExclusiveAddressUse } } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public void AllowNatTraversal(bool allowed) { _clientSocket.SetIPProtectionLevel(allowed ? IPProtectionLevel.Unrestricted : IPProtectionLevel.EdgeRestricted); diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/DispatchWrapper.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/DispatchWrapper.cs index c0d28b17cbf781..740d69aefde6b7 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/DispatchWrapper.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/DispatchWrapper.cs @@ -22,7 +22,7 @@ public DispatchWrapper(object? obj) } } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public object? WrappedObject { get; } } } diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.NoCom.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.NoCom.cs index 2a64a19a6a426c..477717e9cb21ca 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.NoCom.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.NoCom.cs @@ -15,7 +15,7 @@ public static int GetHRForException(Exception? e) return e?.HResult ?? 0; } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static int AddRef(IntPtr pUnk) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); @@ -23,13 +23,13 @@ public static int AddRef(IntPtr pUnk) public static bool AreComObjectsAvailableForCleanup() => false; - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static IntPtr CreateAggregatedObject(IntPtr pOuter, object o) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static object BindToMoniker(string monikerName) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); @@ -39,55 +39,55 @@ public static void CleanupUnusedObjectsInCurrentContext() { } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static IntPtr CreateAggregatedObject(IntPtr pOuter, T o) where T : notnull { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static object? CreateWrapperOfType(object? o, Type t) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static TWrapper CreateWrapperOfType([AllowNull] T o) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static void ChangeWrapperHandleStrength(object otp, bool fIsWeak) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static int FinalReleaseComObject(object o) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static IntPtr GetComInterfaceForObject(object o, Type T) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static IntPtr GetComInterfaceForObject(object o, Type T, CustomQueryInterfaceMode mode) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static IntPtr GetComInterfaceForObject([DisallowNull] T o) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static object? GetComObjectData(object obj, object key) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); @@ -103,92 +103,92 @@ public static IntPtr GetHINSTANCE(Module m) return (IntPtr)(-1); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static IntPtr GetIDispatchForObject(object o) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static IntPtr GetIUnknownForObject(object o) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static void GetNativeVariantForObject(object? obj, IntPtr pDstNativeVariant) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static void GetNativeVariantForObject([AllowNull] T obj, IntPtr pDstNativeVariant) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static object GetTypedObjectForIUnknown(IntPtr pUnk, Type t) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static object GetObjectForIUnknown(IntPtr pUnk) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static object? GetObjectForNativeVariant(IntPtr pSrcNativeVariant) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] [return: MaybeNull] public static T GetObjectForNativeVariant(IntPtr pSrcNativeVariant) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static object?[] GetObjectsForNativeVariants(IntPtr aSrcNativeVariant, int cVars) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static T[] GetObjectsForNativeVariants(IntPtr aSrcNativeVariant, int cVars) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static int GetStartComSlot(Type t) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static int GetEndComSlot(Type t) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static Type? GetTypeFromCLSID(Guid clsid) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static string GetTypeInfoName(ITypeInfo typeInfo) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static object GetUniqueObjectForIUnknown(IntPtr unknown) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); @@ -213,25 +213,25 @@ public static bool IsTypeVisibleFromCom(Type t) return false; } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static int QueryInterface(IntPtr pUnk, ref Guid iid, out IntPtr ppv) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static int Release(IntPtr pUnk) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static int ReleaseComObject(object o) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static bool SetComObjectData(object obj, object key, object? data) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/EventWaitHandle.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/EventWaitHandle.cs index 608838a786b467..f17eaddb5d132b 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Threading/EventWaitHandle.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Threading/EventWaitHandle.cs @@ -28,7 +28,7 @@ public EventWaitHandle(bool initialState, EventResetMode mode, string? name, out CreateEventCore(initialState, mode, name, out createdNew); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static EventWaitHandle OpenExisting(string name) { switch (OpenExistingWorker(name, out EventWaitHandle? result)) @@ -45,7 +45,7 @@ public static EventWaitHandle OpenExisting(string name) } } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static bool TryOpenExisting(string name, [NotNullWhen(true)] out EventWaitHandle? result) => OpenExistingWorker(name, out result!) == OpenExistingResult.Success; } diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/Semaphore.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/Semaphore.cs index 4836f701486541..fb386e9e8be9d0 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Threading/Semaphore.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Threading/Semaphore.cs @@ -33,7 +33,7 @@ public Semaphore(int initialCount, int maximumCount, string? name, out bool crea CreateSemaphoreCore(initialCount, maximumCount, name, out createdNew); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static Semaphore OpenExisting(string name) { switch (OpenExistingWorker(name, out Semaphore? result)) @@ -50,7 +50,7 @@ public static Semaphore OpenExisting(string name) } } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public static bool TryOpenExisting(string name, [NotNullWhen(true)] out Semaphore? result) => OpenExistingWorker(name, out result!) == OpenExistingResult.Success; diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/Thread.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/Thread.cs index cb41f1b7dc41a3..ba36c3f14fa307 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Threading/Thread.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Threading/Thread.cs @@ -227,7 +227,7 @@ public ApartmentState ApartmentState set => TrySetApartmentState(value); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public void SetApartmentState(ApartmentState state) { if (!TrySetApartmentState(state)) diff --git a/src/libraries/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs b/src/libraries/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs index 5adee94bd6623a..67b487cb971bd4 100644 --- a/src/libraries/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs +++ b/src/libraries/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs @@ -317,7 +317,7 @@ public DefaultParameterValueAttribute(object? value) { } public sealed partial class DispatchWrapper { public DispatchWrapper(object? obj) { } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public object? WrappedObject { get { throw null; } } } [System.AttributeUsageAttribute(System.AttributeTargets.Event | System.AttributeTargets.Field | System.AttributeTargets.Method | System.AttributeTargets.Property, Inherited=false)] @@ -463,15 +463,15 @@ public static partial class Marshal { public static readonly int SystemDefaultCharSize; public static readonly int SystemMaxDBCSCharSize; - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static int AddRef(System.IntPtr pUnk) { throw null; } public static System.IntPtr AllocCoTaskMem(int cb) { throw null; } public static System.IntPtr AllocHGlobal(int cb) { throw null; } public static System.IntPtr AllocHGlobal(System.IntPtr cb) { throw null; } public static bool AreComObjectsAvailableForCleanup() { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static object BindToMoniker(string monikerName) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static void ChangeWrapperHandleStrength(object otp, bool fIsWeak) { } public static void CleanupUnusedObjectsInCurrentContext() { } public static void Copy(byte[] source, int startIndex, System.IntPtr destination, int length) { } @@ -490,41 +490,41 @@ public static void Copy(System.IntPtr source, System.IntPtr[] destination, int s public static void Copy(System.IntPtr source, float[] destination, int startIndex, int length) { } public static void Copy(System.IntPtr[] source, int startIndex, System.IntPtr destination, int length) { } public static void Copy(float[] source, int startIndex, System.IntPtr destination, int length) { } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public static System.IntPtr CreateAggregatedObject(System.IntPtr pOuter, object o) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static System.IntPtr CreateAggregatedObject(System.IntPtr pOuter, T o) where T : notnull { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNullAttribute("o")] public static object? CreateWrapperOfType(object? o, System.Type t) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static TWrapper CreateWrapperOfType([System.Diagnostics.CodeAnalysis.AllowNullAttribute] T o) { throw null; } [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public static void DestroyStructure(System.IntPtr ptr, System.Type structuretype) { } public static void DestroyStructure(System.IntPtr ptr) { } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static int FinalReleaseComObject(object o) { throw null; } public static void FreeBSTR(System.IntPtr ptr) { } public static void FreeCoTaskMem(System.IntPtr ptr) { } public static void FreeHGlobal(System.IntPtr hglobal) { } public static System.Guid GenerateGuidForType(System.Type type) { throw null; } public static string? GenerateProgIdForType(System.Type type) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public static System.IntPtr GetComInterfaceForObject(object o, System.Type T) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public static System.IntPtr GetComInterfaceForObject(object o, System.Type T, System.Runtime.InteropServices.CustomQueryInterfaceMode mode) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static System.IntPtr GetComInterfaceForObject([System.Diagnostics.CodeAnalysis.DisallowNullAttribute] T o) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static object? GetComObjectData(object obj, object key) { throw null; } [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public static System.Delegate GetDelegateForFunctionPointer(System.IntPtr ptr, System.Type t) { throw null; } public static TDelegate GetDelegateForFunctionPointer(System.IntPtr ptr) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static int GetEndComSlot(System.Type t) { throw null; } [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.ObsoleteAttribute("GetExceptionCode() may be unavailable in future releases.")] @@ -538,41 +538,41 @@ public static void FreeHGlobal(System.IntPtr hglobal) { } public static System.IntPtr GetHINSTANCE(System.Reflection.Module m) { throw null; } public static int GetHRForException(System.Exception? e) { throw null; } public static int GetHRForLastWin32Error() { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static System.IntPtr GetIDispatchForObject(object o) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static System.IntPtr GetIUnknownForObject(object o) { throw null; } public static int GetLastWin32Error() { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public static void GetNativeVariantForObject(object? obj, System.IntPtr pDstNativeVariant) { } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public static void GetNativeVariantForObject([System.Diagnostics.CodeAnalysis.AllowNullAttribute] T obj, System.IntPtr pDstNativeVariant) { } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static object GetObjectForIUnknown(System.IntPtr pUnk) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public static object? GetObjectForNativeVariant(System.IntPtr pSrcNativeVariant) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [return: System.Diagnostics.CodeAnalysis.MaybeNullAttribute] public static T GetObjectForNativeVariant(System.IntPtr pSrcNativeVariant) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public static object?[] GetObjectsForNativeVariants(System.IntPtr aSrcNativeVariant, int cVars) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public static T[] GetObjectsForNativeVariants(System.IntPtr aSrcNativeVariant, int cVars) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static int GetStartComSlot(System.Type t) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static object GetTypedObjectForIUnknown(System.IntPtr pUnk, System.Type t) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static System.Type GetTypeFromCLSID(System.Guid clsid) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static string GetTypeInfoName(System.Runtime.InteropServices.ComTypes.ITypeInfo typeInfo) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static object GetUniqueObjectForIUnknown(System.IntPtr unknown) { throw null; } public static bool IsComObject(object o) { throw null; } public static bool IsTypeVisibleFromCom(System.Type t) { throw null; } @@ -597,7 +597,7 @@ public static void PtrToStructure(System.IntPtr ptr, object structure) { } [return: System.Diagnostics.CodeAnalysis.MaybeNullAttribute] public static T PtrToStructure(System.IntPtr ptr) { throw null; } public static void PtrToStructure(System.IntPtr ptr, [System.Diagnostics.CodeAnalysis.DisallowNullAttribute] T structure) { } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static int QueryInterface(System.IntPtr pUnk, ref System.Guid iid, out System.IntPtr ppv) { throw null; } public static byte ReadByte(System.IntPtr ptr) { throw null; } public static byte ReadByte(System.IntPtr ptr, int ofs) { throw null; } @@ -626,16 +626,16 @@ public static void PtrToStructure(System.IntPtr ptr, [System.Diagnostics.Code public static System.IntPtr ReadIntPtr(object ptr, int ofs) { throw null; } public static System.IntPtr ReAllocCoTaskMem(System.IntPtr pv, int cb) { throw null; } public static System.IntPtr ReAllocHGlobal(System.IntPtr pv, System.IntPtr cb) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static int Release(System.IntPtr pUnk) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static int ReleaseComObject(object o) { throw null; } public static System.IntPtr SecureStringToBSTR(System.Security.SecureString s) { throw null; } public static System.IntPtr SecureStringToCoTaskMemAnsi(System.Security.SecureString s) { throw null; } public static System.IntPtr SecureStringToCoTaskMemUnicode(System.Security.SecureString s) { throw null; } public static System.IntPtr SecureStringToGlobalAllocAnsi(System.Security.SecureString s) { throw null; } public static System.IntPtr SecureStringToGlobalAllocUnicode(System.Security.SecureString s) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static bool SetComObjectData(object obj, object key, object? data) { throw null; } [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public static int SizeOf(object structure) { throw null; } diff --git a/src/libraries/System.Security.Cryptography.Csp/ref/System.Security.Cryptography.Csp.cs b/src/libraries/System.Security.Cryptography.Csp/ref/System.Security.Cryptography.Csp.cs index ef1b0d7eb2b3d7..d7b4db18222598 100644 --- a/src/libraries/System.Security.Cryptography.Csp/ref/System.Security.Cryptography.Csp.cs +++ b/src/libraries/System.Security.Cryptography.Csp/ref/System.Security.Cryptography.Csp.cs @@ -27,7 +27,7 @@ protected override void Dispose(bool disposing) { } public override void GenerateIV() { } public override void GenerateKey() { } } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public sealed partial class CspKeyContainerInfo { public CspKeyContainerInfo(System.Security.Cryptography.CspParameters parameters) { } @@ -87,11 +87,11 @@ public sealed partial class DSACryptoServiceProvider : System.Security.Cryptogra { public DSACryptoServiceProvider() { } public DSACryptoServiceProvider(int dwKeySize) { } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public DSACryptoServiceProvider(int dwKeySize, System.Security.Cryptography.CspParameters? parameters) { } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public DSACryptoServiceProvider(System.Security.Cryptography.CspParameters? parameters) { } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public System.Security.Cryptography.CspKeyContainerInfo CspKeyContainerInfo { get { throw null; } } public override string? KeyExchangeAlgorithm { get { throw null; } } public override int KeySize { get { throw null; } } @@ -152,7 +152,7 @@ public PasswordDeriveBytes(string strPassword, byte[]? rgbSalt, string strHashNa public string HashName { get { throw null; } set { } } public int IterationCount { get { throw null; } set { } } public byte[]? Salt { get { throw null; } set { } } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public byte[] CryptDeriveKey(string? algname, string? alghashname, int keySize, byte[] rgbIV) { throw null; } protected override void Dispose(bool disposing) { } [System.ObsoleteAttribute("Rfc2898DeriveBytes replaces PasswordDeriveBytes for deriving key material from a password and is preferred in new applications.")] @@ -164,7 +164,7 @@ public sealed partial class RC2CryptoServiceProvider : System.Security.Cryptogra { public RC2CryptoServiceProvider() { } public override int EffectiveKeySize { get { throw null; } set { } } - public bool UseSalt { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] set { } } + public bool UseSalt { get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] set { } } public override System.Security.Cryptography.ICryptoTransform CreateDecryptor(byte[] rgbKey, byte[]? rgbIV) { throw null; } public override System.Security.Cryptography.ICryptoTransform CreateEncryptor(byte[] rgbKey, byte[]? rgbIV) { throw null; } public override void GenerateIV() { } @@ -188,11 +188,11 @@ public sealed partial class RSACryptoServiceProvider : System.Security.Cryptogra { public RSACryptoServiceProvider() { } public RSACryptoServiceProvider(int dwKeySize) { } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public RSACryptoServiceProvider(int dwKeySize, System.Security.Cryptography.CspParameters? parameters) { } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public RSACryptoServiceProvider(System.Security.Cryptography.CspParameters? parameters) { } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public System.Security.Cryptography.CspKeyContainerInfo CspKeyContainerInfo { get { throw null; } } public override string? KeyExchangeAlgorithm { get { throw null; } } public override int KeySize { get { throw null; } } diff --git a/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/CspKeyContainerInfo.Unix.cs b/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/CspKeyContainerInfo.Unix.cs index 4ae3494de72029..553634120b657f 100644 --- a/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/CspKeyContainerInfo.Unix.cs +++ b/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/CspKeyContainerInfo.Unix.cs @@ -5,7 +5,7 @@ namespace System.Security.Cryptography { - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public sealed class CspKeyContainerInfo { public CspKeyContainerInfo(CspParameters parameters) { throw GetPlatformNotSupported(); } diff --git a/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/CspKeyContainerInfo.Windows.cs b/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/CspKeyContainerInfo.Windows.cs index c707007cb931aa..ce73894fb36e0c 100644 --- a/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/CspKeyContainerInfo.Windows.cs +++ b/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/CspKeyContainerInfo.Windows.cs @@ -7,7 +7,7 @@ namespace System.Security.Cryptography { - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public sealed class CspKeyContainerInfo { private readonly CspParameters _parameters; diff --git a/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/DSACryptoServiceProvider.Unix.cs b/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/DSACryptoServiceProvider.Unix.cs index 0c324e1f5916d6..575055f336116f 100644 --- a/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/DSACryptoServiceProvider.Unix.cs +++ b/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/DSACryptoServiceProvider.Unix.cs @@ -38,13 +38,13 @@ public DSACryptoServiceProvider(int dwKeySize) : base() KeySize = dwKeySize; } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public DSACryptoServiceProvider(int dwKeySize, CspParameters parameters) { throw new PlatformNotSupportedException(SR.Format(SR.Cryptography_CAPI_Required, nameof(CspParameters))); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public DSACryptoServiceProvider(CspParameters parameters) { throw new PlatformNotSupportedException(SR.Format(SR.Cryptography_CAPI_Required, nameof(CspParameters))); @@ -56,7 +56,7 @@ public DSACryptoServiceProvider(CspParameters parameters) public override bool TryCreateSignature(ReadOnlySpan hash, Span destination, out int bytesWritten) => _impl.TryCreateSignature(hash, destination, out bytesWritten); - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public CspKeyContainerInfo CspKeyContainerInfo { get { throw new PlatformNotSupportedException(SR.Format(SR.Cryptography_CAPI_Required, nameof(CspKeyContainerInfo))); } diff --git a/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/DSACryptoServiceProvider.Windows.cs b/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/DSACryptoServiceProvider.Windows.cs index ef5d6f544a2826..186f9c80100c5f 100644 --- a/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/DSACryptoServiceProvider.Windows.cs +++ b/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/DSACryptoServiceProvider.Windows.cs @@ -50,7 +50,7 @@ public DSACryptoServiceProvider(int dwKeySize) /// for the cryptographic service provider (CSP). /// /// The parameters for the CSP. - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public DSACryptoServiceProvider(CspParameters? parameters) : this(0, parameters) { @@ -63,7 +63,7 @@ public DSACryptoServiceProvider(CspParameters? parameters) /// The size of the key for the cryptographic algorithm in bits. /// The parameters for the CSP. [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA5350", Justification = "SHA1 is required by the FIPS 186-2 DSA spec.")] - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public DSACryptoServiceProvider(int dwKeySize, CspParameters? parameters) { if (dwKeySize < 0) @@ -185,7 +185,7 @@ private SafeKeyHandle SafeKeyHandle /// /// Gets a CspKeyContainerInfo object that describes additional information about a cryptographic key pair. /// - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public CspKeyContainerInfo CspKeyContainerInfo { get diff --git a/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/PasswordDeriveBytes.Unix.cs b/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/PasswordDeriveBytes.Unix.cs index 777b1d6e7ccb22..62f31ccafb96fe 100644 --- a/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/PasswordDeriveBytes.Unix.cs +++ b/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/PasswordDeriveBytes.Unix.cs @@ -7,7 +7,7 @@ namespace System.Security.Cryptography { public partial class PasswordDeriveBytes : DeriveBytes { - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public byte[] CryptDeriveKey(string? algname, string? alghashname, int keySize, byte[] rgbIV) { throw new PlatformNotSupportedException(SR.Format(SR.Cryptography_CAPI_Required, nameof(CryptDeriveKey))); diff --git a/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/PasswordDeriveBytes.Windows.cs b/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/PasswordDeriveBytes.Windows.cs index 41d8e23454cf4f..c516653016400e 100644 --- a/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/PasswordDeriveBytes.Windows.cs +++ b/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/PasswordDeriveBytes.Windows.cs @@ -12,7 +12,7 @@ public partial class PasswordDeriveBytes : DeriveBytes { private SafeProvHandle? _safeProvHandle; - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public byte[] CryptDeriveKey(string? algname, string? alghashname, int keySize, byte[] rgbIV) { if (keySize < 0) diff --git a/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/RC2CryptoServiceProvider.Unix.cs b/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/RC2CryptoServiceProvider.Unix.cs index 559bd964790468..4aeb4ec3c607be 100644 --- a/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/RC2CryptoServiceProvider.Unix.cs +++ b/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/RC2CryptoServiceProvider.Unix.cs @@ -104,7 +104,7 @@ public override PaddingMode Padding public bool UseSalt { get { return false; } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] set { // Don't allow a true value diff --git a/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/RC2CryptoServiceProvider.Windows.cs b/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/RC2CryptoServiceProvider.Windows.cs index 1118b136bfc185..d4760f31946e9f 100644 --- a/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/RC2CryptoServiceProvider.Windows.cs +++ b/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/RC2CryptoServiceProvider.Windows.cs @@ -44,7 +44,7 @@ public bool UseSalt { return _use40bitSalt; } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] set { _use40bitSalt = value; diff --git a/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/RSACryptoServiceProvider.Unix.cs b/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/RSACryptoServiceProvider.Unix.cs index d44478f7177fd8..168a456800e5bc 100644 --- a/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/RSACryptoServiceProvider.Unix.cs +++ b/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/RSACryptoServiceProvider.Unix.cs @@ -27,15 +27,15 @@ public RSACryptoServiceProvider(int dwKeySize) _impl = RSA.Create(dwKeySize); } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public RSACryptoServiceProvider(int dwKeySize, CspParameters parameters) => throw new PlatformNotSupportedException(SR.Format(SR.Cryptography_CAPI_Required, nameof(CspParameters))); - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public RSACryptoServiceProvider(CspParameters parameters) => throw new PlatformNotSupportedException(SR.Format(SR.Cryptography_CAPI_Required, nameof(CspParameters))); - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public CspKeyContainerInfo CspKeyContainerInfo => throw new PlatformNotSupportedException(SR.Format(SR.Cryptography_CAPI_Required, nameof(CspKeyContainerInfo))); diff --git a/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/RSACryptoServiceProvider.Windows.cs b/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/RSACryptoServiceProvider.Windows.cs index f3a6586ee43412..6843a3aa30fca2 100644 --- a/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/RSACryptoServiceProvider.Windows.cs +++ b/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/RSACryptoServiceProvider.Windows.cs @@ -40,13 +40,13 @@ public RSACryptoServiceProvider(int dwKeySize) { } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public RSACryptoServiceProvider(int dwKeySize, CspParameters? parameters) : this(dwKeySize, parameters, false) { } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public RSACryptoServiceProvider(CspParameters? parameters) : this(0, parameters, true) { @@ -174,7 +174,7 @@ private SafeKeyHandle SafeKeyHandle /// /// CspKeyContainerInfo property /// - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public CspKeyContainerInfo CspKeyContainerInfo { get diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.cs b/src/libraries/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.cs index a0256d2581af14..411c729bf0df8c 100644 --- a/src/libraries/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.cs +++ b/src/libraries/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.cs @@ -332,7 +332,7 @@ public partial class X509Chain : System.IDisposable { public X509Chain() { } public X509Chain(bool useMachineContext) { } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public X509Chain(System.IntPtr chainContext) { } public System.IntPtr ChainContext { get { throw null; } } public System.Security.Cryptography.X509Certificates.X509ChainElementCollection ChainElements { get { throw null; } } diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/src/System/Security/Cryptography/X509Certificates/X509Chain.cs b/src/libraries/System.Security.Cryptography.X509Certificates/src/System/Security/Cryptography/X509Certificates/X509Chain.cs index 348ed9249aaa53..dbefadab573347 100644 --- a/src/libraries/System.Security.Cryptography.X509Certificates/src/System/Security/Cryptography/X509Certificates/X509Chain.cs +++ b/src/libraries/System.Security.Cryptography.X509Certificates/src/System/Security/Cryptography/X509Certificates/X509Chain.cs @@ -24,7 +24,7 @@ public X509Chain(bool useMachineContext) _useMachineContext = useMachineContext; } - [SupportedOSPlatform("windows7.0")] + [SupportedOSPlatform("windows")] public X509Chain(IntPtr chainContext) { _pal = ChainPal.FromHandle(chainContext); diff --git a/src/libraries/System.Threading.Thread/ref/System.Threading.Thread.cs b/src/libraries/System.Threading.Thread/ref/System.Threading.Thread.cs index 294f9592e819a1..3fe3aea58faf75 100644 --- a/src/libraries/System.Threading.Thread/ref/System.Threading.Thread.cs +++ b/src/libraries/System.Threading.Thread/ref/System.Threading.Thread.cs @@ -80,7 +80,7 @@ public static void MemoryBarrier() { } public static void ResetAbort() { } [System.ObsoleteAttribute("Thread.Resume has been deprecated. Please use other classes in System.Threading, such as Monitor, Mutex, Event, and Semaphore, to synchronize Threads or protect resources. https://go.microsoft.com/fwlink/?linkid=14202", false)] public void Resume() { } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public void SetApartmentState(System.Threading.ApartmentState state) { } [System.ObsoleteAttribute("Thread.SetCompressedStack is no longer supported. Please use the System.Threading.CompressedStack class")] public void SetCompressedStack(System.Threading.CompressedStack stack) { } diff --git a/src/libraries/System.Threading/ref/System.Threading.cs b/src/libraries/System.Threading/ref/System.Threading.cs index ac1c98dd4d57a5..d5fceaafaf6097 100644 --- a/src/libraries/System.Threading/ref/System.Threading.cs +++ b/src/libraries/System.Threading/ref/System.Threading.cs @@ -115,11 +115,11 @@ public partial class EventWaitHandle : System.Threading.WaitHandle public EventWaitHandle(bool initialState, System.Threading.EventResetMode mode) { } public EventWaitHandle(bool initialState, System.Threading.EventResetMode mode, string? name) { } public EventWaitHandle(bool initialState, System.Threading.EventResetMode mode, string? name, out bool createdNew) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static System.Threading.EventWaitHandle OpenExisting(string name) { throw null; } public bool Reset() { throw null; } public bool Set() { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static bool TryOpenExisting(string name, [System.Diagnostics.CodeAnalysis.NotNullWhenAttribute(true)] out System.Threading.EventWaitHandle? result) { throw null; } } public sealed partial class ExecutionContext : System.IDisposable, System.Runtime.Serialization.ISerializable @@ -350,11 +350,11 @@ public sealed partial class Semaphore : System.Threading.WaitHandle public Semaphore(int initialCount, int maximumCount) { } public Semaphore(int initialCount, int maximumCount, string? name) { } public Semaphore(int initialCount, int maximumCount, string? name, out bool createdNew) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static System.Threading.Semaphore OpenExisting(string name) { throw null; } public int Release() { throw null; } public int Release(int releaseCount) { throw null; } - [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows7.0")] + [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] public static bool TryOpenExisting(string name, [System.Diagnostics.CodeAnalysis.NotNullWhenAttribute(true)] out System.Threading.Semaphore? result) { throw null; } } public partial class SemaphoreFullException : System.SystemException