Merge remote-tracking branch 'refs/remotes/origin/feature/NETCore-RC2' into Core

Former-commit-id: 071acbb9cdf1d0a65970a1b2190e98d3b3c4ca87 Former-commit-id: c7cac17561247082c81f8805c1121396ffbc2b1f Former-commit-id: 0f868f35cd2aaa5897e934023487be6ab7fa8292
10 years ago · 40b66baa4c
15 changed files with 130 additions and 133 deletions
--- a/ImageProcessorCore.sln
+++ b/ImageProcessorCore.sln
@ -9,6 +9,9 @@ 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
+		appveyor.yml = appveyor.yml
+		build\dotnet-latest.ps1 = build\dotnet-latest.ps1
+		global.json = global.json
 		README.md = README.md
 	EndProjectSection
 EndProject
--- a/README.md
+++ b/README.md
@ -35,10 +35,10 @@ We already have a [MyGet package repository](https://www.myget.org/gallery/image
 If you prefer, you can compile ImageProcessorCore yourself (please do and help!), you'll need:

 - Visual Studio 2015 (or above)
- The [Windows 10 development tools](https://dev.windows.com/en-us/downloads) - Click `Get Visual Studio Community`.
- Dnvm and Dnx installed
-
-To install the last two please see the instructions at the [DotNet documentation](http://dotnet.readthedocs.org/en/latest/getting-started/installing-core-windows.html)
+- The [.NET Core SDK Installer
+(Preview 1)](https://www.microsoft.com/net/download) - Click `.NET Core SDK Installer
+(Preview 1)`
+- The [.NET Core Tooling Preview 1 for Visual Studio 2015](https://dev.windows.com/en-us/downloads) - Click `.NET Core Tooling Preview 1 for Visual Studio 2015`.

 To clone it locally click the "Clone in Windows" button above or run the following git commands.

--- a/appveyor.yml
+++ b/appveyor.yml
@ -1,6 +1,15 @@
 version: v1.0.0.{build}
 os: Visual Studio 2015

+install:
+# Use the install script to grab the latest dotnet install
+- ps: iex .\dotnet-latest.ps1
+
+# Prepend newly installed Python to the PATH of this build (this cannot be
+  # done from inside the powershell script as it would require to restart
+  # the parent CMD process).
+- "SET PATH=C:\\Program Files\\dotnet\\bin;%PATH%"
+
 assembly_info:
  patch: true
  file: '**\AssemblyInfo.*'
@ -9,17 +18,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,19 +30,10 @@ 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

--- a/dotnet-latest.ps1
+++ b/dotnet-latest.ps1
@ -0,0 +1,29 @@
+# Set up everything for using the dotnet cli. This should mean we do not have to wait for Appveyor images to be updated.
+
+# Clean and recreate the folder in which all output packages should be placed
+$ArtifactsPath = "artifacts"
+
+if (Test-Path $ArtifactsPath) { 
+	Remove-Item -Path $ArtifactsPath -Recurse -Force -ErrorAction Ignore 
+}
+
+New-Item $ArtifactsPath -ItemType Directory -ErrorAction Ignore | Out-Null
+
+Write-Host "Created artifacts folder '$ArtifactsPath'"
+
+# Install the latest dotnet cli   
+if (Get-Command "dotnet.exe" -ErrorAction SilentlyContinue) {
+    Write-Host "dotnet SDK already installed"
+	dotnet --version 
+} else {
+    Write-Host "Installing dotnet SDK"
+    
+    $installScript = Join-Path $ArtifactsPath "dotnet-install.ps1"
+    
+	Write-Host $installScript
+
+     Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/install.ps1" `
+       -OutFile $installScript
+        
+     & $installScript
+}
--- 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>
+    <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 @@
  <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,27 @@
  "authors": [
    "James Jackson-South and contributors"
  ],
-  "tags": [
-    "Image Resize Crop Quality Gif Jpg Jpeg Bitmap Png Fluent Animated"
-  ],
-  "compilationOptions": {
-    "allowUnsafe": true
+  "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,
+    "debugType": "portable"
+  },
+  "dependencies": {
+    "NETStandard.Library": "1.5.0-rc2-24027",
+    "System.Numerics.Vectors": "4.1.1-rc2-24027"
  },
-  "projectUrl": "https://github.com/JimBobSquarePants/ImageProcessor",
-  "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
  "frameworks": {
-    "dotnet5.5": {
-      "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"
-      }
-    },
-    "net451": {
+    "netstandard1.1": {
      "dependencies": {
-        "System.Numerics.Vectors": "4.0.0",
-        "System.Runtime": "4.0.0"
-      },
-      "frameworkAssemblies": {
-        "System.Runtime": "4.0.0"
+        "System.Threading": "4.0.11-rc2-24027",
+        "System.Threading.Tasks": "4.0.11-rc2-24027",
+        "System.Threading.Tasks.Parallel": "4.0.1-rc2-24027"
      }
    }
  }
--- 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,30 @@
  "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": {
+    "net451": {
+      "dependencies": {
+      },
+      "imports": [
+        "dnx451"
+      ],
      "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,24 +2,35 @@
  "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"
+    ]
+  },
+  "buildOptions": {
+    "debugType": "portable"
+  },
  "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"
+    "System.Diagnostics.TraceSource": "4.0.0-rc2-24027",
+    "xunit": "2.1.0",
+    "dotnet-test-xunit": "1.0.0-rc2-build10015"
  },
  "frameworks": {
-    "dnxcore50": { }
+    "netcoreapp1.1": {
+      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "type": "platform",
+          "version": "1.0.0-rc2-3002702"
+        }
+      },
+      "imports": [
+        "dnxcore50",
+        "portable-net45+win8"
+      ]
+    }
  },
-  "commands": {
-    "test": "xunit.runner.dnx"
-  }
+  "testRunner": "xunit"
 }