Skip to content
This repository was archived by the owner on Dec 13, 2018. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
4fca1ff
Pinning versions for 1.1.0 release
pranavkm Nov 18, 2016
6799bf3
Pinning missed tools and dependencies
pranavkm Nov 18, 2016
673df3e
Pin the SDK version in the global.json
Tratcher Jan 19, 2017
e609cda
#1044 Revert "Auth: Always call prior handlers during Challenge"
Tratcher Dec 12, 2016
962950f
#1082 Update IdentityModel dependencies
Tratcher Jan 19, 2017
1d0a6b1
Fix ADAL sample
Tratcher Jan 19, 2017
0f42932
#1046 remove conflicting frameworkAssembly references (#1096)
Tratcher Feb 2, 2017
8537b61
1.1.2 patch train updates (#1127)
JunTaoLuo Feb 15, 2017
cccfbb7
Disable warning
JunTaoLuo Feb 16, 2017
ea0b79e
Preparing for 1.1.3 patch
pranavkm Apr 11, 2017
dba7299
Update Common to 1.1.1 and cascade version updates
JunTaoLuo Apr 13, 2017
17fa779
Update CoreFX dependencies
JunTaoLuo Apr 26, 2017
f00efc4
Cleanup NuGet.config
smitpatel Jul 10, 2017
5222f3b
Adding patch feed
pranavkm Aug 22, 2017
04d3136
Bump versions to 1.1.3
Aug 25, 2017
72aedaa
Update Hosting to 1.1.3
jkotalik Aug 25, 2017
6fbac4e
Updating CoreFx \ CoreCLR package references
pranavkm Aug 29, 2017
74b7816
Updating CoreFx \ CoreCLR package references
pranavkm Aug 31, 2017
6239174
Updating CoreFx \ CoreCLR package references
pranavkm Aug 31, 2017
4337f40
Updating CoreFx \ CoreCLR package references
pranavkm Sep 6, 2017
9ab1898
Update Microsoft.NETCore.App to 1.1.4
JunTaoLuo Sep 15, 2017
dbfd015
Patch 1.1.5 update versions
JunTaoLuo Oct 11, 2017
5ad0024
Update dependencies to the latest patch
Oct 16, 2017
8e6dff6
January Patch Update
JunTaoLuo Dec 9, 2017
5594337
Update runtime verstion
JunTaoLuo Dec 14, 2017
eb6f964
February 2017 patch updates
Jan 17, 2018
5636a26
Updating core package versions for Feb 2018 patch
Jan 18, 2018
ce3898e
Update core package versions for Mar 2018 patch
Feb 14, 2018
556670a
Update core dependencies - Apr 2018
Mar 26, 2018
dfd4ce0
Update core dependencies - Apr 2018
Mar 26, 2018
2c3629b
Update build script to set TLS version
Mar 26, 2018
50bb06c
Update to 1.1.8 runtime
Mar 28, 2018
87a1b3e
July 2018 Updates
Jun 7, 2018
b0ba381
Update runtime version
Jun 13, 2018
d5370df
Update runtime
Jun 14, 2018
305a60c
Update to stabilized runtime
Jun 21, 2018
321a33d
Update core package versions for Oct 2018 patch
Aug 29, 2018
45d7edc
Consume stabilized packages
Sep 18, 2018
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions NuGet.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-ci-release/api/v3/index.json" />
<clear />
<add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json" />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
<add key="AspNetCorePatch" value="https://dotnet.myget.org/F/aspnet-1-1-3-september2017-patch/api/v3/index.json" />
</packageSources>
</configuration>
</configuration>
6 changes: 4 additions & 2 deletions build.ps1
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
$ErrorActionPreference = "Stop"

function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $retries)
Expand Down Expand Up @@ -33,7 +34,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 +65,5 @@ 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 "$@"
5 changes: 4 additions & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{
"projects": ["src"]
"projects": ["src"],
"sdk": {
"version": "1.0.0-preview2-1-003177"
}
}
16 changes: 8 additions & 8 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.3",
"Microsoft.AspNetCore.DataProtection": "1.1.3",
"Microsoft.AspNetCore.Server.IISIntegration": "1.1.4",
"Microsoft.AspNetCore.Server.Kestrel": "1.1.3",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.2",
"Microsoft.Extensions.Logging.Console": "1.1.2"
},
"buildOptions": {
"emitEntryPoint": true
Expand All @@ -15,7 +15,7 @@
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",
"version": "1.1.10",
"type": "platform"
}
}
Expand All @@ -27,7 +27,7 @@
]
},
"tools": {
"Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*"
"Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.1.0-preview4-final"
},
"scripts": {
"postpublish": "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%"
Expand Down
18 changes: 9 additions & 9 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.3",
"Microsoft.AspNetCore.DataProtection": "1.1.3",
"Microsoft.AspNetCore.Server.IISIntegration": "1.1.4",
"Microsoft.AspNetCore.Server.Kestrel": "1.1.3",
"Microsoft.Extensions.Caching.Memory": "1.1.2",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.2",
"Microsoft.Extensions.Logging.Console": "1.1.2"
},
"buildOptions": {
"emitEntryPoint": true
Expand All @@ -16,7 +16,7 @@
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",
"version": "1.1.10",
"type": "platform"
}
}
Expand All @@ -28,7 +28,7 @@
]
},
"tools": {
"Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*"
"Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.1.0-preview4-final"
},
"scripts": {
"postpublish": "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%"
Expand Down
2 changes: 2 additions & 0 deletions samples/JwtBearerSample/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ public Startup(IHostingEnvironment env)
if (env.IsDevelopment())
{
// For more details on using the user secret store see http://go.microsoft.com/fwlink/?LinkID=532709
#pragma warning disable CS0618
builder.AddUserSecrets();
#pragma warning restore CS0618
}

builder.AddEnvironmentVariables();
Expand Down
16 changes: 8 additions & 8 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.3",
"Microsoft.AspNetCore.Server.IISIntegration": "1.1.4",
"Microsoft.AspNetCore.Server.Kestrel": "1.1.3",
"Microsoft.AspNetCore.StaticFiles": "1.1.3",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.2",
"Microsoft.Extensions.Configuration.UserSecrets": "1.1.2"
},
"frameworks": {
"net451": {},
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",
"version": "1.1.10",
"type": "platform"
}
}
Expand All @@ -31,7 +31,7 @@
},
"userSecretsId": "aspnet5-JwtBearerSample-20151210102827",
"tools": {
"Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*"
"Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.1.0-preview4-final"
},
"scripts": {
"postpublish": "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%"
Expand Down
4 changes: 3 additions & 1 deletion samples/OpenIdConnect.AzureAdSample/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ public Startup(IHostingEnvironment env)
if (env.IsDevelopment())
{
// For more details on using the user secret store see http://go.microsoft.com/fwlink/?LinkID=532709
#pragma warning disable CS0618
builder.AddUserSecrets();
#pragma warning restore CS0618
}

builder.AddEnvironmentVariables();
Expand Down Expand Up @@ -95,7 +97,7 @@ public void Configure(IApplicationBuilder app, ILoggerFactory loggerfactory)
var result = await authContext.AcquireTokenByAuthorizationCodeAsync(
context.ProtocolMessage.Code, new Uri(currentUri), credential, resource);

context.HandleCodeRedemption();
context.HandleCodeRedemption(result.AccessToken, result.IdToken);
}
}
});
Expand Down
22 changes: 11 additions & 11 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.IdentityModel.Clients.ActiveDirectory": "3.13.4"
"Microsoft.AspNetCore.Authentication.Cookies": "1.1.3",
"Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.1.3",
"Microsoft.AspNetCore.Server.IISIntegration": "1.1.4",
"Microsoft.AspNetCore.Server.Kestrel": "1.1.3",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.2",
"Microsoft.Extensions.Configuration.UserSecrets": "1.1.2",
"Microsoft.Extensions.Logging.Console": "1.1.2",
"Microsoft.IdentityModel.Clients.ActiveDirectory": "3.13.8"
},
"frameworks": {
"net451": {},
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",
"version": "1.1.10",
"type": "platform"
}
}
Expand All @@ -31,8 +31,8 @@
},
"userSecretsId": "aspnet5-OpenIdConnectSample-20151210110318",
"tools": {
"Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*",
"Microsoft.Extensions.SecretManager.Tools": "1.0.0-*"
"Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.1.0-preview4-final",
"Microsoft.Extensions.SecretManager.Tools": "1.1.0-preview4-final"
},
"scripts": {
"postpublish": "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%"
Expand Down
2 changes: 2 additions & 0 deletions samples/OpenIdConnectSample/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ public Startup(IHostingEnvironment env)
if (env.IsDevelopment())
{
// For more details on using the user secret store see http://go.microsoft.com/fwlink/?LinkID=532709
#pragma warning disable CS0618
builder.AddUserSecrets();
#pragma warning restore CS0618
}

builder.AddEnvironmentVariables();
Expand Down
26 changes: 13 additions & 13 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.Extensions.FileProviders.Embedded": "1.1.0-*",
"Microsoft.Extensions.Logging.Console": "1.1.0-*",
"Microsoft.Extensions.Logging.Debug": "1.1.0-*"
"Microsoft.AspNetCore.Authentication.Cookies": "1.1.3",
"Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.1.3",
"Microsoft.AspNetCore.Server.IISIntegration": "1.1.4",
"Microsoft.AspNetCore.Server.Kestrel": "1.1.3",
"Microsoft.AspNetCore.Server.Kestrel.Https": "1.1.3",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.2",
"Microsoft.Extensions.Configuration.UserSecrets": "1.1.2",
"Microsoft.Extensions.FileProviders.Embedded": "1.1.1",
"Microsoft.Extensions.Logging.Console": "1.1.2",
"Microsoft.Extensions.Logging.Debug": "1.1.2"
},
"frameworks": {
"net451": {},
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",
"version": "1.1.10",
"type": "platform"
}
}
Expand All @@ -33,8 +33,8 @@
},
"userSecretsId": "aspnet5-OpenIdConnectSample-20151210110318",
"tools": {
"Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*",
"Microsoft.Extensions.SecretManager.Tools": "1.0.0-*"
"Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.1.0-preview4-final",
"Microsoft.Extensions.SecretManager.Tools": "1.1.0-preview4-final"
},
"scripts": {
"postpublish": "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%"
Expand Down
2 changes: 2 additions & 0 deletions samples/SocialSample/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ public Startup(IHostingEnvironment env)
if (env.IsDevelopment())
{
// For more details on using the user secret store see http://go.microsoft.com/fwlink/?LinkID=532709
#pragma warning disable CS0618
builder.AddUserSecrets();
#pragma warning restore CS0618
}

builder.AddEnvironmentVariables();
Expand Down
30 changes: 15 additions & 15 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.Extensions.FileProviders.Embedded": "1.1.0-*",
"Microsoft.Extensions.Logging.Console": "1.1.0-*"
"Microsoft.AspNetCore.Authentication.Cookies": "1.1.3",
"Microsoft.AspNetCore.Authentication.Facebook": "1.1.3",
"Microsoft.AspNetCore.Authentication.Google": "1.1.3",
"Microsoft.AspNetCore.Authentication.MicrosoftAccount": "1.1.3",
"Microsoft.AspNetCore.Authentication.Twitter": "1.1.3",
"Microsoft.AspNetCore.DataProtection": "1.1.3",
"Microsoft.AspNetCore.Server.IISIntegration": "1.1.4",
"Microsoft.AspNetCore.Server.Kestrel": "1.1.3",
"Microsoft.AspNetCore.Server.Kestrel.Https": "1.1.3",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.2",
"Microsoft.Extensions.Configuration.UserSecrets": "1.1.2",
"Microsoft.Extensions.FileProviders.Embedded": "1.1.1",
"Microsoft.Extensions.Logging.Console": "1.1.2"
},
"buildOptions": {
"emitEntryPoint": true
Expand All @@ -22,7 +22,7 @@
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",
"version": "1.1.10",
"type": "platform"
}
}
Expand All @@ -36,7 +36,7 @@
]
},
"tools": {
"Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*"
"Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.1.0-preview4-final"
},
"scripts": {
"postpublish": "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%"
Expand Down
14 changes: 7 additions & 7 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.3",
"description": "ASP.NET Core middleware that enables an application to use cookie based authentication.",
"packOptions": {
"repository": {
Expand All @@ -24,18 +24,18 @@
]
},
"dependencies": {
"Microsoft.AspNetCore.Authentication": "1.1.0-*",
"Microsoft.AspNetCore.Authentication": "1.1.3",
"Microsoft.AspNetCore.ChunkingCookieManager.Sources": {
"version": "1.1.0-*",
"version": "1.1.3",
"type": "build"
},
"Microsoft.Extensions.Options": "1.1.0-*",
"Microsoft.Extensions.Options": "1.1.2",
"Microsoft.Extensions.TaskCache.Sources": {
"version": "1.1.0-*",
"version": "1.1.1",
"type": "build"
},
"Microsoft.Extensions.WebEncoders": "1.1.0-*",
"NETStandard.Library": "1.6.1-*"
"Microsoft.Extensions.WebEncoders": "1.1.2",
"NETStandard.Library": "1.6.1"
},
"frameworks": {
"net451": {},
Expand Down
Loading