From 904b1ca61d6cd2957ee004c26a4f4e09b8f472eb Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Mon, 11 Jan 2016 11:15:37 +1100 Subject: [PATCH] Update dependencies Former-commit-id: 0725e4f7cdd245458d2c70c4ddff901fe562303b Former-commit-id: f2a270133fed41045d0fb3782b57a6cda510f103 Former-commit-id: 4fab0538617019c8fb883a4c6fcc918fa03fb67e --- appveyor.yml | 10 +++++----- global.json | 2 +- src/ImageProcessor/project.json | 2 +- tests/ImageProcessor.Tests/project.json | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 8350a0dd2..aefcfdf5c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,11 +7,11 @@ install: before_build: - cmd: >- - dnvm install 1.0.0-rc1-final -r clr + dnvm install 1.0.0-rc1-update1 -r clr - dnvm install 1.0.0-rc1-final -r coreclr -arch x64 -alias x64 + dnvm install 1.0.0-rc1-update1 -r coreclr -arch x64 -alias x64 - dnvm use 1.0.0-rc1-final -r coreclr -a x64 + dnvm use 1.0.0-rc1-update1 -r coreclr -a x64 dnvm list @@ -28,11 +28,11 @@ before_build: cd.. build_script: -- cmd: '"%programfiles(x86)%\MSBuild\14.0\Bin\amd64\MsBuild.exe" ImageProcessor.sln /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:RuntimeToolingDirectory="%USERPROFILE%\.dnx\runtimes\dnx-coreclr-win-x64.1.0.0-rc1-final"' +- cmd: '"%programfiles(x86)%\MSBuild\14.0\Bin\amd64\MsBuild.exe" ImageProcessor.sln /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:RuntimeToolingDirectory="%USERPROFILE%\.dnx\runtimes\dnx-coreclr-win-x64.1.0.0-rc1-update1"' test_script: - cmd: >- - dnvm use 1.0.0-rc1-final -r coreclr -a x64 + dnvm use 1.0.0-rc1-update1 -r coreclr -a x64 cd tests/ImageProcessor.Tests diff --git a/global.json b/global.json index f7f955356..4013de3c5 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "projects": [ "src" ], "sdk": { - "version": "1.0.0-rc1-final", + "version": "1.0.0-rc1-update1", "runtime": "coreclr", "architecture": "x64" } diff --git a/src/ImageProcessor/project.json b/src/ImageProcessor/project.json index 1c7c0bda3..dc44feb0b 100644 --- a/src/ImageProcessor/project.json +++ b/src/ImageProcessor/project.json @@ -24,6 +24,6 @@ "Microsoft.NETCore.Platforms": "1.0.1-beta-23516" }, "frameworks": { - "dnxcore50": { } + "dotnet5.5": { } } } \ No newline at end of file diff --git a/tests/ImageProcessor.Tests/project.json b/tests/ImageProcessor.Tests/project.json index 83ac8ab13..d0a83ac2e 100644 --- a/tests/ImageProcessor.Tests/project.json +++ b/tests/ImageProcessor.Tests/project.json @@ -1,4 +1,4 @@ -{ +{ "version": "1.0.0-*", "description": "ImageProcessor.Tests Class Library", "authors": [ "James Jackson-South and contributors" ], @@ -13,7 +13,7 @@ "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": "2.2.0-beta1-build3239", "xunit.runner.dnx": "2.1.0-rc1-build204" }, "frameworks": {