diff --git a/ImageProcessor.sln b/ImageProcessor.sln
index 75e092892..ef8735a33 100644
--- a/ImageProcessor.sln
+++ b/ImageProcessor.sln
@@ -3,9 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessor", "src\ImageProcessor\ImageProcessor.csproj", "{8047C4AC-7097-4DE4-B00D-6D55EBCF1D36}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessor.Tests", "tests\ImageProcessor.Tests\ImageProcessor.Tests.csproj", "{1741DC66-5404-4B15-AE58-B7721F1568A4}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageProcessor", "src\ImageProcessor\ImageProcessor.xproj", "{2AA31A1F-142C-43F4-8687-09ABCA4B3A26}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,14 +11,10 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {8047C4AC-7097-4DE4-B00D-6D55EBCF1D36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8047C4AC-7097-4DE4-B00D-6D55EBCF1D36}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8047C4AC-7097-4DE4-B00D-6D55EBCF1D36}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8047C4AC-7097-4DE4-B00D-6D55EBCF1D36}.Release|Any CPU.Build.0 = Release|Any CPU
- {1741DC66-5404-4B15-AE58-B7721F1568A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1741DC66-5404-4B15-AE58-B7721F1568A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1741DC66-5404-4B15-AE58-B7721F1568A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1741DC66-5404-4B15-AE58-B7721F1568A4}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2AA31A1F-142C-43F4-8687-09ABCA4B3A26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2AA31A1F-142C-43F4-8687-09ABCA4B3A26}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2AA31A1F-142C-43F4-8687-09ABCA4B3A26}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2AA31A1F-142C-43F4-8687-09ABCA4B3A26}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/global.json b/global.json
new file mode 100644
index 000000000..9e26dfeeb
--- /dev/null
+++ b/global.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/src/ImageProcessor/ImageProcessor.csproj b/src/ImageProcessor/ImageProcessor.csproj
deleted file mode 100644
index a36830e8f..000000000
--- a/src/ImageProcessor/ImageProcessor.csproj
+++ /dev/null
@@ -1,281 +0,0 @@
-
-
-
-
- 14.0
- Debug
- AnyCPU
- {8047C4AC-7097-4DE4-B00D-6D55EBCF1D36}
- Library
- Properties
- ImageProcessor
- ImageProcessor
- en-US
- 512
- {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
-
-
- v5.0
- ..\..\
- true
-
-
-
-
- true
- full
- false
- bin\Debug\
- TRACE;DEBUG;NOCRYPTO;PCL
- prompt
- 4
- bin\Debug\ImageProcessor.XML
- default
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
- bin\Release\ImageProcessor.XML
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/ImageProcessor/ImageProcessor.csproj.DotSettings b/src/ImageProcessor/ImageProcessor.csproj.DotSettings
deleted file mode 100644
index b4cd56a17..000000000
--- a/src/ImageProcessor/ImageProcessor.csproj.DotSettings
+++ /dev/null
@@ -1,24 +0,0 @@
-
- CSharp60
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
\ No newline at end of file
diff --git a/src/ImageProcessor/ImageProcessor.nuspec b/src/ImageProcessor/ImageProcessor.nuspec
deleted file mode 100644
index 2a03ac069..000000000
--- a/src/ImageProcessor/ImageProcessor.nuspec
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- $id$
- $version$
- $title$
- $author$
- $author$
- http://LICENSE_URL_HERE_OR_DELETE_THIS_LINE
- http://PROJECT_URL_HERE_OR_DELETE_THIS_LINE
- http://ICON_URL_HERE_OR_DELETE_THIS_LINE
- false
- $description$
- Alpha Release.
- Copyright James Jackson-South and contributors2015
- Image Resize Crop Quality Gif Jpg Jpeg Bitmap Png Fluent Animated
-
-
\ No newline at end of file
diff --git a/src/ImageProcessor/ImageProcessor.xproj b/src/ImageProcessor/ImageProcessor.xproj
new file mode 100644
index 000000000..32684b928
--- /dev/null
+++ b/src/ImageProcessor/ImageProcessor.xproj
@@ -0,0 +1,24 @@
+
+
+
+ 14.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+
+
+
+ 2aa31a1f-142c-43f4-8687-09abca4b3a26
+ ImageProcessor
+ ..\..\artifacts\obj\$(MSBuildProjectName)
+ ..\..\artifacts\bin\$(MSBuildProjectName)\
+
+
+ 2.0
+
+
+ True
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/ImageProcessor/Properties/AssemblyInfo.cs b/src/ImageProcessor/Properties/AssemblyInfo.cs
deleted file mode 100644
index 999af59c3..000000000
--- a/src/ImageProcessor/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Resources;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ImageProcessor")]
-[assembly: AssemblyDescription("A cross-platform library for processing of image files written in C#")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ImageProcessor")]
-[assembly: AssemblyCopyright("Copyright (c) James South and contributors.")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
-
-// Ensure the internals can be tested.
-[assembly: InternalsVisibleTo("ImageProcessor.Tests")]
diff --git a/src/ImageProcessor/Settings.StyleCop b/src/ImageProcessor/Settings.StyleCop
deleted file mode 100644
index dd461b1f1..000000000
--- a/src/ImageProcessor/Settings.StyleCop
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- cb
- octree
- quantizer
- cr
- EX
- png
- rgb
- scanline
- scanlines
- tEXt
- xt
- th
- nd
- rd
- lomograph
- polaroid
- colorspace
- kodachrome
-
-
-
\ No newline at end of file
diff --git a/src/ImageProcessor/project.json b/src/ImageProcessor/project.json
index 6288fcc23..d6b6d79a7 100644
--- a/src/ImageProcessor/project.json
+++ b/src/ImageProcessor/project.json
@@ -1,17 +1,26 @@
-{
- "supports": {
- "net46.app": {},
- "uwp.10.0.app": {},
- "dnxcore50.app": {}
- },
- "dependencies": {
- "Microsoft.NETCore": "5.0.0",
- "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
- "StyleCop.Analyzers": "1.0.0-beta015"
- },
- "frameworks": {
- "dotnet": {
- "imports": "portable-net452+win81"
+{
+ "version": "3.0.0-*",
+ "description": "ImageProcessor",
+ "authors": [ "James Jackson-South" ],
+ "tags": [ "Image Resize Crop Quality Gif Jpg Jpeg Bitmap Png Fluent Animated" ],
+ "projectUrl": "",
+ "licenseUrl": "",
+
+ "dependencies": {
+ "System.Collections": "4.0.10-beta-23019",
+ "System.Linq": "4.0.0-beta-23019",
+ "System.Threading": "4.0.10-beta-23019",
+ "System.Runtime": "4.0.10-beta-23019",
+ "Microsoft.CSharp": "4.0.0-beta-23019",
+ "Microsoft.NETCore": "5.0.0",
+ "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
+ "System.Runtime.Extensions": "4.0.0",
+ "System.Reflection": "4.0.0",
+ "System.IO": "4.0.0",
+ "StyleCop.Analyzers": "1.0.0-beta015"
+ },
+
+ "frameworks": {
+ "dotnet": { }
}
- }
-}
\ No newline at end of file
+}
diff --git a/src/ImageProcessor/project.lock.json.REMOVED.git-id b/src/ImageProcessor/project.lock.json.REMOVED.git-id
index 24339fed2..833f52323 100644
--- a/src/ImageProcessor/project.lock.json.REMOVED.git-id
+++ b/src/ImageProcessor/project.lock.json.REMOVED.git-id
@@ -1 +1 @@
-3f05708641eb3ed085d4689aae4a960eb067fd16
\ No newline at end of file
+1cb54c4ca5fc8244fed40097407641c28dd42fe4
\ No newline at end of file
diff --git a/tests/ImageProcessor.Tests/ImageProcessor.Tests.csproj b/tests/ImageProcessor.Tests/ImageProcessor.Tests.csproj
index 34751d447..02f91d9c0 100644
--- a/tests/ImageProcessor.Tests/ImageProcessor.Tests.csproj
+++ b/tests/ImageProcessor.Tests/ImageProcessor.Tests.csproj
@@ -76,12 +76,6 @@
-
-
- {8047C4AC-7097-4DE4-B00D-6D55EBCF1D36}
- ImageProcessor
-
-