Skip to content
This repository has been archived by the owner on Dec 13, 2018. It is now read-only.

Commit

Permalink
1.1.2 patch train updates (#1127)
Browse files Browse the repository at this point in the history
* 1.1.2 patch train updates

* Update global.json and NuGet.config

* Update Microsoft.NETCore.App to 1.1.1

* Update build scripts
  • Loading branch information
JunTaoLuo authored Feb 15, 2017
1 parent 0f42932 commit 8537b61
Show file tree
Hide file tree
Showing 27 changed files with 120 additions and 119 deletions.
3 changes: 2 additions & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
<clear />
<add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
<add key="AspNetCore" value="https://dotnet.myget.org/f/aspnetcore-master/api/v3/index.json" />
<add key="AspNetCore-Patch" value="https://dotnet.myget.org/F/aspnet-1-1-1-patch/api/v3/index.json" />
</packageSources>
</configuration>
</configuration>
4 changes: 2 additions & 2 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -64,4 +64,4 @@ if (!(Test-Path $buildFolder)) {
}
}

&"$buildFile" $args
&"$buildFile" $args
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -43,4 +43,4 @@ if test ! -d $buildFolder; then
fi
fi

$buildFile -r $repoFolder "$@"
$buildFile -r $repoFolder "$@"
14 changes: 7 additions & 7 deletions samples/CookieSample/project.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"dependencies": {
"Microsoft.AspNetCore.Authentication.Cookies": "1.1.0",
"Microsoft.AspNetCore.DataProtection": "1.1.0",
"Microsoft.AspNetCore.Server.IISIntegration": "1.1.0",
"Microsoft.AspNetCore.Server.Kestrel": "1.1.0",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0",
"Microsoft.Extensions.Logging.Console": "1.1.0"
"Microsoft.AspNetCore.Authentication.Cookies": "1.1.1",
"Microsoft.AspNetCore.DataProtection": "1.1.1",
"Microsoft.AspNetCore.Server.IISIntegration": "1.1.1",
"Microsoft.AspNetCore.Server.Kestrel": "1.1.1",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.1",
"Microsoft.Extensions.Logging.Console": "1.1.1"
},
"buildOptions": {
"emitEntryPoint": true
Expand All @@ -15,7 +15,7 @@
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0",
"version": "1.1.1",
"type": "platform"
}
}
Expand Down
16 changes: 8 additions & 8 deletions samples/CookieSessionSample/project.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"dependencies": {
"Microsoft.AspNetCore.Authentication.Cookies": "1.1.0",
"Microsoft.AspNetCore.DataProtection": "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.Extensions.Configuration.EnvironmentVariables": "1.1.0",
"Microsoft.Extensions.Logging.Console": "1.1.0"
"Microsoft.AspNetCore.Authentication.Cookies": "1.1.1",
"Microsoft.AspNetCore.DataProtection": "1.1.1",
"Microsoft.AspNetCore.Server.IISIntegration": "1.1.1",
"Microsoft.AspNetCore.Server.Kestrel": "1.1.1",
"Microsoft.Extensions.Caching.Memory": "1.1.1",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.1",
"Microsoft.Extensions.Logging.Console": "1.1.1"
},
"buildOptions": {
"emitEntryPoint": true
Expand All @@ -16,7 +16,7 @@
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0",
"version": "1.1.1",
"type": "platform"
}
}
Expand Down
14 changes: 7 additions & 7 deletions samples/JwtBearerSample/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.AspNetCore.Authentication.JwtBearer": "1.1.0",
"Microsoft.AspNetCore.Server.IISIntegration": "1.1.0",
"Microsoft.AspNetCore.Server.Kestrel": "1.1.0",
"Microsoft.AspNetCore.StaticFiles": "1.1.0",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0",
"Microsoft.Extensions.Configuration.UserSecrets": "1.1.0"
"Microsoft.AspNetCore.Authentication.JwtBearer": "1.1.1",
"Microsoft.AspNetCore.Server.IISIntegration": "1.1.1",
"Microsoft.AspNetCore.Server.Kestrel": "1.1.1",
"Microsoft.AspNetCore.StaticFiles": "1.1.1",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.1",
"Microsoft.Extensions.Configuration.UserSecrets": "1.1.1"
},
"frameworks": {
"net451": {},
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0",
"version": "1.1.1",
"type": "platform"
}
}
Expand Down
16 changes: 8 additions & 8 deletions samples/OpenIdConnect.AzureAdSample/project.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"dependencies": {
"Microsoft.AspNetCore.Authentication.Cookies": "1.1.0",
"Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.1.0",
"Microsoft.AspNetCore.Server.IISIntegration": "1.1.0",
"Microsoft.AspNetCore.Server.Kestrel": "1.1.0",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0",
"Microsoft.Extensions.Configuration.UserSecrets": "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.Server.IISIntegration": "1.1.1",
"Microsoft.AspNetCore.Server.Kestrel": "1.1.1",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.1",
"Microsoft.Extensions.Configuration.UserSecrets": "1.1.1",
"Microsoft.Extensions.Logging.Console": "1.1.1",
"Microsoft.IdentityModel.Clients.ActiveDirectory": "3.13.8"
},
"frameworks": {
"net451": {},
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0",
"version": "1.1.1",
"type": "platform"
}
}
Expand Down
20 changes: 10 additions & 10 deletions samples/OpenIdConnectSample/project.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"dependencies": {
"Microsoft.AspNetCore.Authentication.Cookies": "1.1.0",
"Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.1.0",
"Microsoft.AspNetCore.Server.IISIntegration": "1.1.0",
"Microsoft.AspNetCore.Server.Kestrel": "1.1.0",
"Microsoft.AspNetCore.Server.Kestrel.Https": "1.1.0",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0",
"Microsoft.Extensions.Configuration.UserSecrets": "1.1.0",
"Microsoft.AspNetCore.Authentication.Cookies": "1.1.1",
"Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.1.1",
"Microsoft.AspNetCore.Server.IISIntegration": "1.1.1",
"Microsoft.AspNetCore.Server.Kestrel": "1.1.1",
"Microsoft.AspNetCore.Server.Kestrel.Https": "1.1.1",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.1",
"Microsoft.Extensions.Configuration.UserSecrets": "1.1.1",
"Microsoft.Extensions.FileProviders.Embedded": "1.1.0",
"Microsoft.Extensions.Logging.Console": "1.1.0",
"Microsoft.Extensions.Logging.Debug": "1.1.0"
"Microsoft.Extensions.Logging.Console": "1.1.1",
"Microsoft.Extensions.Logging.Debug": "1.1.1"
},
"frameworks": {
"net451": {},
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0",
"version": "1.1.1",
"type": "platform"
}
}
Expand Down
26 changes: 13 additions & 13 deletions samples/SocialSample/project.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"dependencies": {
"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.Twitter": "1.1.0",
"Microsoft.AspNetCore.DataProtection": "1.1.0",
"Microsoft.AspNetCore.Server.IISIntegration": "1.1.0",
"Microsoft.AspNetCore.Server.Kestrel": "1.1.0",
"Microsoft.AspNetCore.Server.Kestrel.Https": "1.1.0",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0",
"Microsoft.Extensions.Configuration.UserSecrets": "1.1.0",
"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.Twitter": "1.1.1",
"Microsoft.AspNetCore.DataProtection": "1.1.1",
"Microsoft.AspNetCore.Server.IISIntegration": "1.1.1",
"Microsoft.AspNetCore.Server.Kestrel": "1.1.1",
"Microsoft.AspNetCore.Server.Kestrel.Https": "1.1.1",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.1",
"Microsoft.Extensions.Configuration.UserSecrets": "1.1.1",
"Microsoft.Extensions.FileProviders.Embedded": "1.1.0",
"Microsoft.Extensions.Logging.Console": "1.1.0"
"Microsoft.Extensions.Logging.Console": "1.1.1"
},
"buildOptions": {
"emitEntryPoint": true
Expand All @@ -22,7 +22,7 @@
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0",
"version": "1.1.1",
"type": "platform"
}
}
Expand Down
10 changes: 5 additions & 5 deletions src/Microsoft.AspNetCore.Authentication.Cookies/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.1.0",
"version": "1.1.1",
"description": "ASP.NET Core middleware that enables an application to use cookie based authentication.",
"packOptions": {
"repository": {
Expand All @@ -24,17 +24,17 @@
]
},
"dependencies": {
"Microsoft.AspNetCore.Authentication": "1.1.0",
"Microsoft.AspNetCore.Authentication": "1.1.1",
"Microsoft.AspNetCore.ChunkingCookieManager.Sources": {
"version": "1.1.0-rtm-22752",
"version": "1.1.1",
"type": "build"
},
"Microsoft.Extensions.Options": "1.1.0",
"Microsoft.Extensions.Options": "1.1.1",
"Microsoft.Extensions.TaskCache.Sources": {
"version": "1.1.0-rtm-22752",
"type": "build"
},
"Microsoft.Extensions.WebEncoders": "1.1.0",
"Microsoft.Extensions.WebEncoders": "1.1.1",
"NETStandard.Library": "1.6.1"
},
"frameworks": {
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.AspNetCore.Authentication.Facebook/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.1.0",
"version": "1.1.1",
"description": "ASP.NET Core middleware that enables an application to support Facebook's OAuth 2.0 authentication workflow.",
"packOptions": {
"repository": {
Expand All @@ -21,7 +21,7 @@
"xmlDoc": true
},
"dependencies": {
"Microsoft.AspNetCore.Authentication.OAuth": "1.1.0",
"Microsoft.AspNetCore.Authentication.OAuth": "1.1.1",
"NETStandard.Library": "1.6.1"
},
"frameworks": {
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.AspNetCore.Authentication.Google/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.1.0",
"version": "1.1.1",
"description": "ASP.NET Core contains middleware to support Google's OpenId and OAuth 2.0 authentication workflows.",
"packOptions": {
"repository": {
Expand All @@ -21,7 +21,7 @@
"xmlDoc": true
},
"dependencies": {
"Microsoft.AspNetCore.Authentication.OAuth": "1.1.0",
"Microsoft.AspNetCore.Authentication.OAuth": "1.1.1",
"NETStandard.Library": "1.6.1"
},
"frameworks": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.1.0",
"version": "1.1.1",
"description": "ASP.NET Core middleware that enables an application to receive an OpenID Connect bearer token.",
"packOptions": {
"repository": {
Expand All @@ -21,7 +21,7 @@
"xmlDoc": true
},
"dependencies": {
"Microsoft.AspNetCore.Authentication": "1.1.0",
"Microsoft.AspNetCore.Authentication": "1.1.1",
"Microsoft.Extensions.TaskCache.Sources": {
"version": "1.1.0-rtm-22752",
"type": "build"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.1.0",
"version": "1.1.1",
"description": "ASP.NET Core middleware that enables an application to support the Microsoft Account authentication workflow.",
"packOptions": {
"repository": {
Expand All @@ -21,7 +21,7 @@
"xmlDoc": true
},
"dependencies": {
"Microsoft.AspNetCore.Authentication.OAuth": "1.1.0",
"Microsoft.AspNetCore.Authentication.OAuth": "1.1.1",
"NETStandard.Library": "1.6.1"
},
"frameworks": {
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.AspNetCore.Authentication.OAuth/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.1.0",
"version": "1.1.1",
"description": "ASP.NET Core middleware that enables an application to support any standard OAuth 2.0 authentication workflow.",
"packOptions": {
"repository": {
Expand All @@ -21,7 +21,7 @@
"xmlDoc": true
},
"dependencies": {
"Microsoft.AspNetCore.Authentication": "1.1.0",
"Microsoft.AspNetCore.Authentication": "1.1.1",
"Microsoft.Extensions.TaskCache.Sources": {
"version": "1.1.0-rtm-22752",
"type": "build"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.1.0",
"version": "1.1.1",
"description": "ASP.NET Core middleware that enables an application to support the OpenID Connect authentication workflow.",
"packOptions": {
"repository": {
Expand All @@ -21,7 +21,7 @@
"xmlDoc": true
},
"dependencies": {
"Microsoft.AspNetCore.Authentication": "1.1.0",
"Microsoft.AspNetCore.Authentication": "1.1.1",
"Microsoft.Extensions.TaskCache.Sources": {
"version": "1.1.0-rtm-22752",
"type": "build"
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.AspNetCore.Authentication.Twitter/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.1.0",
"version": "1.1.1",
"description": "ASP.NET Core middleware that enables an application to support Twitter's OAuth 1.0 authentication workflow.",
"packOptions": {
"repository": {
Expand All @@ -21,7 +21,7 @@
"xmlDoc": true
},
"dependencies": {
"Microsoft.AspNetCore.Authentication": "1.1.0",
"Microsoft.AspNetCore.Authentication": "1.1.1",
"Microsoft.Extensions.TaskCache.Sources": {
"version": "1.1.0-rtm-22752",
"type": "build"
Expand Down
Loading

0 comments on commit 8537b61

Please sign in to comment.