diff --git a/src/ImageSharp/Common/Extensions/EncoderExtensions.cs b/src/ImageSharp/Common/Extensions/EncoderExtensions.cs
index e6b800e86a..82899863c9 100644
--- a/src/ImageSharp/Common/Extensions/EncoderExtensions.cs
+++ b/src/ImageSharp/Common/Extensions/EncoderExtensions.cs
@@ -20,14 +20,10 @@ namespace SixLabors.ImageSharp
/// The string.
public static string GetString(this Encoding encoding, ReadOnlySpan buffer)
{
-#if NETSTANDARD1_1
- return encoding.GetString(buffer.ToArray());
-#else
fixed (byte* bytes = buffer)
{
return encoding.GetString(bytes, buffer.Length);
}
-#endif
}
}
}
diff --git a/src/ImageSharp/Common/Helpers/TestHelpers.cs b/src/ImageSharp/Common/Helpers/TestHelpers.cs
index 14e5835b49..45ef7706dd 100644
--- a/src/ImageSharp/Common/Helpers/TestHelpers.cs
+++ b/src/ImageSharp/Common/Helpers/TestHelpers.cs
@@ -13,9 +13,7 @@ namespace SixLabors.ImageSharp.Common.Helpers
/// Only intended to be used in tests!
///
internal const string ImageSharpBuiltAgainst =
-#if NETSTANDARD1_1
- "netstandard1.1";
-#elif NETCOREAPP2_1
+#if NETCOREAPP2_1
"netcoreapp2.1";
#else
"netstandard2.0";
diff --git a/src/ImageSharp/Configuration.cs b/src/ImageSharp/Configuration.cs
index 576f7bf3d0..c0064d1877 100644
--- a/src/ImageSharp/Configuration.cs
+++ b/src/ImageSharp/Configuration.cs
@@ -3,15 +3,12 @@
using System;
using System.Collections.Generic;
-using System.Threading.Tasks;
using SixLabors.ImageSharp.Formats;
using SixLabors.ImageSharp.Formats.Bmp;
using SixLabors.ImageSharp.Formats.Gif;
using SixLabors.ImageSharp.Formats.Jpeg;
using SixLabors.ImageSharp.Formats.Png;
-#if !NETSTANDARD1_1
using SixLabors.ImageSharp.IO;
-#endif
using SixLabors.ImageSharp.Processing;
using SixLabors.Memory;
@@ -100,12 +97,10 @@ namespace SixLabors.ImageSharp
///
internal int MaxHeaderSize => this.ImageFormatsManager.MaxHeaderSize;
-#if !NETSTANDARD1_1
///
/// Gets or sets the filesystem helper for accessing the local file system.
///
internal IFileSystem FileSystem { get; set; } = new LocalFileSystem();
-#endif
///
/// Gets or sets the image operations provider factory.
@@ -135,10 +130,7 @@ namespace SixLabors.ImageSharp
MemoryAllocator = this.MemoryAllocator,
ImageOperationsProvider = this.ImageOperationsProvider,
ReadOrigin = this.ReadOrigin,
-
-#if !NETSTANDARD1_1
FileSystem = this.FileSystem
-#endif
};
}
diff --git a/src/ImageSharp/IO/IFileSystem.cs b/src/ImageSharp/IO/IFileSystem.cs
index 088d4abb8b..593c760fcf 100644
--- a/src/ImageSharp/IO/IFileSystem.cs
+++ b/src/ImageSharp/IO/IFileSystem.cs
@@ -5,7 +5,6 @@ using System.IO;
namespace SixLabors.ImageSharp.IO
{
- #if !NETSTANDARD1_1
///
/// A simple interface representing the filesystem.
///
@@ -25,5 +24,4 @@ namespace SixLabors.ImageSharp.IO
/// A stream representing the file to open.
Stream Create(string path);
}
-#endif
}
diff --git a/src/ImageSharp/IO/LocalFileSystem.cs b/src/ImageSharp/IO/LocalFileSystem.cs
index 204f5f4e1e..dc5901ff92 100644
--- a/src/ImageSharp/IO/LocalFileSystem.cs
+++ b/src/ImageSharp/IO/LocalFileSystem.cs
@@ -1,30 +1,19 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-using System;
-using System.Collections.Generic;
using System.IO;
-using System.Text;
namespace SixLabors.ImageSharp.IO
{
- #if !NETSTANDARD1_1
///
/// A wrapper around the local File apis.
///
internal class LocalFileSystem : IFileSystem
{
///
- public Stream OpenRead(string path)
- {
- return File.OpenRead(path);
- }
+ public Stream OpenRead(string path) => File.OpenRead(path);
///
- public Stream Create(string path)
- {
- return File.Create(path);
- }
+ public Stream Create(string path) => File.Create(path);
}
-#endif
-}
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Image.FromBytes.cs b/src/ImageSharp/Image.FromBytes.cs
index 12abf720bd..07adc03ff6 100644
--- a/src/ImageSharp/Image.FromBytes.cs
+++ b/src/ImageSharp/Image.FromBytes.cs
@@ -174,8 +174,6 @@ namespace SixLabors.ImageSharp
}
}
-#if !NETSTANDARD1_1
-
///
/// By reading the header on the provided byte array this calculates the images format.
///
@@ -303,6 +301,5 @@ namespace SixLabors.ImageSharp
}
}
}
-#endif
}
}
\ No newline at end of file
diff --git a/src/ImageSharp/Image.FromFile.cs b/src/ImageSharp/Image.FromFile.cs
index ad8f3426f2..b13cef4824 100644
--- a/src/ImageSharp/Image.FromFile.cs
+++ b/src/ImageSharp/Image.FromFile.cs
@@ -1,7 +1,6 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-#if !NETSTANDARD1_1
using System;
using System.IO;
using SixLabors.ImageSharp.Formats;
@@ -212,5 +211,4 @@ namespace SixLabors.ImageSharp
}
}
}
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/ImageSharp/ImageExtensions.cs b/src/ImageSharp/ImageExtensions.cs
index bf312cb6f5..e579bec1a6 100644
--- a/src/ImageSharp/ImageExtensions.cs
+++ b/src/ImageSharp/ImageExtensions.cs
@@ -4,7 +4,6 @@
using System;
using System.Collections.Generic;
using System.IO;
-using System.Runtime.InteropServices;
using System.Text;
using SixLabors.ImageSharp.Advanced;
using SixLabors.ImageSharp.Formats;
@@ -17,7 +16,6 @@ namespace SixLabors.ImageSharp
///
public static partial class ImageExtensions
{
-#if !NETSTANDARD1_1
///
/// Writes the image to the given stream using the currently loaded image format.
///
@@ -78,7 +76,6 @@ namespace SixLabors.ImageSharp
source.Save(fs, encoder);
}
}
-#endif
///
/// Writes the image to the given stream using the currently loaded image format.
diff --git a/src/ImageSharp/ImageSharp.csproj b/src/ImageSharp/ImageSharp.csproj
index a7ca0a014c..83b2b12604 100644
--- a/src/ImageSharp/ImageSharp.csproj
+++ b/src/ImageSharp/ImageSharp.csproj
@@ -5,7 +5,7 @@
$(packageversion)
0.0.1
Six Labors and contributors
- netstandard1.1;netstandard1.3;netstandard2.0;netcoreapp2.1
+ netstandard1.3;netstandard2.0;netcoreapp2.1
true
true
SixLabors.ImageSharp
@@ -47,7 +47,7 @@
-
+
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/IccProfile.cs b/src/ImageSharp/MetaData/Profiles/ICC/IccProfile.cs
index 44990b7ecc..72665bc69c 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/IccProfile.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/IccProfile.cs
@@ -3,10 +3,7 @@
using System;
using System.Collections.Generic;
-
-#if !NETSTANDARD1_1
using System.Security.Cryptography;
-#endif
namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
{
@@ -100,8 +97,6 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
///
public IccProfile DeepClone() => new IccProfile(this);
-#if !NETSTANDARD1_1
-
///
/// Calculates the MD5 hash value of an ICC profile
///
@@ -147,8 +142,6 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
}
}
-#endif
-
///
/// Checks for signs of a corrupt profile.
///
@@ -227,4 +220,4 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
this.entries = new List(reader.ReadTagData(this.data));
}
}
-}
+}
\ No newline at end of file
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/IccWriter.cs b/src/ImageSharp/MetaData/Profiles/ICC/IccWriter.cs
index c42e32d55a..b476e31955 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/IccWriter.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/IccWriter.cs
@@ -1,7 +1,6 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-using System;
using System.Collections.Generic;
using System.Linq;
@@ -51,12 +50,8 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
writer.WriteXyzNumber(header.PcsIlluminant);
writer.WriteAsciiString(header.CreatorSignature, 4, false);
-#if !NETSTANDARD1_1
IccProfileId id = IccProfile.CalculateHash(writer.GetData());
writer.WriteProfileId(id);
-#else
- writer.WriteProfileId(IccProfileId.Zero);
-#endif
}
private void WriteTagTable(IccDataWriter writer, IccTagTableEntry[] table)
diff --git a/tests/ImageSharp.Tests/MetaData/Profiles/ICC/IccProfileTests.cs b/tests/ImageSharp.Tests/MetaData/Profiles/ICC/IccProfileTests.cs
index 2e2c92182e..17b5dacc4c 100644
--- a/tests/ImageSharp.Tests/MetaData/Profiles/ICC/IccProfileTests.cs
+++ b/tests/ImageSharp.Tests/MetaData/Profiles/ICC/IccProfileTests.cs
@@ -9,9 +9,6 @@ namespace SixLabors.ImageSharp.Tests.Icc
{
public class IccProfileTests
{
-
-#if !NETSTANDARD1_1
-
[Theory]
[MemberData(nameof(IccTestDataProfiles.ProfileIdTestData), MemberType = typeof(IccTestDataProfiles))]
public void CalculateHash_WithByteArray_CalculatesProfileHash(byte[] data, IccProfileId expected)
@@ -33,8 +30,6 @@ namespace SixLabors.ImageSharp.Tests.Icc
Assert.Equal(data, copy);
}
-#endif
-
[Theory]
[MemberData(nameof(IccTestDataProfiles.ProfileValidityTestData), MemberType = typeof(IccTestDataProfiles))]
public void CheckIsValid_WithProfiles_ReturnsValidity(byte[] data, bool expected)
diff --git a/tests/ImageSharp.Tests/TestDataIcc/IccTestDataProfiles.cs b/tests/ImageSharp.Tests/TestDataIcc/IccTestDataProfiles.cs
index 35ffa2bbb6..b037a7a9af 100644
--- a/tests/ImageSharp.Tests/TestDataIcc/IccTestDataProfiles.cs
+++ b/tests/ImageSharp.Tests/TestDataIcc/IccTestDataProfiles.cs
@@ -14,20 +14,12 @@ namespace SixLabors.ImageSharp.Tests
public static readonly byte[] Header_Random_Id_Array =
{
-#if !NETSTANDARD1_1
- 0x84, 0xA8, 0xD4, 0x60, 0xC7, 0x16, 0xB6, 0xF3, 0x9B, 0x0E, 0x4C, 0x3D, 0xAB, 0x95, 0xF8, 0x38,
-#else
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-#endif
+ 0x84, 0xA8, 0xD4, 0x60, 0xC7, 0x16, 0xB6, 0xF3, 0x9B, 0x0E, 0x4C, 0x3D, 0xAB, 0x95, 0xF8, 0x38,
};
public static readonly byte[] Profile_Random_Id_Array =
{
-#if !NETSTANDARD1_1
- 0x91, 0x7D, 0x6D, 0xE6, 0x84, 0xC9, 0x58, 0xD1, 0x3B, 0xB0, 0xF5, 0xBB, 0xAD, 0xD1, 0x13, 0x4F,
-#else
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-#endif
+ 0x91, 0x7D, 0x6D, 0xE6, 0x84, 0xC9, 0x58, 0xD1, 0x3B, 0xB0, 0xF5, 0xBB, 0xAD, 0xD1, 0x13, 0x4F,
};
public static readonly IccProfileHeader Header_Random_Write = CreateHeaderRandomValue(
@@ -35,13 +27,7 @@ namespace SixLabors.ImageSharp.Tests
new IccProfileId(1, 2, 3, 4), // should be overwritten
"ijkl"); // should be overwritten to "acsp"
- public static readonly IccProfileHeader Header_Random_Read = CreateHeaderRandomValue(132,
-#if !NETSTANDARD1_1
- Header_Random_Id_Value,
-#else
- IccProfileId.Zero,
-#endif
- "acsp");
+ public static readonly IccProfileHeader Header_Random_Read = CreateHeaderRandomValue(132, Header_Random_Id_Value, "acsp");
public static readonly byte[] Header_Random_Array = CreateHeaderRandomArray(132, 0, Header_Random_Id_Array);
@@ -120,11 +106,7 @@ namespace SixLabors.ImageSharp.Tests
);
public static readonly IccProfile Profile_Random_Val = new IccProfile(CreateHeaderRandomValue(168,
-#if !NETSTANDARD1_1
Profile_Random_Id_Value,
-#else
- IccProfileId.Zero,
-#endif
"acsp"),
new IccTagDataEntry[]
{
@@ -239,4 +221,4 @@ namespace SixLabors.ImageSharp.Tests
new object[] { Header_Random_Array, true },
};
}
-}
+}
\ No newline at end of file