From a3ba69c38d8827c02a61b2057647231d8277a56a Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 14 Feb 2017 15:37:11 -0800 Subject: [PATCH 1/4] 1.1.2 patch train updates --- samples/HelloWorld/project.json | 2 +- samples/HotAddSample/project.json | 4 ++-- samples/SelfHostServer/project.json | 4 ++-- src/Microsoft.AspNetCore.Server.WebListener/project.json | 8 ++++---- src/Microsoft.Net.Http.Server/project.json | 4 ++-- .../project.json | 2 +- .../project.json | 2 +- test/Microsoft.Net.Http.Server.Tests/project.json | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/samples/HelloWorld/project.json b/samples/HelloWorld/project.json index 9624f9f..6a7c409 100644 --- a/samples/HelloWorld/project.json +++ b/samples/HelloWorld/project.json @@ -3,7 +3,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.Net.Http.Server": "1.1.1-*" + "Microsoft.Net.Http.Server": "1.1.1" }, "commands": { "sample": "HelloWorld" diff --git a/samples/HotAddSample/project.json b/samples/HotAddSample/project.json index efd3bba..9e78f02 100644 --- a/samples/HotAddSample/project.json +++ b/samples/HotAddSample/project.json @@ -1,7 +1,7 @@ { "dependencies": { - "Microsoft.AspNetCore.Server.WebListener": "1.1.1-*", - "Microsoft.Extensions.Logging.Console": "1.1.0-*" + "Microsoft.AspNetCore.Server.WebListener": "1.1.1", + "Microsoft.Extensions.Logging.Console": "1.1.1" }, "buildOptions": { "emitEntryPoint": true diff --git a/samples/SelfHostServer/project.json b/samples/SelfHostServer/project.json index 9a8a566..bde9522 100644 --- a/samples/SelfHostServer/project.json +++ b/samples/SelfHostServer/project.json @@ -1,7 +1,7 @@ { "dependencies": { - "Microsoft.AspNetCore.Server.WebListener": "1.1.1-*", - "Microsoft.Extensions.Logging.Console": "1.1.0-*" + "Microsoft.AspNetCore.Server.WebListener": "1.1.1", + "Microsoft.Extensions.Logging.Console": "1.1.1" }, "buildOptions": { "emitEntryPoint": true diff --git a/src/Microsoft.AspNetCore.Server.WebListener/project.json b/src/Microsoft.AspNetCore.Server.WebListener/project.json index 3921ab9..36fd352 100644 --- a/src/Microsoft.AspNetCore.Server.WebListener/project.json +++ b/src/Microsoft.AspNetCore.Server.WebListener/project.json @@ -1,5 +1,5 @@ { - "version": "1.1.1-*", + "version": "1.1.1", "description": "ASP.NET Core HTTP server for Windows.", "packOptions": { "tags": [ @@ -8,13 +8,13 @@ ] }, "dependencies": { - "Microsoft.AspNetCore.Hosting": "1.1.0-*", + "Microsoft.AspNetCore.Hosting": "1.1.1", "Microsoft.Extensions.TaskCache.Sources": { "version": "1.1.0-*", "type": "build" }, - "Microsoft.Net.Http.Headers": "1.1.0-*", - "Microsoft.Net.Http.Server": "1.1.1-*", + "Microsoft.Net.Http.Headers": "1.1.1", + "Microsoft.Net.Http.Server": "1.1.1", "NETStandard.Library": "1.6.1-*" }, "buildOptions": { diff --git a/src/Microsoft.Net.Http.Server/project.json b/src/Microsoft.Net.Http.Server/project.json index 487d106..28be95e 100644 --- a/src/Microsoft.Net.Http.Server/project.json +++ b/src/Microsoft.Net.Http.Server/project.json @@ -1,5 +1,5 @@ { - "version": "1.1.1-*", + "version": "1.1.1", "description": ".NET HTTP server that uses the Windows HTTP Server API.", "packOptions": { "tags": [ @@ -8,7 +8,7 @@ ] }, "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "1.1.0-*", + "Microsoft.Extensions.Logging.Abstractions": "1.1.1", "Microsoft.Extensions.Primitives": "1.1.0-*", "NETStandard.Library": "1.6.1-*" }, diff --git a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json index 4f72f94..823b0e1 100644 --- a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json @@ -6,7 +6,7 @@ "testRunner": "xunit", "dependencies": { "dotnet-test-xunit": "2.2.0-*", - "Microsoft.AspNetCore.Server.WebListener": "1.1.1-*", + "Microsoft.AspNetCore.Server.WebListener": "1.1.1", "Microsoft.AspNetCore.Testing": "1.1.0-*", "xunit": "2.2.0-*" }, diff --git a/test/Microsoft.Net.Http.Server.FunctionalTests/project.json b/test/Microsoft.Net.Http.Server.FunctionalTests/project.json index a971ecf..edccd90 100644 --- a/test/Microsoft.Net.Http.Server.FunctionalTests/project.json +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/project.json @@ -7,7 +7,7 @@ "dependencies": { "dotnet-test-xunit": "2.2.0-*", "Microsoft.AspNetCore.Testing": "1.1.0-*", - "Microsoft.Net.Http.Server": "1.1.1-*", + "Microsoft.Net.Http.Server": "1.1.1", "xunit": "2.2.0-*" }, "frameworks": { diff --git a/test/Microsoft.Net.Http.Server.Tests/project.json b/test/Microsoft.Net.Http.Server.Tests/project.json index 7561798..7805b69 100644 --- a/test/Microsoft.Net.Http.Server.Tests/project.json +++ b/test/Microsoft.Net.Http.Server.Tests/project.json @@ -2,7 +2,7 @@ "testRunner": "xunit", "dependencies": { "dotnet-test-xunit": "2.2.0-*", - "Microsoft.Net.Http.Server": "1.1.1-*", + "Microsoft.Net.Http.Server": "1.1.1", "xunit": "2.2.0-*" }, "frameworks": { From ab0a6d2789e52b6c98cabe059e9a141d4c82714c Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 14 Feb 2017 16:04:30 -0800 Subject: [PATCH 2/4] Update global.json and NuGet.config --- NuGet.config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 6197c93..8377810 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,7 +1,8 @@ - + + \ No newline at end of file From bd2815dbe463edf8aca7b23c36ac61ad2690e952 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 14 Feb 2017 16:33:21 -0800 Subject: [PATCH 3/4] Update Microsoft.NETCore.App to 1.1.1 --- samples/HelloWorld/project.json | 2 +- samples/HotAddSample/project.json | 2 +- samples/SelfHostServer/project.json | 2 +- .../project.json | 2 +- test/Microsoft.Net.Http.Server.FunctionalTests/project.json | 2 +- test/Microsoft.Net.Http.Server.Tests/project.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/samples/HelloWorld/project.json b/samples/HelloWorld/project.json index 6a7c409..3777dd5 100644 --- a/samples/HelloWorld/project.json +++ b/samples/HelloWorld/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/samples/HotAddSample/project.json b/samples/HotAddSample/project.json index 9e78f02..1680218 100644 --- a/samples/HotAddSample/project.json +++ b/samples/HotAddSample/project.json @@ -14,7 +14,7 @@ "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.1.0-*", + "version": "1.1.1", "type": "platform" } } diff --git a/samples/SelfHostServer/project.json b/samples/SelfHostServer/project.json index bde9522..3c69b47 100644 --- a/samples/SelfHostServer/project.json +++ b/samples/SelfHostServer/project.json @@ -14,7 +14,7 @@ "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.1.0-*", + "version": "1.1.1", "type": "platform" } } diff --git a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json index 823b0e1..e25d838 100644 --- a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json @@ -14,7 +14,7 @@ "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.1.0-*", + "version": "1.1.1", "type": "platform" }, "System.Net.Http.WinHttpHandler": "4.3.0-*", diff --git a/test/Microsoft.Net.Http.Server.FunctionalTests/project.json b/test/Microsoft.Net.Http.Server.FunctionalTests/project.json index edccd90..5b8aa03 100644 --- a/test/Microsoft.Net.Http.Server.FunctionalTests/project.json +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/project.json @@ -18,7 +18,7 @@ "version": "1.1.0-*" }, "Microsoft.NETCore.App": { - "version": "1.1.0-*", + "version": "1.1.1", "type": "platform" }, "System.Net.Http.WinHttpHandler": "4.3.0-*", diff --git a/test/Microsoft.Net.Http.Server.Tests/project.json b/test/Microsoft.Net.Http.Server.Tests/project.json index 7805b69..acb3f0f 100644 --- a/test/Microsoft.Net.Http.Server.Tests/project.json +++ b/test/Microsoft.Net.Http.Server.Tests/project.json @@ -9,7 +9,7 @@ "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.1.0-*", + "version": "1.1.1", "type": "platform" } } From 727e796b56997006b41d7923a29320228ee860b8 Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 15 Feb 2017 12:06:58 -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 "$@"