Update the generator to use the ASP.NET Core/.NET Core RC2 templates

Author: Lorac

generators/app/templates/AuthenticationDefaults.cs

@@ -4,8 +4,7 @@
  * for more information concerning the license and the contributors participating to this project.
  */
 
-using Microsoft.AspNet.Authentication;
-using Microsoft.AspNet.Authentication.OAuth;
+using Microsoft.AspNetCore.Builder;
 
 namespace AspNet.Security.OAuth.<%= name %> {
     /// <summary>
@@ -18,17 +17,17 @@ public static class <%= name %>AuthenticationDefaults {
         public const string AuthenticationScheme = "<%= name %>";
 
         /// <summary>
-        /// Default value for <see cref="OAuthOptions.DisplayName"/>.
+        /// Default value for <see cref="RemoteAuthenticationOptions.DisplayName"/>.
         /// </summary>
         public const string DisplayName = "<%= name %>";
 
         /// <summary>
-        /// Default value for <see cref="OAuthOptions.ClaimsIssuer"/>.
+        /// Default value for <see cref="AuthenticationOptions.ClaimsIssuer"/>.
         /// </summary>
         public const string Issuer = "<%= name %>";
 
         /// <summary>
-        /// Default value for <see cref="OAuthOptions.CallbackPath"/>.
+        /// Default value for <see cref="RemoteAuthenticationOptions.CallbackPath"/>.
         /// </summary>
         public const string CallbackPath = "/signin-<%= name.toLowerCase() %>";
 

generators/app/templates/AuthenticationHandler.cs

@@ -9,10 +9,11 @@
 using System.Security.Claims;
 using System.Threading.Tasks;
 using AspNet.Security.OAuth.Extensions;
-using Microsoft.AspNet.Authentication;
-using Microsoft.AspNet.Authentication.OAuth;
-using Microsoft.AspNet.Http.Authentication;
-using Microsoft.Extensions.Internal;
+using JetBrains.Annotations;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.OAuth;
+using Microsoft.AspNetCore.Http.Authentication;
+using Microsoft.Extensions.Logging;
 using Newtonsoft.Json.Linq;
 
 namespace AspNet.Security.OAuth.<%= name %> {
@@ -31,7 +32,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync([NotNull]
             response.EnsureSuccessStatusCode();
 
             var payload = JObject.Parse(await response.Content.ReadAsStringAsync());
-            
+
             identity.AddOptionalClaim(ClaimTypes.NameIdentifier, <%= name %>AuthenticationHelper.GetIdentifier(payload), Options.ClaimsIssuer);
 
             // TODO: Add any optional claims, eg
@@ -47,7 +48,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync([NotNull]
             if (context.Principal?.Identity == null) {
                 return null;
             }
-                    
+
             return new AuthenticationTicket(context.Principal, context.Properties, context.Options.AuthenticationScheme);
         }
     }

generators/app/templates/AuthenticationHelper.cs

@@ -4,7 +4,7 @@
  * for more information concerning the license and the contributors participating to this project.
  */
 
-using Microsoft.Extensions.Internal;
+using JetBrains.Annotations;
 using Newtonsoft.Json.Linq;
 
 namespace AspNet.Security.OAuth.<%= name %> {

generators/app/templates/AuthenticationMiddleware.cs

@@ -5,13 +5,13 @@
  */
 
 using System.Text.Encodings.Web;
-using Microsoft.AspNet.Authentication;
-using Microsoft.AspNet.Authentication.OAuth;
-using Microsoft.AspNet.DataProtection;
-using Microsoft.AspNet.Http;
-using Microsoft.Extensions.Internal;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.OAuth;
+using Microsoft.AspNetCore.DataProtection;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.OptionsModel;
+using Microsoft.Extensions.Options;
+using JetBrains.Annotations;
 
 namespace AspNet.Security.OAuth.<%= name %> {
     public class <%= name %>AuthenticationMiddleware : OAuthMiddleware<<%= name %>AuthenticationOptions> {

generators/app/templates/AuthenticationOptions.cs

@@ -4,8 +4,8 @@
  * for more information concerning the license and the contributors participating to this project.
  */
 
-using Microsoft.AspNet.Authentication.OAuth;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
 
 namespace AspNet.Security.OAuth.<%= name %> {
     /// <summary>

generators/app/templates/Project.xproj

@@ -5,16 +5,16 @@
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
 
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>9dfee19e-c170-4f20-93f3-ec952b1532f2</ProjectGuid>
     <RootNamespace>AspNet.Security.OAuth.<%= name %></RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
 
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>

generators/app/templates/project.json

@@ -2,32 +2,48 @@
     "version": "1.0.0-*",
     "description": "ASP.NET 5 security middleware enabling <%= name %> authentication.",
     "authors": [ "<%= authorname %>" ],
+
+  "packOptions": {
     "owners": [ "Kévin Chalet", "Jerrie Pelser" ],
 
     "projectUrl": "https://github.com/aspnet-contrib/AspNet.Security.OAuth.Providers",
+    "iconUrl": "https://avatars3.githubusercontent.com/u/7998081?s=64",
     "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.html",
 
-    "dependencies": {
-        "AspNet.Security.OAuth.Extensions": {
-            "type": "build",
-            "version": "1.0.0-*"
-        },
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet-contrib/AspNet.Security.OAuth.Providers"
+    },
+
+    "tags": [
+      "aspnetcore",
+      "authentication",
+      "<%= name.toLowerCase() %>",
+      "oauth",
+      "security"
+    ]
+  },
 
-        "Microsoft.AspNet.Authentication.OAuth": "1.0.0-*",
+  "buildOptions": {
+    "warningsAsErrors": true,
+    "nowarn": [ "CS1591" ],
+    "xmlDoc": true
+  },
 
-        "Microsoft.Extensions.NotNullAttribute.Sources": {
-            "type": "build",
-            "version": "1.0.0-*"
-        }
-    },
+  "dependencies": {
+    "AspNet.Security.OAuth.Extensions": { "target": "project", "type": "build" },
+    "JetBrains.Annotations": { "type": "build", "version": "10.1.4" },
+    "Microsoft.AspNetCore.Authentication.OAuth": "1.0.0-*"
+  },
 
-    "frameworks": {
-        "dnx451": { },
+  "frameworks": {
+    "net451": { },
 
-        "dnxcore50": {
-            "dependencies": {
-                "System.Security.Claims": "4.0.1-*"
-            }
-        }
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4",
+        "portable-net451+win8"
+      ]
     }
+  }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-aspnet-oauth",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "Yeoman generator for OAuth Providers for ASP.NET 5",
   "license": "MIT",
   "main": "app/index.js",