From f4b8700d36230a9288382641531878a94aaf75f7 Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 15 Feb 2017 15:02:59 -0800 Subject: [PATCH] 1.1.2 patch train updates (#741) * 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 | 10 ++++-- samples/MusicStore.Standalone/project.json | 36 +++++++++++----------- samples/MusicStore/project.json | 36 +++++++++++----------- test/E2ETests/project.json | 24 +++++++-------- test/MusicStore.Test/project.json | 4 +-- 8 files changed, 64 insertions(+), 57 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 0114595..b427416 100644 --- a/global.json +++ b/global.json @@ -1,3 +1,9 @@ -{ - "projects": [ "samples", "test" ] +{ + "projects": [ + "samples", + "test" + ], + "sdk": { + "version": "1.0.0-preview2-1-003177" + } } \ No newline at end of file diff --git a/samples/MusicStore.Standalone/project.json b/samples/MusicStore.Standalone/project.json index e166646..4714712 100644 --- a/samples/MusicStore.Standalone/project.json +++ b/samples/MusicStore.Standalone/project.json @@ -44,29 +44,29 @@ } }, "dependencies": { - "Microsoft.AspNetCore": "1.1.0", - "Microsoft.AspNetCore.Authentication.Cookies": "1.1.0", - "Microsoft.AspNetCore.Authentication.Facebook": "1.1.0", - "Microsoft.AspNetCore.Authentication.Google": "1.1.0", - "Microsoft.AspNetCore.Authentication.MicrosoftAccount": "1.1.0", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.1.0", - "Microsoft.AspNetCore.Authentication.Twitter": "1.1.0", - "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.1.0", - "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.1.0", - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.Mvc.TagHelpers": "1.1.0", - "Microsoft.AspNetCore.Server.WebListener": "1.1.0", - "Microsoft.AspNetCore.Session": "1.1.0", - "Microsoft.AspNetCore.StaticFiles": "1.1.0", - "Microsoft.EntityFrameworkCore.InMemory": "1.1.0", - "Microsoft.EntityFrameworkCore.SqlServer": "1.1.0", - "Microsoft.Extensions.Configuration.CommandLine": "1.1.0" + "Microsoft.AspNetCore": "1.1.1", + "Microsoft.AspNetCore.Authentication.Cookies": "1.1.1", + "Microsoft.AspNetCore.Authentication.Facebook": "1.1.1", + "Microsoft.AspNetCore.Authentication.Google": "1.1.1", + "Microsoft.AspNetCore.Authentication.MicrosoftAccount": "1.1.1", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.1.1", + "Microsoft.AspNetCore.Authentication.Twitter": "1.1.1", + "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.1.1", + "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.1.1", + "Microsoft.AspNetCore.Mvc": "1.1.2", + "Microsoft.AspNetCore.Mvc.TagHelpers": "1.1.2", + "Microsoft.AspNetCore.Server.WebListener": "1.1.1", + "Microsoft.AspNetCore.Session": "1.1.1", + "Microsoft.AspNetCore.StaticFiles": "1.1.1", + "Microsoft.EntityFrameworkCore.InMemory": "1.1.1", + "Microsoft.EntityFrameworkCore.SqlServer": "1.1.1", + "Microsoft.Extensions.Configuration.CommandLine": "1.1.1" }, "frameworks": { "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.1.0" + "version": "1.1.1" } } } diff --git a/samples/MusicStore/project.json b/samples/MusicStore/project.json index 5ee31c0..246d95b 100644 --- a/samples/MusicStore/project.json +++ b/samples/MusicStore/project.json @@ -33,30 +33,30 @@ ] }, "dependencies": { - "Microsoft.AspNetCore": "1.1.0", - "Microsoft.AspNetCore.Authentication.Cookies": "1.1.0", - "Microsoft.AspNetCore.Authentication.Facebook": "1.1.0", - "Microsoft.AspNetCore.Authentication.Google": "1.1.0", - "Microsoft.AspNetCore.Authentication.MicrosoftAccount": "1.1.0", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.1.0", - "Microsoft.AspNetCore.Authentication.Twitter": "1.1.0", - "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.1.0", - "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.1.0", - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.Mvc.TagHelpers": "1.1.0", - "Microsoft.AspNetCore.Server.WebListener": "1.1.0", - "Microsoft.AspNetCore.Session": "1.1.0", - "Microsoft.AspNetCore.StaticFiles": "1.1.0", - "Microsoft.EntityFrameworkCore.InMemory": "1.1.0", - "Microsoft.EntityFrameworkCore.SqlServer": "1.1.0", - "Microsoft.Extensions.Configuration.CommandLine": "1.1.0" + "Microsoft.AspNetCore": "1.1.1", + "Microsoft.AspNetCore.Authentication.Cookies": "1.1.1", + "Microsoft.AspNetCore.Authentication.Facebook": "1.1.1", + "Microsoft.AspNetCore.Authentication.Google": "1.1.1", + "Microsoft.AspNetCore.Authentication.MicrosoftAccount": "1.1.1", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.1.1", + "Microsoft.AspNetCore.Authentication.Twitter": "1.1.1", + "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.1.1", + "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.1.1", + "Microsoft.AspNetCore.Mvc": "1.1.2", + "Microsoft.AspNetCore.Mvc.TagHelpers": "1.1.2", + "Microsoft.AspNetCore.Server.WebListener": "1.1.1", + "Microsoft.AspNetCore.Session": "1.1.1", + "Microsoft.AspNetCore.StaticFiles": "1.1.1", + "Microsoft.EntityFrameworkCore.InMemory": "1.1.1", + "Microsoft.EntityFrameworkCore.SqlServer": "1.1.1", + "Microsoft.Extensions.Configuration.CommandLine": "1.1.1" }, "frameworks": { "net451": {}, "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.1.0", + "version": "1.1.1", "type": "platform" } } diff --git a/test/E2ETests/project.json b/test/E2ETests/project.json index 7d311f4..2cf06d5 100644 --- a/test/E2ETests/project.json +++ b/test/E2ETests/project.json @@ -4,19 +4,19 @@ }, "dependencies": { "dotnet-test-xunit": "2.2.0-*", - "Microsoft.AspNetCore.Authentication.Cookies": "1.1.0", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.1.0", - "Microsoft.AspNetCore.Identity": "1.1.0", - "Microsoft.AspNetCore.Server.IntegrationTesting": "0.2.0-rtm-22752", - "Microsoft.AspNetCore.WebUtilities": "1.1.0", - "Microsoft.Extensions.Configuration.Binder": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Configuration.UserSecrets": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", + "Microsoft.AspNetCore.Authentication.Cookies": "1.1.1", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.1.1", + "Microsoft.AspNetCore.Identity": "1.1.1", + "Microsoft.AspNetCore.Server.IntegrationTesting": "0.2.1", + "Microsoft.AspNetCore.WebUtilities": "1.1.1", + "Microsoft.Extensions.Configuration.Binder": "1.1.1", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.1", + "Microsoft.Extensions.Configuration.Json": "1.1.1", + "Microsoft.Extensions.Configuration.UserSecrets": "1.1.1", + "Microsoft.Extensions.Logging": "1.1.1", + "Microsoft.Extensions.Logging.Console": "1.1.1", "Microsoft.NETCore.App": { - "version": "1.1.0", + "version": "1.1.1", "type": "platform" }, "System.Data.SqlClient": "4.3.0", diff --git a/test/MusicStore.Test/project.json b/test/MusicStore.Test/project.json index 699f26a..7420008 100644 --- a/test/MusicStore.Test/project.json +++ b/test/MusicStore.Test/project.json @@ -5,7 +5,7 @@ "dependencies": { "dotnet-test-xunit": "2.2.0-*", "Microsoft.DotNet.InternalAbstractions": "1.0.0", - "Microsoft.Extensions.Logging.Testing": "1.1.0-rtm-22752", + "Microsoft.Extensions.Logging.Testing": "1.1.1", "MusicStore": "1.1.0-*", "xunit": "2.2.0-*" }, @@ -13,7 +13,7 @@ "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.1.0", + "version": "1.1.1", "type": "platform" } }