From 0862685fac39ac472171d94a0e9b27b609725f4c Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 14 Feb 2017 15:33:32 -0800 Subject: [PATCH 1/4] 1.1.2 patch train updates --- samples/ResponseCachingSample/project.json | 8 ++++---- .../project.json | 2 +- .../project.json | 12 ++++++------ .../project.json | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/samples/ResponseCachingSample/project.json b/samples/ResponseCachingSample/project.json index e7903ba..63a02a1 100644 --- a/samples/ResponseCachingSample/project.json +++ b/samples/ResponseCachingSample/project.json @@ -1,9 +1,9 @@ { "dependencies": { - "Microsoft.AspNetCore.ResponseCaching": "1.1.0", - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.Extensions.Caching.Memory": "1.1.0" + "Microsoft.AspNetCore.ResponseCaching": "1.1.1", + "Microsoft.AspNetCore.Server.IISIntegration": "1.1.1", + "Microsoft.AspNetCore.Server.Kestrel": "1.1.1", + "Microsoft.Extensions.Caching.Memory": "1.1.1" }, "buildOptions": { "emitEntryPoint": true diff --git a/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/project.json b/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/project.json index 435e4cc..fad6c47 100644 --- a/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/project.json +++ b/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/project.json @@ -1,5 +1,5 @@ { - "version": "1.1.0", + "version": "1.1.1", "buildOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", diff --git a/src/Microsoft.AspNetCore.ResponseCaching/project.json b/src/Microsoft.AspNetCore.ResponseCaching/project.json index d80d6c7..99bdfc5 100644 --- a/src/Microsoft.AspNetCore.ResponseCaching/project.json +++ b/src/Microsoft.AspNetCore.ResponseCaching/project.json @@ -1,5 +1,5 @@ { - "version": "1.1.0", + "version": "1.1.1", "buildOptions": { "warningsAsErrors": true, "allowUnsafe": true, @@ -22,11 +22,11 @@ ] }, "dependencies": { - "Microsoft.AspNetCore.Http": "1.1.0", - "Microsoft.AspNetCore.Http.Extensions": "1.1.0", - "Microsoft.AspNetCore.ResponseCaching.Abstractions": "1.1.0", - "Microsoft.Extensions.Caching.Memory": "1.1.0", - "Microsoft.Extensions.Logging.Abstractions": "1.1.0", + "Microsoft.AspNetCore.Http": "1.1.1", + "Microsoft.AspNetCore.Http.Extensions": "1.1.1", + "Microsoft.AspNetCore.ResponseCaching.Abstractions": "1.1.1", + "Microsoft.Extensions.Caching.Memory": "1.1.1", + "Microsoft.Extensions.Logging.Abstractions": "1.1.1", "Microsoft.Extensions.TaskCache.Sources": { "version": "1.1.0-rtm-22752", "type": "build" diff --git a/test/Microsoft.AspNetCore.ResponseCaching.Tests/project.json b/test/Microsoft.AspNetCore.ResponseCaching.Tests/project.json index 8dccc7c..c186c77 100644 --- a/test/Microsoft.AspNetCore.ResponseCaching.Tests/project.json +++ b/test/Microsoft.AspNetCore.ResponseCaching.Tests/project.json @@ -5,9 +5,9 @@ }, "dependencies": { "dotnet-test-xunit": "2.2.0-*", - "Microsoft.AspNetCore.ResponseCaching": "1.1.0", - "Microsoft.AspNetCore.TestHost": "1.1.0", - "Microsoft.Extensions.Logging.Testing": "1.1.0-rtm-22752", + "Microsoft.AspNetCore.ResponseCaching": "1.1.1", + "Microsoft.AspNetCore.TestHost": "1.1.1", + "Microsoft.Extensions.Logging.Testing": "1.1.1", "xunit": "2.2.0-*" }, "frameworks": { From dde31e49d80d0812433e09c959cd6d68bdd96df9 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 14 Feb 2017 16:04:06 -0800 Subject: [PATCH 2/4] Update global.json and NuGet.config --- NuGet.config | 3 ++- global.json | 7 ++++++- 2 files changed, 8 insertions(+), 2 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/global.json b/global.json index 829daad..f45e8cc 100644 --- a/global.json +++ b/global.json @@ -1,3 +1,8 @@ { - "projects": ["src"] + "projects": [ + "src" + ], + "sdk": { + "version": "1.0.0-preview2-1-003177" + } } \ No newline at end of file From 7778c911b5dd7c801ca9f06a2f7924a0bbda9fbb Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 14 Feb 2017 16:32:57 -0800 Subject: [PATCH 3/4] Update Microsoft.NETCore.App to 1.1.1 --- samples/ResponseCachingSample/project.json | 2 +- test/Microsoft.AspNetCore.ResponseCaching.Tests/project.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/ResponseCachingSample/project.json b/samples/ResponseCachingSample/project.json index 63a02a1..d52f7d0 100644 --- a/samples/ResponseCachingSample/project.json +++ b/samples/ResponseCachingSample/project.json @@ -13,7 +13,7 @@ "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.1.0", + "version": "1.1.1", "type": "platform" } } diff --git a/test/Microsoft.AspNetCore.ResponseCaching.Tests/project.json b/test/Microsoft.AspNetCore.ResponseCaching.Tests/project.json index c186c77..444e041 100644 --- a/test/Microsoft.AspNetCore.ResponseCaching.Tests/project.json +++ b/test/Microsoft.AspNetCore.ResponseCaching.Tests/project.json @@ -14,7 +14,7 @@ "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.1.0", + "version": "1.1.1", "type": "platform" } } From 977d971a3a3b00fb17941eb657f2bcdf35fa8143 Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 15 Feb 2017 12:06:35 -0800 Subject: [PATCH 4/4] Update build scripts --- build.ps1 | 4 ++-- build.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 "$@"