Merge pull request #1888 from SixLabors/js/drop-ns-1-3

Remove netstandard 1.3 target
SixLabors · Dec 13, 2021 · 53456a5 · 53456a5
2 parents ae7b995 + 436b8a0
commit 53456a5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ ImageSharp is a new, fully featured, fully managed, cross-platform, 2D graphics
 
 ImageSharp is designed from the ground up to be flexible and extensible. The library provides API endpoints for common image processing operations and the building blocks to allow for the development of additional operations.
 
-Built against [.NET Standard 1.3](https://docs.microsoft.com/en-us/dotnet/standard/net-standard), ImageSharp can be used in device, cloud, and embedded/IoT scenarios.
+Built against [.NET Standard 2.0](https://docs.microsoft.com/en-us/dotnet/standard/net-standard), ImageSharp can be used in device, cloud, and embedded/IoT scenarios.
 
 
 ## License

diff --git a/src/ImageSharp/Common/Helpers/Guard.cs b/src/ImageSharp/Common/Helpers/Guard.cs
@@ -2,9 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-#if NETSTANDARD1_3
-using System.Reflection;
-#endif
 using System.Runtime.CompilerServices;
 using SixLabors.ImageSharp;
 
@@ -22,11 +19,7 @@ internal static partial class Guard
         [MethodImpl(InliningOptions.ShortMethod)]
         public static void MustBeValueType<TValue>(TValue value, string parameterName)
         {
-            if (value.GetType()
-#if NETSTANDARD1_3
-                .GetTypeInfo()
-#endif
-                .IsValueType)
+            if (value.GetType().IsValueType)
             {
                 return;
             }

diff --git a/src/ImageSharp/Formats/Tiff/Compression/Compressors/DeflateCompressor.cs b/src/ImageSharp/Formats/Tiff/Compression/Compressors/DeflateCompressor.cs
@@ -43,15 +43,8 @@ public override void CompressStrip(Span<byte> rows, int height)
             }
 
             int size = (int)this.memoryStream.Position;
-
-#if !NETSTANDARD1_3
             byte[] buffer = this.memoryStream.GetBuffer();
             this.Output.Write(buffer, 0, size);
-#else
-            this.memoryStream.SetLength(size);
-            this.memoryStream.Position = 0;
-            this.memoryStream.CopyTo(this.Output);
-#endif
         }
 
         /// <inheritdoc/>

diff --git a/src/ImageSharp/ImageSharp.csproj b/src/ImageSharp/ImageSharp.csproj
@@ -23,12 +23,12 @@
   <Choose>
     <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
       <PropertyGroup>
-        <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netcoreapp2.1;netstandard2.1;netstandard2.0;netstandard1.3;net472</TargetFrameworks>
+        <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netcoreapp2.1;netstandard2.1;netstandard2.0;net472</TargetFrameworks>
       </PropertyGroup>
     </When>
     <When Condition="$(SIXLABORS_TESTING) == true">
       <PropertyGroup>
-        <TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1;netstandard2.1;netstandard2.0;netstandard1.3;net472</TargetFrameworks>
+        <TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1;netstandard2.1;netstandard2.0;net472</TargetFrameworks>
       </PropertyGroup>
     </When>
     <When Condition="$(Configuration.EndsWith('InnerLoop')) == true">
@@ -38,7 +38,7 @@
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;netcoreapp2.1;netstandard2.1;netstandard2.0;netstandard1.3;net472</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;netcoreapp2.1;netstandard2.1;netstandard2.0;net472</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>