Merge pull request #1087 from SixLabors/af/merge-core-2

Merge SixLabors.Core sources into ImageSharp

Author: JimBobSquarePants

Directory.Build.targets

@@ -23,10 +23,12 @@
     <PackageReference Update="StyleCop.Analyzers" PrivateAssets="All" Version="1.1.118" />
 
     <!--Src Dependencies-->
-    <PackageReference Update="SixLabors.Core" Version="1.0.0-beta0008" />
+    <PackageReference Update="System.Buffers" Version="4.5.0" />
     <PackageReference Update="System.IO.Compression" Version="4.3.0" />
     <PackageReference Update="System.IO.UnmanagedMemoryStream" Version="4.3.0" />
-    <PackageReference Update="System.Runtime.CompilerServices.Unsafe" Version="4.5.1" />
+    <PackageReference Update="System.Numerics.Vectors" Version="4.5.0" />
+    <PackageReference Update="System.Memory" Version="4.5.3" />
+    <PackageReference Update="System.Runtime.CompilerServices.Unsafe" Version="4.7" />
     <PackageReference Update="System.Threading.Tasks.Parallel" Version="4.3.0" />
     <PackageReference Update="System.ValueTuple" Version="4.5.0" />
 

GitVersion.yml

@@ -2,5 +2,6 @@ continuous-delivery-fallback-tag: ci
 branches:
     master:
         tag: unstable
+        mode: ContinuousDeployment
     pull-request:
         tag: pr

ci-test.ps1

@@ -34,8 +34,4 @@ elseif ($platform -eq '-x86' -and $targetFramework -match $netFxRegex) {
 else {
 
   dotnet test --no-build -c Release -f $targetFramework
-}
-
-# Explicitly exit with 0 to ignore errors caused by coverlet attempting to read
-# project files that dotnet test is set to ignore.
-exit 0
+}

src/Directory.Build.targets

@@ -50,6 +50,6 @@
 
   <!-- Empty target so that `dotnet test` will work on the solution -->
   <!-- https://github.com/Microsoft/vstest/issues/411 -->
-  <Target Name="VSTest" />
+  <Target Name="VSTest" Condition="'$(IsTestProject)' == 'true'"/>
 
 </Project>

src/ImageSharp/Advanced/AdvancedImageExtensions.cs

@@ -6,7 +6,6 @@
 
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.Memory;
 
 namespace SixLabors.ImageSharp.Advanced
 {

src/ImageSharp/Advanced/ParallelUtils/ParallelExecutionSettings.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Threading.Tasks;
 
-using SixLabors.Memory;
+using SixLabors.ImageSharp.Memory;
 
 namespace SixLabors.ImageSharp.Advanced.ParallelUtils
 {

src/ImageSharp/Advanced/ParallelUtils/ParallelHelper.cs

@@ -7,8 +7,6 @@
 using System.Threading.Tasks;
 
 using SixLabors.ImageSharp.Memory;
-using SixLabors.Memory;
-using SixLabors.Primitives;
 
 namespace SixLabors.ImageSharp.Advanced.ParallelUtils
 {

src/ImageSharp/Common/Extensions/StreamExtensions.cs

@@ -5,7 +5,6 @@
 using System.Buffers;
 using System.IO;
 using SixLabors.ImageSharp.Memory;
-using SixLabors.Memory;
 
 namespace SixLabors.ImageSharp
 {

src/ImageSharp/Common/Helpers/Buffer2DUtils.cs

@@ -8,7 +8,6 @@
 
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Primitives;
 
 namespace SixLabors.ImageSharp
 {

src/ImageSharp/Common/Helpers/DenseMatrixUtils.cs

@@ -6,7 +6,6 @@
 using System.Runtime.CompilerServices;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Primitives;
 
 namespace SixLabors.ImageSharp
 {