From 96b767154846069dfe64606e17d35f418b650e41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Chalet?= Date: Tue, 19 Apr 2016 18:08:16 +0200 Subject: [PATCH] Use ASP.NET Core RC2 and aspnet-contrib release packages --- NuGet.config | 2 +- README.md | 8 ++------ build.ps1 | 2 +- build.sh | 2 +- external/NWebsec/project.json | 4 ++-- samples/Mvc.Client/project.json | 26 ++++++++++++------------ samples/Mvc.Server/project.json | 32 +++++++++++++++--------------- src/OpenIddict.Assets/project.json | 4 ++-- src/OpenIddict.Core/project.json | 10 +++++----- src/OpenIddict.EF/project.json | 2 +- src/OpenIddict.Models/project.json | 2 +- src/OpenIddict.Mvc/project.json | 8 ++++---- 12 files changed, 49 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index 91bc2845..c1d273a6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,7 +1,7 @@ - + diff --git a/README.md b/README.md index 4be43451..25da35ef 100644 --- a/README.md +++ b/README.md @@ -35,11 +35,7 @@ Note: OpenIddict uses **[EntityFramework 7](https://github.com/aspnet/EntityFram To use OpenIddict, you need to: - - **Install [.NET CLI](https://github.com/dotnet/cli/) or the latest DNX runtime and update your packages to reference the RC2 nightly builds** (make sure to run these commands in a good old console, not in a PowerShell instance, as it doesn't support the SET command): -``` -set DNX_UNSTABLE_FEED=https://www.myget.org/F/aspnetcidev/ -dnvm upgrade -u -``` + - **Install the latest [.NET CLI](https://github.com/dotnet/cli/) bits and update your packages to reference the RC2 release builds**. - **Have an existing project or create a new one**: when creating a new project using Visual Studio's default ASP.NET Core template, using **individual user accounts authentication** is strongly recommended. When updating an existing project, you must provide your own `AccountController` to handle the registration process and the authentication flow. @@ -49,7 +45,7 @@ dnvm upgrade -u - + diff --git a/build.ps1 b/build.ps1 index 4fd24a30..513d502d 100644 --- a/build.ps1 +++ b/build.ps1 @@ -3,7 +3,7 @@ cd $PSScriptRoot $repoFolder = $PSScriptRoot $env:REPO_FOLDER = $repoFolder -$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip" +$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/release.zip" if ($env:KOREBUILD_ZIP) { $koreBuildZip=$env:KOREBUILD_ZIP diff --git a/build.sh b/build.sh index 095da3c6..62c278b9 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/dev.zip" +koreBuildZip="https://github.com/aspnet/KoreBuild/archive/release.zip" if [ ! -z $KOREBUILD_ZIP ]; then koreBuildZip=$KOREBUILD_ZIP fi diff --git a/external/NWebsec/project.json b/external/NWebsec/project.json index de35061c..b27f7849 100644 --- a/external/NWebsec/project.json +++ b/external/NWebsec/project.json @@ -18,8 +18,8 @@ "netstandard1.3": { "dependencies": { - "Microsoft.CSharp": "4.0.1-*", - "System.Runtime": "4.1.0-*" + "Microsoft.CSharp": "4.0.1-rc2-*", + "System.Runtime": "4.1.0-rc2-*" }, "imports": [ diff --git a/samples/Mvc.Client/project.json b/samples/Mvc.Client/project.json index 61c66da1..5a66e8b2 100644 --- a/samples/Mvc.Client/project.json +++ b/samples/Mvc.Client/project.json @@ -6,18 +6,18 @@ }, "dependencies": { - "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "0.1.0-*", - "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", - "Microsoft.AspNetCore.HttpOverrides": "1.0.0-*", - "Microsoft.AspNetCore.Hosting": "1.0.0-*", - "Microsoft.AspNetCore.Mvc": "1.0.0-*", - "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", - "Microsoft.AspNetCore.StaticFiles": "1.0.0-*", - "Microsoft.Extensions.Logging.Console": "1.0.0-*", - "Microsoft.Extensions.Logging.Debug": "1.0.0-*" + "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-rc2-*", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "0.1.0-rc2-*", + "Microsoft.AspNetCore.Diagnostics": "1.0.0-rc2-*", + "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-rc2-*", + "Microsoft.AspNetCore.HttpOverrides": "1.0.0-rc2-*", + "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-*", + "Microsoft.AspNetCore.Mvc": "1.0.0-rc2-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-rc2-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-*", + "Microsoft.AspNetCore.StaticFiles": "1.0.0-rc2-*", + "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-*", + "Microsoft.Extensions.Logging.Debug": "1.0.0-rc2-*" }, "frameworks": { @@ -29,7 +29,7 @@ "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": { "type": "platform", "version": "1.0.0-*" } + "Microsoft.NETCore.App": { "type": "platform", "version": "1.0.0-rc2-*" } }, "imports": [ diff --git a/samples/Mvc.Server/project.json b/samples/Mvc.Server/project.json index 75eafa54..50f2b843 100644 --- a/samples/Mvc.Server/project.json +++ b/samples/Mvc.Server/project.json @@ -6,21 +6,21 @@ }, "dependencies": { - "AspNet.Security.OAuth.GitHub": "1.0.0-*", - "AspNet.Security.OAuth.Introspection": "1.0.0-*", - "AspNet.Security.OAuth.Validation": "1.0.0-*", - "Microsoft.AspNetCore.Authentication.Google": "1.0.0-*", - "Microsoft.AspNetCore.Authentication.Twitter": "1.0.0-*", - "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", - "Microsoft.AspNetCore.HttpOverrides": "1.0.0-*", - "Microsoft.AspNetCore.Mvc": "1.0.0-*", - "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", - "Microsoft.AspNetCore.StaticFiles": "1.0.0-*", - "Microsoft.EntityFrameworkCore.SqlServer": "1.0.0-*", - "Microsoft.Extensions.Logging.Console": "1.0.0-*", - "Microsoft.Extensions.Logging.Debug": "1.0.0-*", + "AspNet.Security.OAuth.GitHub": "1.0.0-alpha4-*", + "AspNet.Security.OAuth.Introspection": "1.0.0-alpha1-*", + "AspNet.Security.OAuth.Validation": "1.0.0-alpha1-*", + "Microsoft.AspNetCore.Authentication.Google": "1.0.0-rc2-*", + "Microsoft.AspNetCore.Authentication.Twitter": "1.0.0-rc2-*", + "Microsoft.AspNetCore.Diagnostics": "1.0.0-rc2-*", + "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-rc2-*", + "Microsoft.AspNetCore.HttpOverrides": "1.0.0-rc2-*", + "Microsoft.AspNetCore.Mvc": "1.0.0-rc2-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-rc2-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-*", + "Microsoft.AspNetCore.StaticFiles": "1.0.0-rc2-*", + "Microsoft.EntityFrameworkCore.SqlServer": "1.0.0-rc2-*", + "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-*", + "Microsoft.Extensions.Logging.Debug": "1.0.0-rc2-*", "OpenIddict": "1.0.0-*" }, @@ -33,7 +33,7 @@ "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": { "type": "platform", "version": "1.0.0-*" } + "Microsoft.NETCore.App": { "type": "platform", "version": "1.0.0-rc2-*" } }, "imports": [ diff --git a/src/OpenIddict.Assets/project.json b/src/OpenIddict.Assets/project.json index 06e032ca..467616d4 100644 --- a/src/OpenIddict.Assets/project.json +++ b/src/OpenIddict.Assets/project.json @@ -36,8 +36,8 @@ "dependencies": { "JetBrains.Annotations": { "type": "build", "version": "10.1.2-eap" }, - "Microsoft.AspNetCore.StaticFiles": "1.0.0-*", - "Microsoft.Extensions.FileProviders.Embedded": "1.0.0-*", + "Microsoft.AspNetCore.StaticFiles": "1.0.0-rc2-*", + "Microsoft.Extensions.FileProviders.Embedded": "1.0.0-rc2-*", "OpenIddict.Core": "1.0.0-*" }, diff --git a/src/OpenIddict.Core/project.json b/src/OpenIddict.Core/project.json index 79d33461..6e135054 100644 --- a/src/OpenIddict.Core/project.json +++ b/src/OpenIddict.Core/project.json @@ -29,13 +29,13 @@ }, "dependencies": { - "AspNet.Security.OpenIdConnect.Server": "1.0.0-*", + "AspNet.Security.OpenIdConnect.Server": "1.0.0-beta5-*", "CryptoHelper": "1.0.0-rc2-build04", "JetBrains.Annotations": { "type": "build", "version": "10.1.2-eap" }, - "Microsoft.AspNetCore.Cors": "1.0.0-*", - "Microsoft.AspNetCore.Identity": "1.0.0-*", - "Microsoft.Extensions.Configuration": "1.0.0-*", - "Microsoft.Extensions.Caching.Memory": "1.0.0-*" + "Microsoft.AspNetCore.Cors": "1.0.0-rc2-*", + "Microsoft.AspNetCore.Identity": "1.0.0-rc2-*", + "Microsoft.Extensions.Configuration": "1.0.0-rc2-*", + "Microsoft.Extensions.Caching.Memory": "1.0.0-rc2-*" }, "frameworks": { diff --git a/src/OpenIddict.EF/project.json b/src/OpenIddict.EF/project.json index 78a88613..47a9d4f4 100644 --- a/src/OpenIddict.EF/project.json +++ b/src/OpenIddict.EF/project.json @@ -30,7 +30,7 @@ "dependencies": { "JetBrains.Annotations": { "type": "build", "version": "10.1.2-eap" }, - "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0-*", + "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0-rc2-*", "OpenIddict.Core": "1.0.0-*", "OpenIddict.Models": "1.0.0-*" }, diff --git a/src/OpenIddict.Models/project.json b/src/OpenIddict.Models/project.json index 191ff578..a36ead4b 100644 --- a/src/OpenIddict.Models/project.json +++ b/src/OpenIddict.Models/project.json @@ -33,7 +33,7 @@ "netstandard1.3": { "dependencies": { - "System.Runtime": "4.1.0-*" + "System.Runtime": "4.1.0-rc2-*" }, "imports": [ diff --git a/src/OpenIddict.Mvc/project.json b/src/OpenIddict.Mvc/project.json index 1bea2773..44cdff6b 100644 --- a/src/OpenIddict.Mvc/project.json +++ b/src/OpenIddict.Mvc/project.json @@ -31,11 +31,11 @@ "resource": "Views/**", "dependencies": { - "AspNet.Hosting.Extensions": "1.0.0-*", + "AspNet.Hosting.Extensions": "1.0.0-alpha2-*", "JetBrains.Annotations": { "type": "build", "version": "10.1.2-eap" }, - "Microsoft.AspNetCore.Mvc": "1.0.0-*", - "Microsoft.Extensions.FileProviders.Embedded": "1.0.0-*", - "Microsoft.Extensions.FileProviders.Composite": "1.0.0-*", + "Microsoft.AspNetCore.Mvc": "1.0.0-rc2-*", + "Microsoft.Extensions.FileProviders.Embedded": "1.0.0-rc2-*", + "Microsoft.Extensions.FileProviders.Composite": "1.0.0-rc2-*", "OpenIddict.Core": "1.0.0-*" },