diff --git a/samples/DatabaseErrorPageSample/Startup.cs b/samples/DatabaseErrorPageSample/Startup.cs index 5c46f74cf9..4a1186c260 100644 --- a/samples/DatabaseErrorPageSample/Startup.cs +++ b/samples/DatabaseErrorPageSample/Startup.cs @@ -31,7 +31,7 @@ namespace DatabaseErrorPageSample var host = new WebHostBuilder() .UseDefaultHostingConfiguration(args) .UseKestrel() - .UseIISPlatformHandlerUrl() + .UseIISIntegration() .UseStartup() .Build(); diff --git a/samples/DatabaseErrorPageSample/project.json b/samples/DatabaseErrorPageSample/project.json index 218cd36c31..9f72cc8054 100644 --- a/samples/DatabaseErrorPageSample/project.json +++ b/samples/DatabaseErrorPageSample/project.json @@ -2,7 +2,7 @@ "dependencies": { "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0-*", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.EntityFrameworkCore.SqlServer": "1.0.0-*", "Microsoft.EntityFrameworkCore.Commands": "1.0.0-*", @@ -11,16 +11,19 @@ "compilationOptions": { "emitEntryPoint": true }, - "commands": { - "web": "DatabaseErrorPageSample" - }, "frameworks": { "net451": {}, "netstandardapp1.5": { "imports": [ "dnxcore50", "portable-net451+win8" - ] + ], + "dependencies": { + "NETStandard.Library": "1.5.0-*" + } } - } + }, + "content": [ + "web.config" + ] } \ No newline at end of file diff --git a/samples/DatabaseErrorPageSample/web.config b/samples/DatabaseErrorPageSample/web.config new file mode 100644 index 0000000000..d26ed7c2a6 --- /dev/null +++ b/samples/DatabaseErrorPageSample/web.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/samples/DatabaseErrorPageSample/wwwroot/Readme.md b/samples/DatabaseErrorPageSample/wwwroot/Readme.md deleted file mode 100644 index 9686df1c05..0000000000 --- a/samples/DatabaseErrorPageSample/wwwroot/Readme.md +++ /dev/null @@ -1 +0,0 @@ -Sample demonstrating ErrorPage middleware. \ No newline at end of file diff --git a/samples/DatabaseErrorPageSample/wwwroot/web.config b/samples/DatabaseErrorPageSample/wwwroot/web.config deleted file mode 100644 index 9a0d90abf8..0000000000 --- a/samples/DatabaseErrorPageSample/wwwroot/web.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/samples/DeveloperExceptionPageSample/Startup.cs b/samples/DeveloperExceptionPageSample/Startup.cs index 60e4ff82b2..5c723b6edc 100644 --- a/samples/DeveloperExceptionPageSample/Startup.cs +++ b/samples/DeveloperExceptionPageSample/Startup.cs @@ -24,7 +24,7 @@ namespace DeveloperExceptionPageSample var host = new WebHostBuilder() .UseDefaultHostingConfiguration(args) .UseKestrel() - .UseIISPlatformHandlerUrl() + .UseIISIntegration() .UseStartup() .Build(); diff --git a/samples/DeveloperExceptionPageSample/project.json b/samples/DeveloperExceptionPageSample/project.json index 91205efd74..1b413fa3c3 100644 --- a/samples/DeveloperExceptionPageSample/project.json +++ b/samples/DeveloperExceptionPageSample/project.json @@ -1,22 +1,25 @@ { "dependencies": { "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.NETCore.Platforms": "1.0.1-*" }, "compilationOptions": { "emitEntryPoint": true }, - "commands": { - "web": "DeveloperExceptionPageSample" - }, "frameworks": { "net451": {}, "netstandardapp1.5": { "imports": [ "dnxcore50" - ] + ], + "dependencies": { + "NETStandard.Library": "1.5.0-*" + } } - } + }, + "content": [ + "web.config" + ] } \ No newline at end of file diff --git a/samples/DeveloperExceptionPageSample/web.config b/samples/DeveloperExceptionPageSample/web.config new file mode 100644 index 0000000000..6fa7c58643 --- /dev/null +++ b/samples/DeveloperExceptionPageSample/web.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/samples/DeveloperExceptionPageSample/wwwroot/Readme.md b/samples/DeveloperExceptionPageSample/wwwroot/Readme.md deleted file mode 100644 index 9686df1c05..0000000000 --- a/samples/DeveloperExceptionPageSample/wwwroot/Readme.md +++ /dev/null @@ -1 +0,0 @@ -Sample demonstrating ErrorPage middleware. \ No newline at end of file diff --git a/samples/DeveloperExceptionPageSample/wwwroot/web.config b/samples/DeveloperExceptionPageSample/wwwroot/web.config deleted file mode 100644 index 9a0d90abf8..0000000000 --- a/samples/DeveloperExceptionPageSample/wwwroot/web.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/samples/ElmPageSample/Startup.cs b/samples/ElmPageSample/Startup.cs index 17906fa009..0c0bc86e2c 100644 --- a/samples/ElmPageSample/Startup.cs +++ b/samples/ElmPageSample/Startup.cs @@ -32,7 +32,7 @@ namespace ElmPageSample var host = new WebHostBuilder() .UseDefaultHostingConfiguration(args) .UseKestrel() - .UseIISPlatformHandlerUrl() + .UseIISIntegration() .UseStartup() .Build(); diff --git a/samples/ElmPageSample/project.json b/samples/ElmPageSample/project.json index 701ce0b939..8c5920fd41 100644 --- a/samples/ElmPageSample/project.json +++ b/samples/ElmPageSample/project.json @@ -1,23 +1,25 @@ { - "exclude": "wwwroot/**/*.*", "dependencies": { "Microsoft.AspNetCore.Diagnostics.Elm": "0.1.0-*", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.NETCore.Platforms": "1.0.1-*" }, "compilationOptions": { "emitEntryPoint": true }, - "commands": { - "web": "ElmPageSample" - }, "frameworks": { "net451": {}, "netstandardapp1.5": { "imports": [ "dnxcore50" - ] + ], + "dependencies": { + "NETStandard.Library": "1.5.0-*" + } } - } + }, + "content": [ + "web.config" + ] } \ No newline at end of file diff --git a/samples/ElmPageSample/web.config b/samples/ElmPageSample/web.config new file mode 100644 index 0000000000..d1a460bd6e --- /dev/null +++ b/samples/ElmPageSample/web.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/samples/ElmPageSample/wwwroot/Readme.md b/samples/ElmPageSample/wwwroot/Readme.md deleted file mode 100644 index 11abaf5374..0000000000 --- a/samples/ElmPageSample/wwwroot/Readme.md +++ /dev/null @@ -1 +0,0 @@ -Sample demonstrating ElmPageMiddleware \ No newline at end of file diff --git a/samples/ElmPageSample/wwwroot/web.config b/samples/ElmPageSample/wwwroot/web.config deleted file mode 100644 index 9a0d90abf8..0000000000 --- a/samples/ElmPageSample/wwwroot/web.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/samples/ExceptionHandlerSample/Startup.cs b/samples/ExceptionHandlerSample/Startup.cs index ac2ada7782..baa4ab2183 100644 --- a/samples/ExceptionHandlerSample/Startup.cs +++ b/samples/ExceptionHandlerSample/Startup.cs @@ -61,7 +61,7 @@ namespace ExceptionHandlerSample var host = new WebHostBuilder() .UseDefaultHostingConfiguration(args) .UseKestrel() - .UseIISPlatformHandlerUrl() + .UseIISIntegration() .UseStartup() .Build(); diff --git a/samples/ExceptionHandlerSample/project.json b/samples/ExceptionHandlerSample/project.json index 7933fc00ad..27cec96aad 100644 --- a/samples/ExceptionHandlerSample/project.json +++ b/samples/ExceptionHandlerSample/project.json @@ -1,8 +1,7 @@ { - "exclude": "wwwroot/**/*.*", "dependencies": { "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.StaticFiles": "1.0.0-*", "Microsoft.NETCore.Platforms": "1.0.1-*" @@ -10,15 +9,19 @@ "compilationOptions": { "emitEntryPoint": true }, - "commands": { - "web": "ExceptionHandlerSample" - }, "frameworks": { "net451": {}, "netstandardapp1.5": { "imports": [ "dnxcore50" - ] + ], + "dependencies": { + "NETStandard.Library": "1.5.0-*" + } } - } + }, + "content": [ + "wwwroot", + "web.config" + ] } \ No newline at end of file diff --git a/samples/ExceptionHandlerSample/web.config b/samples/ExceptionHandlerSample/web.config new file mode 100644 index 0000000000..3893afb496 --- /dev/null +++ b/samples/ExceptionHandlerSample/web.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/samples/ExceptionHandlerSample/wwwroot/web.config b/samples/ExceptionHandlerSample/wwwroot/web.config deleted file mode 100644 index 9a0d90abf8..0000000000 --- a/samples/ExceptionHandlerSample/wwwroot/web.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/samples/MiddlewareAnalysisSample/Startup.cs b/samples/MiddlewareAnalysisSample/Startup.cs index 843c1acf36..49bcfc1464 100644 --- a/samples/MiddlewareAnalysisSample/Startup.cs +++ b/samples/MiddlewareAnalysisSample/Startup.cs @@ -29,7 +29,6 @@ namespace MiddlewareAnaysisSample // Named via app.UseMiddleware() app.UseDeveloperExceptionPage(); - app.UseIISPlatformHandler(); // Anonymous method inline middleware app.Use((context, next) => @@ -88,7 +87,7 @@ namespace MiddlewareAnaysisSample var host = new WebHostBuilder() .UseDefaultHostingConfiguration(args) .UseKestrel() - .UseIISPlatformHandlerUrl() + .UseIISIntegration() .UseStartup() .Build(); diff --git a/samples/MiddlewareAnalysisSample/project.json b/samples/MiddlewareAnalysisSample/project.json index 7cfd3117bc..5c1dd72566 100644 --- a/samples/MiddlewareAnalysisSample/project.json +++ b/samples/MiddlewareAnalysisSample/project.json @@ -1,7 +1,7 @@ { "dependencies": { "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.MiddlewareAnalysis": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.Extensions.DiagnosticAdapter": "1.0.0-*", @@ -11,15 +11,18 @@ "compilationOptions": { "emitEntryPoint": true }, - "commands": { - "web": "MiddlewareAnalysisSample" - }, "frameworks": { "net451": {}, "netstandardapp1.5": { "imports": [ "dnxcore50" - ] + ], + "dependencies": { + "NETStandard.Library": "1.5.0-*" + } } - } + }, + "content": [ + "web.config" + ] } \ No newline at end of file diff --git a/samples/MiddlewareAnalysisSample/web.config b/samples/MiddlewareAnalysisSample/web.config new file mode 100644 index 0000000000..48d3207d47 --- /dev/null +++ b/samples/MiddlewareAnalysisSample/web.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/samples/MiddlewareAnalysisSample/wwwroot/web.config b/samples/MiddlewareAnalysisSample/wwwroot/web.config deleted file mode 100644 index 9a0d90abf8..0000000000 --- a/samples/MiddlewareAnalysisSample/wwwroot/web.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/samples/RuntimeInfoPageSample/Startup.cs b/samples/RuntimeInfoPageSample/Startup.cs index bd725855f2..95131b8712 100644 --- a/samples/RuntimeInfoPageSample/Startup.cs +++ b/samples/RuntimeInfoPageSample/Startup.cs @@ -24,7 +24,7 @@ namespace RuntimeInfoPageSample var host = new WebHostBuilder() .UseDefaultHostingConfiguration(args) .UseKestrel() - .UseIISPlatformHandlerUrl() + .UseIISIntegration() .UseStartup() .Build(); diff --git a/samples/RuntimeInfoPageSample/project.json b/samples/RuntimeInfoPageSample/project.json index aa2da480ea..1b413fa3c3 100644 --- a/samples/RuntimeInfoPageSample/project.json +++ b/samples/RuntimeInfoPageSample/project.json @@ -1,23 +1,25 @@ { - "exclude": "wwwroot/**/*.*", "dependencies": { "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.NETCore.Platforms": "1.0.1-*" }, "compilationOptions": { "emitEntryPoint": true }, - "commands": { - "web": "RuntimeInfoPageSample" - }, "frameworks": { "net451": {}, "netstandardapp1.5": { "imports": [ "dnxcore50" - ] + ], + "dependencies": { + "NETStandard.Library": "1.5.0-*" + } } - } + }, + "content": [ + "web.config" + ] } \ No newline at end of file diff --git a/samples/RuntimeInfoPageSample/web.config b/samples/RuntimeInfoPageSample/web.config new file mode 100644 index 0000000000..78af279661 --- /dev/null +++ b/samples/RuntimeInfoPageSample/web.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/samples/RuntimeInfoPageSample/wwwroot/placeholder.html b/samples/RuntimeInfoPageSample/wwwroot/placeholder.html deleted file mode 100644 index 9b8445a4b0..0000000000 --- a/samples/RuntimeInfoPageSample/wwwroot/placeholder.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/samples/RuntimeInfoPageSample/wwwroot/web.config b/samples/RuntimeInfoPageSample/wwwroot/web.config deleted file mode 100644 index 9a0d90abf8..0000000000 --- a/samples/RuntimeInfoPageSample/wwwroot/web.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/samples/StatusCodePagesSample/Startup.cs b/samples/StatusCodePagesSample/Startup.cs index 5ff7e7a211..40ff992178 100644 --- a/samples/StatusCodePagesSample/Startup.cs +++ b/samples/StatusCodePagesSample/Startup.cs @@ -107,7 +107,7 @@ namespace StatusCodePagesSample var host = new WebHostBuilder() .UseDefaultHostingConfiguration(args) .UseKestrel() - .UseIISPlatformHandlerUrl() + .UseIISIntegration() .UseStartup() .Build(); diff --git a/samples/StatusCodePagesSample/project.json b/samples/StatusCodePagesSample/project.json index 14e3e127fa..5a867e2ab8 100644 --- a/samples/StatusCodePagesSample/project.json +++ b/samples/StatusCodePagesSample/project.json @@ -1,23 +1,10 @@ { - "exclude": [ - "wwwroot" - ], - "packExclude": [ - "node_modules", - "bower_components", - "**.kproj", - "**.user", - "**.vspscc" - ], "compilationOptions": { "emitEntryPoint": true }, - "commands": { - "web": "StatusCodePagesSample" - }, "dependencies": { "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.NETCore.Platforms": "1.0.1-*" }, @@ -26,7 +13,13 @@ "netstandardapp1.5": { "imports": [ "dnxcore50" - ] + ], + "dependencies": { + "NETStandard.Library": "1.5.0-*" + } } - } + }, + "content": [ + "web.config" + ] } \ No newline at end of file diff --git a/samples/StatusCodePagesSample/web.config b/samples/StatusCodePagesSample/web.config new file mode 100644 index 0000000000..069947bdba --- /dev/null +++ b/samples/StatusCodePagesSample/web.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/samples/StatusCodePagesSample/wwwroot/placeholder.html b/samples/StatusCodePagesSample/wwwroot/placeholder.html deleted file mode 100644 index 9b8445a4b0..0000000000 --- a/samples/StatusCodePagesSample/wwwroot/placeholder.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/samples/StatusCodePagesSample/wwwroot/web.config b/samples/StatusCodePagesSample/wwwroot/web.config deleted file mode 100644 index 9a0d90abf8..0000000000 --- a/samples/StatusCodePagesSample/wwwroot/web.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/samples/WelcomePageSample/Startup.cs b/samples/WelcomePageSample/Startup.cs index 9388cf826f..b9efcf783b 100644 --- a/samples/WelcomePageSample/Startup.cs +++ b/samples/WelcomePageSample/Startup.cs @@ -15,7 +15,7 @@ namespace WelcomePageSample var host = new WebHostBuilder() .UseDefaultHostingConfiguration(args) .UseKestrel() - .UseIISPlatformHandlerUrl() + .UseIISIntegration() .UseStartup() .Build(); diff --git a/samples/WelcomePageSample/project.json b/samples/WelcomePageSample/project.json index e5881fd2f4..1b413fa3c3 100644 --- a/samples/WelcomePageSample/project.json +++ b/samples/WelcomePageSample/project.json @@ -1,22 +1,25 @@ { "dependencies": { "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.NETCore.Platforms": "1.0.1-*" }, "compilationOptions": { "emitEntryPoint": true }, - "commands": { - "web": "WelcomePageSample" - }, "frameworks": { "net451": {}, "netstandardapp1.5": { "imports": [ "dnxcore50" - ] + ], + "dependencies": { + "NETStandard.Library": "1.5.0-*" + } } - } + }, + "content": [ + "web.config" + ] } \ No newline at end of file diff --git a/samples/WelcomePageSample/web.config b/samples/WelcomePageSample/web.config new file mode 100644 index 0000000000..e626ce1f47 --- /dev/null +++ b/samples/WelcomePageSample/web.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/samples/WelcomePageSample/wwwroot/Readme.md b/samples/WelcomePageSample/wwwroot/Readme.md deleted file mode 100644 index d255fa3701..0000000000 --- a/samples/WelcomePageSample/wwwroot/Readme.md +++ /dev/null @@ -1 +0,0 @@ -Sample demonstrating WelcomePage middleware. \ No newline at end of file diff --git a/samples/WelcomePageSample/wwwroot/web.config b/samples/WelcomePageSample/wwwroot/web.config deleted file mode 100644 index 9a0d90abf8..0000000000 --- a/samples/WelcomePageSample/wwwroot/web.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json index 644d53b6f7..de31efbd3c 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json @@ -4,7 +4,6 @@ "DeveloperExceptionPageSample": "1.0.0", "ElmPageSample": "1.0.0", "ExceptionHandlerSample": "1.0.0", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.TestHost": "1.0.0-*", "Microsoft.AspNetCore.Testing": "1.0.0-*",