diff --git a/appveyor.yml b/appveyor.yml index 9786825ff..e40b512f2 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 -alias x64 - dnvm use 1.0.0-beta8 -r coreclr -a 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-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 57178e751..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", - "Microsoft.NETCore": "5.0.1-beta-23409", - "Microsoft.NETCore.Platforms": "1.0.1-beta-23409", - "StyleCop.Analyzers": "1.0.0-beta016" + "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-23516", + "Microsoft.NETCore.Platforms": "1.0.1-beta-23516" }, "frameworks": { - "dotnet": { } + "dotnet5.4": { } } } \ 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 deleted file mode 100644 index 365950bb8..000000000 --- a/src/ImageProcessor/project.lock.json.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -e9c58eb8b9733d48d157d8bf0852daae4f60dab0 \ No newline at end of file diff --git a/tests/ImageProcessor.Tests/project.json b/tests/ImageProcessor.Tests/project.json index 9cd13cc41..83ac8ab13 100644 --- a/tests/ImageProcessor.Tests/project.json +++ b/tests/ImageProcessor.Tests/project.json @@ -5,25 +5,21 @@ "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" } -} +} \ 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 a5a60bda7..000000000 --- a/tests/ImageProcessor.Tests/project.lock.json.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -11091fe7d5fc9cff9aec6ef60bf1c47e0e01d066 \ No newline at end of file