Switch to RC2 [skip ci]

Former-commit-id: 5dac15ae24465dbaa82fe2210048e49200cbc253 Former-commit-id: b87f2acfce66ac4aeda48cbf6b999bcc8e970c8e Former-commit-id: 2d52ca137b5146f454da3d8677f7a898a65f4a54
10 years ago · fcec5ed399
13 changed files with 81 additions and 129 deletions
--- a/ImageProcessorCore.sln
+++ b/ImageProcessorCore.sln
@ -9,6 +9,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageProcessorCore.Tests",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{C317F1B1-D75E-4C6D-83EB-80367343E0D7}"
 	ProjectSection(SolutionItems) = preProject
+		global.json = global.json
 		README.md = README.md
 	EndProjectSection
 EndProject
--- a/appveyor.yml
+++ b/appveyor.yml
@ -1,6 +1,11 @@
 version: v1.0.0.{build}
 os: Visual Studio 2015

+init:
+- cmd: >-
+    choco install dotnetcli
+    set PATH=C:\Program Files\dotnet\bin;%PATH%
+
 assembly_info:
  patch: true
  file: '**\AssemblyInfo.*'
@ -9,17 +14,7 @@ assembly_info:

 before_build:
 - cmd: >-
-    dnvm install 1.0.0-rc1-update1 -r clr
-
-    dnvm install 1.0.0-rc1-update1 -r coreclr -arch x64 -alias x64
-
-    dnvm use 1.0.0-rc1-update1 -r coreclr -a x64
-
-    dnvm list
-
-    dnu restore src\ImageProcessorCore
-
-    dnu restore tests\ImageProcessorCore.Tests
+    dotnet restore src\ImageProcessorCore

    cd build

@ -31,29 +26,20 @@ before_build:

 build_script:
 - cmd: >-
-    dnu build src\ImageProcessorCore
-
-    dnu build tests\ImageProcessorCore.Tests
-
-    dnu pack src\ImageProcessorCore --configuration Release --out "artifacts\bin\ImageProcessorCore"
-
-test_script:
- cmd: >-
-    dnvm use 1.0.0-rc1-update1 -r coreclr -a x64
+    dotnet pack src\ImageProcessorCore --configuration Release --output "artifacts\bin\ImageProcessorCore"

-    cd tests/ImageProcessorCore.Tests
+test: off

-    dnx test
 artifacts:
 - path: artifacts\bin\ImageProcessorCore\**\*.nupkg

-deploy:
-    # MyGet Deployment for builds & releases
- - provider: NuGet
-   server: https://www.myget.org/F/imageprocessor/api/v2/package
-   symbol_server: https://nuget.symbolsource.org/MyGet/imageprocessor
-   api_key:
-     secure: fz0rUrt3B1HczUC1ZehwVsrFSWX9WZGDQoueDztLte9/+yQG+BBU7UrO+coE8lUf
-   artifact: /.*\.nupkg/
-   on:
-     branch: Core
+# deploy:
+#     # MyGet Deployment for builds & releases
+#  - provider: NuGet
+#    server: https://www.myget.org/F/imageprocessor/api/v2/package
+#    symbol_server: https://nuget.symbolsource.org/MyGet/imageprocessor
+#    api_key:
+#      secure: fz0rUrt3B1HczUC1ZehwVsrFSWX9WZGDQoueDztLte9/+yQG+BBU7UrO+coE8lUf
+#    artifact: /.*\.nupkg/
+#    on:
+#      branch: Core
--- a/global.json
+++ b/global.json
@ -1,8 +1,6 @@
 {
-    "projects": [ "src" ],
-    "sdk": {
-      "version": "1.0.0-rc1-update1",
-        "runtime": "coreclr",
-        "architecture": "x64"
-    }
+  "projects": [ "src" ],
+  "sdk": {
+    "version": "1.0.0-preview1-002702"
+  }
 }
--- a/src/ImageProcessorCore/Bootstrapper.cs
+++ b/src/ImageProcessorCore/Bootstrapper.cs
@ -48,7 +48,7 @@ namespace ImageProcessorCore
        /// <summary>
        /// Gets the list of supported <see cref="IImageFormat"/>
        /// </summary>
-        public IReadOnlyCollection<IImageFormat> ImageFormats => new ReadOnlyCollection<IImageFormat>(imageFormats);
+        public IReadOnlyCollection<IImageFormat> ImageFormats => new ReadOnlyCollection<IImageFormat>(this.imageFormats);

        /// <summary>
        /// Adds a new <see cref="IImageFormat"/> to the collection of supported image formats.
--- a/src/ImageProcessorCore/ImageProcessor.nuget.targets
+++ b/src/ImageProcessorCore/ImageProcessor.nuget.targets
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(NuGetPackageRoot)' == ''">
-    <NuGetPackageRoot>C:\Users\James\.nuget\packages\</NuGetPackageRoot>
-  </PropertyGroup>
-  <ImportGroup>
-    <Import Project="$(NuGetPackageRoot)\NuSpec.ReferenceGenerator\1.3.6\build\dotnet\NuSpec.ReferenceGenerator.targets" Condition="Exists('$(NuGetPackageRoot)\NuSpec.ReferenceGenerator\1.3.6\build\dotnet\NuSpec.ReferenceGenerator.targets')" />
-  </ImportGroup>
-</Project>
--- a/src/ImageProcessorCore/ImageProcessor.xproj
+++ b/src/ImageProcessorCore/ImageProcessor.xproj
@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>2aa31a1f-142c-43f4-8687-09abca4b3a26</ProjectGuid>
-    <RootNamespace>ImageProcessor</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
--- a/src/ImageProcessorCore/ImageProcessorCore.xproj
+++ b/src/ImageProcessorCore/ImageProcessorCore.xproj
@ -4,12 +4,13 @@
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
  <PropertyGroup Label="Globals">
    <ProjectGuid>2aa31a1f-142c-43f4-8687-09abca4b3a26</ProjectGuid>
    <RootNamespace>ImageProcessorCore</RootNamespace>
    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\</OutputPath>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
  </PropertyGroup>
  <PropertyGroup>
    <SchemaVersion>2.0</SchemaVersion>
@ -17,5 +18,5 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
--- a/src/ImageProcessorCore/project.json
+++ b/src/ImageProcessorCore/project.json
@ -5,37 +5,34 @@
  "authors": [
    "James Jackson-South and contributors"
  ],
-  "tags": [
-    "Image Resize Crop Quality Gif Jpg Jpeg Bitmap Png Fluent Animated"
-  ],
-  "compilationOptions": {
+  "packOptions": {
+    "projectUrl": "https://github.com/JimBobSquarePants/ImageProcessor",
+    "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
+    "tags": [
+      "Image Resize Crop Quality Gif Jpg Jpeg Bitmap Png Fluent Animated"
+    ]
+  },
+  "buildOptions": {
    "allowUnsafe": true
  },
-  "projectUrl": "https://github.com/JimBobSquarePants/ImageProcessor",
-  "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
+  "dependencies": {
+    "NETStandard.Library": "1.5.0-rc2-24027",
+    "System.Numerics.Vectors": "4.1.1-rc2-24027"
+  },
  "frameworks": {
-    "dotnet5.5": {
+    "netstandard1.5": {
+      "imports": "dnxcore50",
      "dependencies": {
-        "System.Collections": "4.0.11-beta-23516",
-        "System.Linq": "4.0.1-beta-23516",
-        "System.Threading": "4.0.11-beta-23516",
-        "System.Runtime": "4.0.21-beta-23516",
-        "Microsoft.CSharp": "4.0.1-beta-23516",
-        "Microsoft.NETCore.Portable.Compatibility": "1.0.1-beta-23516",
-        "System.Runtime.Extensions": "4.0.11-beta-23516",
-        "System.Reflection": "4.1.0-beta-23516",
-        "System.IO": "4.0.11-beta-23516",
-        "Microsoft.NETCore": "5.0.1-beta-23516",
-        "Microsoft.NETCore.Platforms": "1.0.1-beta-23516"
+        "System.Threading": "4.0.11-rc2-24027",
+        "System.Threading.Tasks": "4.0.11-rc2-24027",
+        "System.Threading.Tasks.Parallel": "4.0.1-rc2-24027"
      }
    },
-    "net451": {
-      "dependencies": {
-        "System.Numerics.Vectors": "4.0.0",
-        "System.Runtime": "4.0.0"
-      },
+    "net4.5.1": {
      "frameworkAssemblies": {
-        "System.Runtime": "4.0.0"
+        "System.Threading": "4.0.0",
+        "System.Threading.Tasks": "4.0.0",
+        "System.Threading.Tasks.Parallel": "4.0.0"
      }
    }
  }
--- a/tests/ImageProcessorCore.Benchmarks/ImageProcessorCore.Benchmarks.xproj
+++ b/tests/ImageProcessorCore.Benchmarks/ImageProcessorCore.Benchmarks.xproj
@ -4,17 +4,16 @@
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
  </PropertyGroup>
-
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
  <PropertyGroup Label="Globals">
    <ProjectGuid>299d8e18-102c-42de-adbf-79098ee706a8</ProjectGuid>
    <RootNamespace>ImageProcessorCore.Benchmarks</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
  </PropertyGroup>
-
  <PropertyGroup>
    <SchemaVersion>2.0</SchemaVersion>
  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>
--- a/tests/ImageProcessorCore.Benchmarks/Program.cs
+++ b/tests/ImageProcessorCore.Benchmarks/Program.cs
@ -11,7 +11,7 @@
    {
        public static void Main(string[] args)
        {
-            //Use reflection for a more maintainable way of creating the benchmark switcher,
+            // Use reflection for a more maintainable way of creating the benchmark switcher,
            Type[] benchmarks = typeof(Program).Assembly.GetTypes()
                .Where(t => t.GetMethods(BindingFlags.Instance | BindingFlags.Public)
                                .Any(m => m.GetCustomAttributes(typeof(BenchmarkAttribute), false).Any()))
--- a/tests/ImageProcessorCore.Benchmarks/project.json
+++ b/tests/ImageProcessorCore.Benchmarks/project.json
@ -2,25 +2,25 @@
  "version": "1.0.0-*",
  "description": "ImageProcessorCore.Benchmarks Console Application",
  "authors": [ "James.South" ],
-  "tags": [ "" ],
-  "projectUrl": "",
-  "licenseUrl": "",
-
-  "compilationOptions": {
+  "packOptions": {
+    "projectUrl": "https://github.com/JimBobSquarePants/ImageProcessor",
+    "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
+    "tags": [
+      "Image Resize Crop Quality Gif Jpg Jpeg Bitmap Png Fluent Animated"
+    ]
+  },
+  "buildOptions": {
    "emitEntryPoint": true
  },
-
  "dependencies": {
-    "ImageProcessorCore": "1.0.0-*",
-    "BenchmarkDotNet": "0.9.6"
+    "BenchmarkDotNet": "0.9.6",
+    "ImageProcessorCore": "1.0.0-*"
  },
-
  "commands": {
    "ImageProcessorCore.Benchmarks": "ImageProcessorCore.Benchmarks"
  },
-
  "frameworks": {
-    "dnx46": {
+    "net4.5.1": {
      "frameworkAssemblies": {
        "System.Drawing": "4.0.0.0"
      }
--- a/tests/ImageProcessorCore.Tests/ImageProcessorCore.Tests.xproj
+++ b/tests/ImageProcessorCore.Tests/ImageProcessorCore.Tests.xproj
@ -4,12 +4,13 @@
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
  <PropertyGroup Label="Globals">
    <ProjectGuid>f836e8e6-b4d9-4208-8346-140c74678b91</ProjectGuid>
    <RootNamespace>ImageProcessor.Tests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
  </PropertyGroup>
  <PropertyGroup>
    <SchemaVersion>2.0</SchemaVersion>
@ -17,5 +18,5 @@
  <ItemGroup>
    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
--- a/tests/ImageProcessorCore.Tests/project.json
+++ b/tests/ImageProcessorCore.Tests/project.json
@ -2,22 +2,21 @@
  "version": "1.0.0-*",
  "description": "ImageProcessorCore.Tests Class Library",
  "authors": [ "James Jackson-South and contributors" ],
-  "tags": [ "" ],
-  "projectUrl": "",
-  "licenseUrl": "",
+  "packOptions": {
+    "projectUrl": "https://github.com/JimBobSquarePants/ImageProcessor",
+    "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
+    "tags": [
+      "Image Resize Crop Quality Gif Jpg Jpeg Bitmap Png Fluent Animated"
+    ]
+  },
  "dependencies": {
    "ImageProcessorCore": "1.0.0-*",
-    "Microsoft.CSharp": "4.0.1-beta-23516",
-    "Microsoft.NETCore": "5.0.1-beta-23516",
-    "Microsoft.NETCore.Platforms": "1.0.1-beta-23516",
-    "System.Collections": "4.0.11-beta-23516",
-    "System.Linq": "4.0.1-beta-23516",
-    "System.Threading": "4.0.11-beta-23516",
    "xunit": "2.2.0-beta1-build3239",
    "xunit.runner.dnx": "2.1.0-rc1-build204"
  },
  "frameworks": {
-    "dnxcore50": { }
+    "dnx451": {
+    }
  },
  "commands": {
    "test": "xunit.runner.dnx"