From 87612091dad80e032b7e5e64cb5f48e3c7b59ad1 Mon Sep 17 00:00:00 2001
From: Jeavon <jeavon@crumpled-dog.com>
Date: Mon, 23 Nov 2015 11:48:37 +0000
Subject: [PATCH 1/4] Remove project.lock.json files from Git

Former-commit-id: 649ae9b5eb11bf709e048e06ca0bdd16869ed87e
Former-commit-id: 5daaec8830c8903357fe6d4fe1ba97b9ec32e044
Former-commit-id: 70460fdeca414bc7a71bdceecddfec445092d22e
---
 src/ImageProcessor/project.lock.json.REMOVED.git-id         | 1 -
 tests/ImageProcessor.Tests/project.lock.json.REMOVED.git-id | 1 -
 2 files changed, 2 deletions(-)
 delete mode 100644 src/ImageProcessor/project.lock.json.REMOVED.git-id
 delete mode 100644 tests/ImageProcessor.Tests/project.lock.json.REMOVED.git-id

diff --git a/src/ImageProcessor/project.lock.json.REMOVED.git-id b/src/ImageProcessor/project.lock.json.REMOVED.git-id
deleted file mode 100644
index 8fc61db8b..000000000
--- a/src/ImageProcessor/project.lock.json.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-0b32043447c786c20468c00c3c0924348b389517
\ No newline at end of file
diff --git a/tests/ImageProcessor.Tests/project.lock.json.REMOVED.git-id b/tests/ImageProcessor.Tests/project.lock.json.REMOVED.git-id
deleted file mode 100644
index e7c0cc81c..000000000
--- a/tests/ImageProcessor.Tests/project.lock.json.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-9ead0f07f8529db4e80eda95477601f6d3eb9583
\ No newline at end of file

From 2acccb987151f76190330709b37d1274cef246fd Mon Sep 17 00:00:00 2001
From: Jeavon <jeavon@crumpled-dog.com>
Date: Mon, 23 Nov 2015 11:57:35 +0000
Subject: [PATCH 2/4] Upgrade to RC1-final

Former-commit-id: d599c00439f824cd54444d1329f9007b1a439960
Former-commit-id: 4948669f3a3127203b86f43204968257004da633
Former-commit-id: d5518f6372a27ccbc91b8abeca75b0acc0998641
---
 appveyor.yml                            |  8 ++++----
 global.json                             |  2 +-
 src/ImageProcessor/project.json         | 24 +++++++++++------------
 tests/ImageProcessor.Tests/project.json | 26 +++++++++++--------------
 4 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 9786825ff..9fab0efdb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,11 +7,11 @@ install:
 
 before_build:
 - cmd: >-
-    dnvm install 1.0.0-beta8 -r clr
+    dnvm install 1.0.0-rc1-final -r clr
 
-    dnvm install 1.0.0-beta8 -r coreclr -arch x64 -a x64
+    dnvm install 1.0.0-rc1-final -r coreclr -arch x64 -a x64
 
-    dnvm use 1.0.0-beta8 -r coreclr -a x64
+    dnvm use 1.0.0-rc1-final -r coreclr -a x64
 
     dnvm list
 
@@ -33,7 +33,7 @@ build:
   
 test_script:
 - cmd: >-
-    dnvm use 1.0.0-beta8 -r coreclr -a x64
+    dnvm use 1.0.0-rc1-final -r coreclr -a x64
 
     cd tests/ImageProcessor.Tests
 
diff --git a/global.json b/global.json
index c2444082a..44d5d900f 100644
--- a/global.json
+++ b/global.json
@@ -1,7 +1,7 @@
 {
     "projects": [ "src" ],
     "sdk": {
-        "version": "1.0.0-beta8",
+      "version": "1.0.0-rc1-final",
         "runtime": "coreclr",
         "architecture": "x86"
     }
diff --git a/src/ImageProcessor/project.json b/src/ImageProcessor/project.json
index dc11613af..eb027b73a 100644
--- a/src/ImageProcessor/project.json
+++ b/src/ImageProcessor/project.json
@@ -10,20 +10,20 @@
   "projectUrl": "",
   "licenseUrl": "",
   "dependencies": {
-    "System.Collections": "4.0.10",
-    "System.Linq": "4.0.0",
-    "System.Threading": "4.0.10",
-    "System.Runtime": "4.0.20",
-    "Microsoft.CSharp": "4.0.0",
-    "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
-    "System.Runtime.Extensions": "4.0.10",
-    "System.Reflection": "4.0.10",
-    "System.IO": "4.0.10",
+    "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",
     "StyleCop.Analyzers": "1.0.0-beta016",
-    "Microsoft.NETCore": "5.0.1-beta-23409",
-    "Microsoft.NETCore.Platforms": "1.0.1-beta-23409"
+    "Microsoft.NETCore": "5.0.1-beta-23516",
+    "Microsoft.NETCore.Platforms": "1.0.1-beta-23516"
   },
   "frameworks": {
-    "dotnet": {}
+    "dotnet5.4": { }
   }
 }
\ No newline at end of file
diff --git a/tests/ImageProcessor.Tests/project.json b/tests/ImageProcessor.Tests/project.json
index 9cd13cc41..9a0f631f6 100644
--- a/tests/ImageProcessor.Tests/project.json
+++ b/tests/ImageProcessor.Tests/project.json
@@ -5,23 +5,19 @@
   "tags": [ "" ],
   "projectUrl": "",
   "licenseUrl": "",
-  "frameworks": {
-    "dnxcore50": {
-      "dependencies": {
-        "Microsoft.CSharp": "4.0.1-beta-23409",
-        "System.Collections": "4.0.11-beta-23409",
-        "System.Linq": "4.0.1-beta-23409",
-        "System.Runtime": "4.0.21-beta-23409",
-        "System.Threading": "4.0.11-beta-23409"
-      }
-    }
-  },
   "dependencies": {
     "ImageProcessor": "3.0.0-*",
-    "Microsoft.NETCore": "5.0.1-beta-23409",
-    "Microsoft.NETCore.Platforms": "1.0.1-beta-23409",
-    "xunit": "2.1.0-*",
-    "xunit.runner.dnx": "2.1.0-beta6-build191"
+    "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.1.0",
+    "xunit.runner.dnx": "2.1.0-rc1-build204"
+  },
+  "frameworks": {
+    "dnxcore50": { }
   },
   "commands": {
     "test": "xunit.runner.dnx"

From 05025707a81a8d81623caae80747273a6dd77315 Mon Sep 17 00:00:00 2001
From: Jeavon <jeavon@crumpled-dog.com>
Date: Mon, 23 Nov 2015 12:01:50 +0000
Subject: [PATCH 3/4] dnvm -a now has to be -alias

Former-commit-id: e11cc518e16437aa1bbbf1667728c060bcf66074
Former-commit-id: 71644521379b756b96c84520824501623b210c6e
Former-commit-id: 8ce636d4ce1edb712e9abd03f99faec7fbaac22a
---
 appveyor.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 9fab0efdb..67fec26d2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,9 +9,9 @@ before_build:
 - cmd: >-
     dnvm install 1.0.0-rc1-final -r clr
 
-    dnvm install 1.0.0-rc1-final -r coreclr -arch x64 -a x64
+    dnvm install 1.0.0-rc1-final -r coreclr -arch x64 -alias x64
 
-    dnvm use 1.0.0-rc1-final -r coreclr -a x64
+    dnvm use 1.0.0-rc1-final -r coreclr -alias x64
 
     dnvm list
 
@@ -33,7 +33,7 @@ build:
   
 test_script:
 - cmd: >-
-    dnvm use 1.0.0-rc1-final -r coreclr -a x64
+    dnvm use 1.0.0-rc1-final -r coreclr -alias x64
 
     cd tests/ImageProcessor.Tests
 

From 2e66ccbcdfdb878a7b546ab1dc816285e6d0d655 Mon Sep 17 00:00:00 2001
From: Jeavon <jeavon@crumpled-dog.com>
Date: Mon, 23 Nov 2015 12:06:41 +0000
Subject: [PATCH 4/4] Oh, not alias everywhere

Former-commit-id: 28dfcaeae13d8c17f2765117f070f3a6fb982a30
Former-commit-id: 638bd7e4267af9c828d56da5d102c996f011754a
Former-commit-id: a23db364881ae42873c4b1a747832af69aa1f9e6
---
 appveyor.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 67fec26d2..e40b512f2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,7 +11,7 @@ before_build:
 
     dnvm install 1.0.0-rc1-final -r coreclr -arch x64 -alias x64
 
-    dnvm use 1.0.0-rc1-final -r coreclr -alias x64
+    dnvm use 1.0.0-rc1-final -r coreclr -a x64
 
     dnvm list
 
@@ -27,13 +27,13 @@ before_build:
 
     cd..
     
-build:
+build: 
   project: ImageProcessor.sln
   verbosity: minimal
   
 test_script:
 - cmd: >-
-    dnvm use 1.0.0-rc1-final -r coreclr -alias x64
+    dnvm use 1.0.0-rc1-final -r coreclr -a x64
 
     cd tests/ImageProcessor.Tests