From 07263aa92e656d1e3f86b3e18e352f3320863a76 Mon Sep 17 00:00:00 2001 From: John Luo Date: Thu, 7 Apr 2016 15:38:44 -0700 Subject: [PATCH] Move web.config and use ANCM --- samples/IdentitySample.Mvc/Startup.cs | 1 + samples/IdentitySample.Mvc/project.json | 21 ++++++++----------- samples/IdentitySample.Mvc/web.config | 9 ++++++++ samples/IdentitySample.Mvc/wwwroot/web.config | 9 -------- 4 files changed, 19 insertions(+), 21 deletions(-) create mode 100644 samples/IdentitySample.Mvc/web.config delete mode 100644 samples/IdentitySample.Mvc/wwwroot/web.config diff --git a/samples/IdentitySample.Mvc/Startup.cs b/samples/IdentitySample.Mvc/Startup.cs index 4b07cf81be..051ff362bb 100644 --- a/samples/IdentitySample.Mvc/Startup.cs +++ b/samples/IdentitySample.Mvc/Startup.cs @@ -121,6 +121,7 @@ namespace IdentitySample var host = new WebHostBuilder() .UseDefaultHostingConfiguration(args) .UseKestrel() + .UseIISIntegration() .UseStartup() .Build(); diff --git a/samples/IdentitySample.Mvc/project.json b/samples/IdentitySample.Mvc/project.json index 0be5c11d05..00bfb5a2f5 100644 --- a/samples/IdentitySample.Mvc/project.json +++ b/samples/IdentitySample.Mvc/project.json @@ -2,7 +2,7 @@ "authors": [ "Microsoft" ], - "description": "Identity sample MVC application on K", + "description": "Identity sample MVC application on ASP.NET Core", "version": "1.0.0-*", "dependencies": { "Microsoft.AspNetCore.Mvc": "1.0.0-*", @@ -18,6 +18,7 @@ "Microsoft.AspNetCore.Authentication.Twitter": "1.0.0-*", "Microsoft.AspNetCore.Authorization": "1.0.0-*", "Microsoft.AspNetCore.StaticFiles": "1.0.0-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.EntityFrameworkCore.Commands": "1.0.0-*", "Microsoft.EntityFrameworkCore.SqlServer": "1.0.0-*", @@ -31,23 +32,18 @@ "compilationOptions": { "emitEntryPoint": true }, - "commands": { - "web": "IdentitySample.Mvc" - }, "frameworks": { - "net451": { - }, + "net451": {}, "netstandardapp1.5": { "imports": [ "dnxcore50", "portable-net45+win8" - ] + ], + "dependencies": { + "NETStandard.Library": "1.5.0-*" + } } }, - "exclude": [ - "wwwroot", - "node_modules" - ], "scripts": { "prepublish": [ "npm install", @@ -57,6 +53,7 @@ ] }, "content": [ - "appsettings.json" + "appsettings.json", + "web.config" ] } \ No newline at end of file diff --git a/samples/IdentitySample.Mvc/web.config b/samples/IdentitySample.Mvc/web.config new file mode 100644 index 0000000000..e53f780d63 --- /dev/null +++ b/samples/IdentitySample.Mvc/web.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/samples/IdentitySample.Mvc/wwwroot/web.config b/samples/IdentitySample.Mvc/wwwroot/web.config deleted file mode 100644 index 8485f6719f..0000000000 --- a/samples/IdentitySample.Mvc/wwwroot/web.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - -