tk/spectre.console
1
0
Fork 0
mirror of https://github.com/nsnail/spectre.console.git synced 2025-06-19 13:28:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Future-proof conditional compilation

Browse Source 
* Invert `#if NET5_0` conditions so that when adding net6.0 target framework, the _new_ APIs are used.
* Use `NET5_0_OR_GREATER` instead of `NET5_0` to ensure consistent behaviour on future target frameworks.
This commit is contained in:
Cédric Luthi
2021-09-29 09:40:58 +02:00
committed by Patrik Svensson
parent 644fb76d61
commit a5716a35e2
5 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Spectre.Console/Internal/Backends/Ansi/AnsiLinkHasher.cs
View File

@ -32,10 +32,10 @@ namespace Spectre.Console
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static int GetLinkHashCode(string link)
{
#if NET5_0
return link.GetHashCode(StringComparison.Ordinal);
#else
#if NETSTANDARD2_0
return link.GetHashCode();
#else
return link.GetHashCode(StringComparison.Ordinal);
#endif
}
}

13
src/Spectre.Console/Internal/Colors/ColorSystemDetector.cs
View File

@ -1,10 +1,6 @@
using System;
using System.Runtime.InteropServices;
#if !NET5_0
using System.Text.RegularExpressions;
#endif
namespace Spectre.Console
{
internal static class ColorSystemDetector
@ -61,7 +57,6 @@ namespace Spectre.Console
return ColorSystem.EightBit;
}
// See https://docs.microsoft.com/en-us/dotnet/core/compatibility/core-libraries/5.0/environment-osversion-returns-correct-version
private static bool GetWindowsVersionInformation(out int major, out int build)
{
major = 0;
@ -72,15 +67,15 @@ namespace Spectre.Console
return false;
}
#if NET5_0
// The reason we're not always using this, is because it
// will return wrong values on other runtimes than net5.0
#if NET5_0_OR_GREATER
// The reason we're not always using this, is because it will return wrong values on other runtimes than .NET 5+
// See https://docs.microsoft.com/en-us/dotnet/core/compatibility/core-libraries/5.0/environment-osversion-returns-correct-version
var version = Environment.OSVersion.Version;
major = version.Major;
build = version.Build;
return true;
#else
var regex = new Regex("Microsoft Windows (?'major'[0-9]*).(?'minor'[0-9]*).(?'build'[0-9]*)\\s*$");
var regex = new System.Text.RegularExpressions.Regex("Microsoft Windows (?'major'[0-9]*).(?'minor'[0-9]*).(?'build'[0-9]*)\\s*$");
var match = regex.Match(RuntimeInformation.OSDescription);
if (match.Success && int.TryParse(match.Groups["major"].Value, out major))
{