From e4776bc4f1d074b4d037b87018e074389f044457 Mon Sep 17 00:00:00 2001 From: Claire Novotny Date: Tue, 25 Aug 2020 21:38:42 -0400 Subject: [PATCH 1/3] Set min ver attribute --- OSVersionHelper/WindowsVersionHelper.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OSVersionHelper/WindowsVersionHelper.cs b/OSVersionHelper/WindowsVersionHelper.cs index ed7f910..d7b07df 100644 --- a/OSVersionHelper/WindowsVersionHelper.cs +++ b/OSVersionHelper/WindowsVersionHelper.cs @@ -12,6 +12,11 @@ using Windows.Foundation.Metadata; using Windows.Security.EnterpriseData; + +#if WINDOWS10_0_19041 +[assembly: SupportedOSPlatform("windows")] +#endif + namespace OSVersionHelper { public static class WindowsVersionHelper From 89efa281fcbd1af2736934ecd8cefa70351c82cd Mon Sep 17 00:00:00 2001 From: Claire Novotny Date: Mon, 14 Sep 2020 15:53:45 -0400 Subject: [PATCH 2/3] Add 20H02 --- OSVersionHelper/Windows10Release.cs | 9 +++++++-- OSVersionHelper/WindowsVersionHelper.cs | 11 ++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/OSVersionHelper/Windows10Release.cs b/OSVersionHelper/Windows10Release.cs index 1210ec2..70517a3 100644 --- a/OSVersionHelper/Windows10Release.cs +++ b/OSVersionHelper/Windows10Release.cs @@ -61,7 +61,12 @@ public enum Windows10Release /// /// 10.0.19041.0 (20H01) /// - May2020 = 2004 - + May2020 = 2004, + + /// + /// 10.0.19042.0 (20H02) + /// + September2020 = 2009 + } } diff --git a/OSVersionHelper/WindowsVersionHelper.cs b/OSVersionHelper/WindowsVersionHelper.cs index d7b07df..f7afef1 100644 --- a/OSVersionHelper/WindowsVersionHelper.cs +++ b/OSVersionHelper/WindowsVersionHelper.cs @@ -28,7 +28,10 @@ static WindowsVersionHelper() { if (IsSince(WindowsVersions.Win10)) { - if (IsApiContractPresent(10)) + if (IsApiContractPresent(11)) + { + Windows10Release = Windows10Release.September2020; + } else if (IsApiContractPresent(10)) { Windows10Release = Windows10Release.May2020; } @@ -81,6 +84,12 @@ static WindowsVersionHelper() public static bool IsWindows10 { get; } = IsWindowsNt && IsSince(WindowsVersions.Win10); + + /// + /// Gets a value indicating whether the current OS is Windows 10 September 2020 Update (20H02) or greater + /// + public static bool IsWindows10September2020OrGreater => IsWindows10 && Windows10Release >= Windows10Release.September2020; + /// /// Gets a value indicating whether the current OS is Windows 10 May 2020 Update (20H01) or greater /// From 2385c4e51bdbce2bd9836aa12c9147a5658ad5aa Mon Sep 17 00:00:00 2001 From: Claire Novotny Date: Tue, 15 Sep 2020 08:00:52 -0400 Subject: [PATCH 3/3] Ensure attrib is used --- OSVersionHelper/WindowsVersionHelper.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OSVersionHelper/WindowsVersionHelper.cs b/OSVersionHelper/WindowsVersionHelper.cs index f7afef1..8d80cd0 100644 --- a/OSVersionHelper/WindowsVersionHelper.cs +++ b/OSVersionHelper/WindowsVersionHelper.cs @@ -13,7 +13,8 @@ using Windows.Security.EnterpriseData; -#if WINDOWS10_0_19041 +#if NET5_0 +using System.Runtime.Versioning; [assembly: SupportedOSPlatform("windows")] #endif