From e0b3e074da299314431324f8162a46f08883c4e0 Mon Sep 17 00:00:00 2001 From: Jeavon Date: Mon, 23 Nov 2015 11:48:37 +0000 Subject: [PATCH 1/4] Remove project.lock.json files from Git Former-commit-id: 136302779df7473dd42abbf2fad94038d4738e35 Former-commit-id: bea52a72aaebd3c21778cf3955a8cc247e74ea68 Former-commit-id: 7e1ddbce6f2ee5d58f5321c7071961dd28651ab4 --- 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 8fc61db8b7..0000000000 --- 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 e7c0cc81c4..0000000000 --- a/tests/ImageProcessor.Tests/project.lock.json.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -9ead0f07f8529db4e80eda95477601f6d3eb9583 \ No newline at end of file From 3f021cfd30de6ebe9ad55dc4275dc344735865bf Mon Sep 17 00:00:00 2001 From: Jeavon Date: Mon, 23 Nov 2015 11:57:35 +0000 Subject: [PATCH 2/4] Upgrade to RC1-final Former-commit-id: 5600662de2cb58db6be8f676bf9e836cdb3b8a0d Former-commit-id: cc015e12787c39a39f002597e037e0eb8c3bd558 Former-commit-id: 237a627b9c12afe2d7eaa73d8851d0b75c33ac9b --- 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 9786825ff8..9fab0efdb6 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 c2444082ac..44d5d900fa 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 dc11613aff..eb027b73ad 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 9cd13cc41c..9a0f631f6a 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 a351752ef826ca6074afeaa32973db78bbaf3b7c Mon Sep 17 00:00:00 2001 From: Jeavon Date: Mon, 23 Nov 2015 12:01:50 +0000 Subject: [PATCH 3/4] dnvm -a now has to be -alias Former-commit-id: 74e78ee56b5e4fc254c3fa3825fd710a117e402f Former-commit-id: 5388e12f4033060fa425c2674a34aa28d17b97a7 Former-commit-id: 5317b1d4a2abf149445ff66914e82423b1b6e5ce --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 9fab0efdb6..67fec26d25 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 fcb1888e6568dd12576fed4809c08e73ebdfc5c0 Mon Sep 17 00:00:00 2001 From: Jeavon Date: Mon, 23 Nov 2015 12:06:41 +0000 Subject: [PATCH 4/4] Oh, not alias everywhere Former-commit-id: d48c1a7715252315904b1abfc95943aaad48d9a5 Former-commit-id: 3998aa46bd541d6a6d3ed99218063c2288fce76f Former-commit-id: 12cc0ee8282c278e6c7b40958b309efced68a8e5 --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 67fec26d25..e40b512f2f 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