From c8c545e98557fc0c7a26f5b5bdf64c638c2f7cac Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 15 Feb 2017 15:04:11 -0800 Subject: [PATCH] 1.1.2 patch train updates (#67) * 1.1.2 patch train updates * Update global.json and NuGet.config * Update Microsoft.NETCore.App to 1.1.1 * Update build scripts --- NuGet.config | 3 ++- build.ps1 | 4 ++-- build.sh | 4 ++-- global.json | 11 +++++++++-- src/Microsoft.AspNetCore.JsonPatch/project.json | 2 +- test/Microsoft.AspNetCore.JsonPatch.Test/project.json | 4 ++-- 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index feaadcd..b1e768f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,5 +4,6 @@ + - + \ No newline at end of file diff --git a/build.ps1 b/build.ps1 index 24ca167..6245aee 100644 --- a/build.ps1 +++ b/build.ps1 @@ -33,7 +33,7 @@ cd $PSScriptRoot $repoFolder = $PSScriptRoot $env:REPO_FOLDER = $repoFolder -$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.1.0.zip" +$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.1.2.zip" if ($env:KOREBUILD_ZIP) { $koreBuildZip=$env:KOREBUILD_ZIP @@ -64,4 +64,4 @@ if (!(Test-Path $buildFolder)) { } } -&"$buildFile" $args \ No newline at end of file +&"$buildFile" $args diff --git a/build.sh b/build.sh index fea9ac6..22df3c0 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $repoFolder -koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.1.0.zip" +koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.1.2.zip" if [ ! -z $KOREBUILD_ZIP ]; then koreBuildZip=$KOREBUILD_ZIP fi @@ -43,4 +43,4 @@ if test ! -d $buildFolder; then fi fi -$buildFile -r $repoFolder "$@" \ No newline at end of file +$buildFile -r $repoFolder "$@" diff --git a/global.json b/global.json index fad3dfe..e04bdfc 100644 --- a/global.json +++ b/global.json @@ -1,3 +1,10 @@ { - "projects": ["src", "test/WebSites", "samples"] -} + "projects": [ + "src", + "test/WebSites", + "samples" + ], + "sdk": { + "version": "1.0.0-preview2-1-003177" + } +} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.JsonPatch/project.json b/src/Microsoft.AspNetCore.JsonPatch/project.json index 6d2ccde..f6f2cab 100644 --- a/src/Microsoft.AspNetCore.JsonPatch/project.json +++ b/src/Microsoft.AspNetCore.JsonPatch/project.json @@ -1,5 +1,5 @@ { - "version": "1.1.0", + "version": "1.1.1", "description": "ASP.NET Core support for JSON PATCH.", "buildOptions": { "warningsAsErrors": true, diff --git a/test/Microsoft.AspNetCore.JsonPatch.Test/project.json b/test/Microsoft.AspNetCore.JsonPatch.Test/project.json index 196dbca..ae4f4c2 100644 --- a/test/Microsoft.AspNetCore.JsonPatch.Test/project.json +++ b/test/Microsoft.AspNetCore.JsonPatch.Test/project.json @@ -4,7 +4,7 @@ }, "dependencies": { "dotnet-test-xunit": "2.2.0-*", - "Microsoft.AspNetCore.JsonPatch": "1.1.0", + "Microsoft.AspNetCore.JsonPatch": "1.1.1", "Microsoft.AspNetCore.Testing": "1.1.0-rtm-22752", "Moq": "4.6.36-*", "xunit": "2.2.0-*" @@ -14,7 +14,7 @@ "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.1.0", + "version": "1.1.1", "type": "platform" }, "System.Diagnostics.TraceSource": "4.3.0"