Browse Source
Merge pull request #1888 from SixLabors/js/drop-ns-1-3
Remove netstandard 1.3 target
pull/1892/head
James Jackson-South
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
5 additions and
19 deletions
README.md
src/ImageSharp/Common/Helpers/Guard.cs
src/ImageSharp/Formats/Tiff/Compression/Compressors/DeflateCompressor.cs
src/ImageSharp/ImageSharp.csproj
@ -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.
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
## License
@ -2,9 +2,6 @@
// Licensed under the Apache License, Version 2.0.
// Licensed under the Apache License, Version 2.0.
using System ;
using System ;
#if NETSTANDARD1_3
using System.Reflection ;
#endif
using System.Runtime.CompilerServices ;
using System.Runtime.CompilerServices ;
using SixLabors.ImageSharp ;
using SixLabors.ImageSharp ;
@ -22,11 +19,7 @@ namespace SixLabors
[MethodImpl(InliningOptions.ShortMethod)]
[MethodImpl(InliningOptions.ShortMethod)]
public static void MustBeValueType < TValue > ( TValue value , string parameterName )
public static void MustBeValueType < TValue > ( TValue value , string parameterName )
{
{
if ( value . GetType ( )
if ( value . GetType ( ) . IsValueType )
#if NETSTANDARD1_3
. GetTypeInfo ( )
#endif
. IsValueType )
{
{
return ;
return ;
}
}
@ -43,15 +43,8 @@ namespace SixLabors.ImageSharp.Formats.Tiff.Compression.Compressors
}
}
int size = ( int ) this . memoryStream . Position ;
int size = ( int ) this . memoryStream . Position ;
#if !NETSTANDARD1_3
byte [ ] buffer = this . memoryStream . GetBuffer ( ) ;
byte [ ] buffer = this . memoryStream . GetBuffer ( ) ;
this . Output . Write ( buffer , 0 , size ) ;
this . Output . Write ( buffer , 0 , size ) ;
#else
this . memoryStream . SetLength ( size ) ;
this . memoryStream . Position = 0 ;
this . memoryStream . CopyTo ( this . Output ) ;
#endif
}
}
/// <inheritdoc/>
/// <inheritdoc/>
@ -23,12 +23,12 @@
<Choose>
<Choose>
<When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
<When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
<PropertyGroup>
<PropertyGroup>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netcoreapp2.1;netstandard2.1;netstandard2.0;netstandard1.3;net 472</TargetFrameworks>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netcoreapp2.1;netstandard2.1;netstandard2.0;net472</TargetFrameworks>
</PropertyGroup>
</PropertyGroup>
</When>
</When>
<When Condition="$(SIXLABORS_TESTING) == true">
<When Condition="$(SIXLABORS_TESTING) == true">
<PropertyGroup>
<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1;netstandard2.1;netstandard2.0;netstandard1.3;net 472</TargetFrameworks>
<TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1;netstandard2.1;netstandard2.0;net472</TargetFrameworks>
</PropertyGroup>
</PropertyGroup>
</When>
</When>
<When Condition="$(Configuration.EndsWith('InnerLoop')) == true">
<When Condition="$(Configuration.EndsWith('InnerLoop')) == true">
@ -38,7 +38,7 @@
</When>
</When>
<Otherwise>
<Otherwise>
<PropertyGroup>
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;netcoreapp2.1;netstandard2.1;netstandard2.0;netstandard1.3;net 472</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;netcoreapp2.1;netstandard2.1;netstandard2.0;net472</TargetFrameworks>
</PropertyGroup>
</PropertyGroup>
</Otherwise>
</Otherwise>
</Choose>
</Choose>