NetStandard 1.3 support

chubrik · chubrik · commit 531697ac2905 · 2022-04-20T23:10:12.000+04:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <NetTargetFrameworks>net6.0;net5.0;netstandard2.0</NetTargetFrameworks>
+    <NetTargetFrameworks>net6.0;net5.0;netstandard2.0;netstandard1.3</NetTargetFrameworks>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/XConsole.Demo/Program.cs b/XConsole.Demo/Program.cs
@@ -1,4 +1,8 @@
-﻿namespace Demo
+﻿#if NET5_0
+#pragma warning disable CA1416 // Validate platform compatibility
+#endif
+
+namespace Demo
 {
     using Console = XConsole;
 
@@ -37,7 +41,11 @@ public static async Task Main()
 
             //Console.SetCursorPosition(0, 8950);
 
+#if !NETSTANDARD1_3
             var sysFolder = new DirectoryInfo(Environment.GetFolderPath(Environment.SpecialFolder.System));
+#else
+            var sysFolder = new DirectoryInfo(@"C:\Windows\System32");
+#endif
             var files = sysFolder.GetFiles("*.exe");
             var fileIndex = 0;
             Console.Pin(() => new[] { "m`This is pin!\n", $"g`Number of files: ", $"W`{fileIndex}" });
diff --git a/XConsole/XConsole.cs b/XConsole/XConsole.cs
@@ -3,6 +3,10 @@
 using System.IO;
 using System.Text;
 
+#if NETSTANDARD
+#pragma warning disable CS8604 // Possible null reference argument.
+#endif
+
 namespace System
 {
 #if !NETSTANDARD
@@ -1087,15 +1091,21 @@ public static void MoveBufferArea(
 
         public static Stream OpenStandardError() => Console.OpenStandardError();
 
+#if !NETSTANDARD1_3
         public static Stream OpenStandardError(int bufferSize) => Console.OpenStandardError(bufferSize: bufferSize);
+#endif
 
         public static Stream OpenStandardInput() => Console.OpenStandardInput();
 
+#if !NETSTANDARD1_3
         public static Stream OpenStandardInput(int bufferSize) => Console.OpenStandardInput(bufferSize: bufferSize);
+#endif
 
         public static Stream OpenStandardOutput() => Console.OpenStandardOutput();
 
+#if !NETSTANDARD1_3
         public static Stream OpenStandardOutput(int bufferSize) => Console.OpenStandardOutput(bufferSize: bufferSize);
+#endif
 
         public static int Read()
         {
diff --git a/XConsole/XConsole.csproj b/XConsole/XConsole.csproj
@@ -22,4 +22,8 @@
     <None Include="..\README.md" Link="Pack\README.md" Pack="true" PackagePath="" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+  </ItemGroup>
+
 </Project>
diff --git a/XConsole/XConsolePosition.cs b/XConsole/XConsolePosition.cs
@@ -1,5 +1,13 @@
 ﻿namespace System
 {
+#if !NETSTANDARD
+    using System.Runtime.Versioning;
+    [SupportedOSPlatform("windows")]
+    [UnsupportedOSPlatform("android")]
+    [UnsupportedOSPlatform("browser")]
+    [UnsupportedOSPlatform("ios")]
+    [UnsupportedOSPlatform("tvos")]
+#endif
     public struct XConsolePosition
     {
         public readonly int Left;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,13 @@`
`1`	`1`	`namespace System`
`2`	`2`	`{`
	`3`	`+#if !NETSTANDARD`
	`4`	`+ using System.Runtime.Versioning;`
	`5`	`+ [SupportedOSPlatform("windows")]`
	`6`	`+ [UnsupportedOSPlatform("android")]`
	`7`	`+ [UnsupportedOSPlatform("browser")]`
	`8`	`+ [UnsupportedOSPlatform("ios")]`
	`9`	`+ [UnsupportedOSPlatform("tvos")]`
	`10`	`+#endif`
`3`	`11`	`public struct XConsolePosition`
`4`	`12`	`{`
`5`	`13`	`public readonly int Left;`