Move web.config and use ANCM

aspnet · Apr 11, 2016 · 7e8cedf · 7e8cedf
1 parent 5dc5ea5
commit 7e8cedf
Show file tree

Hide file tree

Showing 77 changed files with 336 additions and 239 deletions.
diff --git a/samples/Builder.Filtering.Web/Startup.cs b/samples/Builder.Filtering.Web/Startup.cs
@@ -49,6 +49,7 @@ public static void Main(string[] args)
             var host = new WebHostBuilder()
                 .UseDefaultHostingConfiguration(args)
                 .UseKestrel()
+                .UseIISIntegration()
                 .UseStartup<Startup>()
                 .Build();
 

diff --git a/samples/Builder.Filtering.Web/project.json b/samples/Builder.Filtering.Web/project.json
@@ -1,9 +1,8 @@
 {
   "dependencies": {
     "Microsoft.AspNetCore.Http": "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.Server.WebListener": "0.1.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*"
   },
   "frameworks": {
@@ -20,7 +19,7 @@
   "compilationOptions": {
     "emitEntryPoint": true
   },
-  "commands": {
-    "web": "Builder.Filtering.Web"
-  }
+  "content": [
+    "web.config"
+  ]
 }
diff --git a/samples/Builder.Filtering.Web/web.config b/samples/Builder.Filtering.Web/web.config
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<configuration>
+  <system.webServer>
+    <handlers>
+      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified"/>
+    </handlers>
+    <aspNetCore processPath=".\Builder.Filtering.Web.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
+  </system.webServer>
+</configuration>
diff --git a/samples/Builder.HelloWorld.Web/Startup.cs b/samples/Builder.HelloWorld.Web/Startup.cs
@@ -20,6 +20,7 @@ public static void Main(string[] args)
             var host = new WebHostBuilder()
                 .UseDefaultHostingConfiguration(args)
                 .UseKestrel()
+                .UseIISIntegration()
                 .UseStartup<Startup>()
                 .Build();
 

diff --git a/samples/Builder.HelloWorld.Web/project.json b/samples/Builder.HelloWorld.Web/project.json
@@ -2,8 +2,7 @@
   "dependencies": {
     "Microsoft.AspNetCore.Http": "1.0.0-*",
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
-    "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
-    "Microsoft.AspNetCore.Server.WebListener": "0.1.0-*",
+    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*"
   },
   "frameworks": {
@@ -20,7 +19,7 @@
   "compilationOptions": {
     "emitEntryPoint": true
   },
-  "commands": {
-    "web": "Builder.HelloWorld.Web"
-  }
+  "content": [
+    "web.config"
+  ]
 }
diff --git a/samples/Builder.HelloWorld.Web/web.config b/samples/Builder.HelloWorld.Web/web.config
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<configuration>
+  <system.webServer>
+    <handlers>
+      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified"/>
+    </handlers>
+    <aspNetCore processPath=".\Builder.HelloWorld.Web.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
+  </system.webServer>
+</configuration>
diff --git a/samples/Builder.Middleware.Web/Startup.cs b/samples/Builder.Middleware.Web/Startup.cs
@@ -19,6 +19,7 @@ public static void Main(string[] args)
             var host = new WebHostBuilder()
                 .UseDefaultHostingConfiguration(args)
                 .UseKestrel()
+                .UseIISIntegration()
                 .UseStartup<Startup>()
                 .Build();
 

diff --git a/samples/Builder.Middleware.Web/project.json b/samples/Builder.Middleware.Web/project.json
@@ -1,9 +1,8 @@
 {
   "dependencies": {
-    "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
+    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
     "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
-    "Microsoft.AspNetCore.Server.WebListener": "0.1.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*"
   },
   "frameworks": {
@@ -20,7 +19,7 @@
   "compilationOptions": {
     "emitEntryPoint": true
   },
-  "commands": {
-    "web": "Builder.Middleware.Web"
-  }
+  "content": [
+    "web.config"
+  ]
 }
diff --git a/samples/Builder.Middleware.Web/web.config b/samples/Builder.Middleware.Web/web.config
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<configuration>
+  <system.webServer>
+    <handlers>
+      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified"/>
+    </handlers>
+    <aspNetCore processPath=".\Builder.Middleware.Web.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
+  </system.webServer>
+</configuration>
diff --git a/samples/Config.CustomProviders.Web/MyConfigProvider.cs b/samples/Config.CustomProviders.Web/MyConfigProvider.cs
@@ -7,9 +7,11 @@ namespace Config.CustomProvider.Web
 {
     public class MyConfigProvider : IConfigurationProvider
     {
+        private ConfigurationReloadToken _reloadToken = new ConfigurationReloadToken();
+
         public IChangeToken GetReloadToken()
         {
-            return null;
+            return _reloadToken;
         }
 
         public bool TryGet(string key, out string value)

diff --git a/samples/Config.CustomProviders.Web/Startup.cs b/samples/Config.CustomProviders.Web/Startup.cs
@@ -25,6 +25,7 @@ public static void Main(string[] args)
         var host = new WebHostBuilder()
             .UseDefaultHostingConfiguration(args)
             .UseKestrel()
+            .UseIISIntegration()
             .UseStartup<Startup>()
             .Build();
 

diff --git a/samples/Config.CustomProviders.Web/project.json b/samples/Config.CustomProviders.Web/project.json
@@ -4,6 +4,7 @@
   },
   "dependencies": {
     "Microsoft.AspNetCore.Http": "1.0.0-*",
+    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
     "Microsoft.Extensions.Configuration": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*"
@@ -19,7 +20,7 @@
       ]
     }
   },
-  "commands": {
-    "web": "Config.CustomProviders.Web"
-  }
+  "content": [
+    "web.config"
+  ]
 }
diff --git a/samples/Config.CustomProviders.Web/web.config b/samples/Config.CustomProviders.Web/web.config
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<configuration>
+  <system.webServer>
+    <handlers>
+      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified"/>
+    </handlers>
+    <aspNetCore processPath=".\Config.CustomProviders.Web.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
+  </system.webServer>
+</configuration>
diff --git a/samples/Config.Providers.Web/Startup.cs b/samples/Config.Providers.Web/Startup.cs
@@ -35,6 +35,7 @@ public static void Main(string[] args)
         var host = new WebHostBuilder()
             .UseDefaultHostingConfiguration(args)
             .UseKestrel()
+            .UseIISIntegration()
             .UseStartup<Startup>()
             .Build();
 

diff --git a/samples/Config.Providers.Web/project.json b/samples/Config.Providers.Web/project.json
@@ -4,6 +4,7 @@
   },
   "dependencies": {
     "Microsoft.AspNetCore.Http": "1.0.0-*",
+    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
     "Microsoft.Extensions.Configuration": "1.0.0-*",
     "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-*",
@@ -21,10 +22,8 @@
       ]
     }
   },
-  "commands": {
-    "web": "Config.Providers.Web"
-  },
   "content": [
-    "Config.Providers.ini"
+    "Config.Providers.ini",
+    "web.config"
   ]
 }
diff --git a/samples/Config.Providers.Web/web.config b/samples/Config.Providers.Web/web.config
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<configuration>
+  <system.webServer>
+    <handlers>
+      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified"/>
+    </handlers>
+    <aspNetCore processPath=".\Config.Providers.Web.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
+  </system.webServer>
+</configuration>
diff --git a/samples/Config.SettingObject.Web/Startup.cs b/samples/Config.SettingObject.Web/Startup.cs
@@ -47,6 +47,7 @@ public static void Main(string[] args)
         var host = new WebHostBuilder()
             .UseDefaultHostingConfiguration(args)
             .UseKestrel()
+            .UseIISIntegration()
             .UseStartup<Startup>()
             .Build();
 

diff --git a/samples/Config.SettingObject.Web/project.json b/samples/Config.SettingObject.Web/project.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "Microsoft.AspNetCore.Http": "1.0.0-*",
-    "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
+    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
     "Microsoft.Extensions.Configuration": "1.0.0-*",
     "Microsoft.AspNetCore.Server.WebListener": "0.1.0-*",
@@ -21,7 +21,7 @@
   "compilationOptions": {
     "emitEntryPoint": true
   },
-  "commands": {
-    "web": "Config.SettingObject.Web"
-  }
+  "content": [
+    "web.config"
+  ]
 }
diff --git a/samples/Config.SettingObject.Web/web.config b/samples/Config.SettingObject.Web/web.config
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<configuration>
+  <system.webServer>
+    <handlers>
+      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified"/>
+    </handlers>
+    <aspNetCore processPath=".\Config.SettingObject.Web.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
+  </system.webServer>
+</configuration>
diff --git a/samples/Config.WalkingValues.Web/Startup.cs b/samples/Config.WalkingValues.Web/Startup.cs
@@ -34,6 +34,7 @@ public static void Main(string[] args)
         var host = new WebHostBuilder()
             .UseDefaultHostingConfiguration(args)
             .UseKestrel()
+            .UseIISIntegration()
             .UseStartup<Startup>()
             .Build();
 

diff --git a/samples/Config.WalkingValues.Web/project.json b/samples/Config.WalkingValues.Web/project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
+    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
     "Microsoft.AspNetCore.Server.WebListener": "0.1.0-*",
     "Microsoft.Extensions.Configuration": "1.0.0-*",
@@ -22,10 +22,8 @@
   "compilationOptions": {
     "emitEntryPoint": true
   },
-  "commands": {
-    "web": "Config.WalkingValues.Web"
-  },
   "content": [
-    "Config.Sources.ini"
+    "Config.Sources.ini",
+    "web.config"
   ]
 }
diff --git a/samples/Config.WalkingValues.Web/web.config b/samples/Config.WalkingValues.Web/web.config
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<configuration>
+  <system.webServer>
+    <handlers>
+      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified"/>
+    </handlers>
+    <aspNetCore processPath=".\Config.WalkingValues.Web.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
+  </system.webServer>
+</configuration>
diff --git a/samples/Container.Fallback.Web/Startup.cs b/samples/Container.Fallback.Web/Startup.cs
@@ -31,6 +31,7 @@ public static void Main(string[] args)
             var host = new WebHostBuilder()
                 .UseDefaultHostingConfiguration(args)
                 .UseKestrel()
+                .UseIISIntegration()
                 .UseStartup<Startup>()
                 .Build();
 

diff --git a/samples/Container.Fallback.Web/project.json b/samples/Container.Fallback.Web/project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
+    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
     "Microsoft.AspNetCore.Server.WebListener": "0.1.0-*",
     "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
@@ -20,7 +20,7 @@
   "compilationOptions": {
     "emitEntryPoint": true
   },
-  "commands": {
-    "web": "Container.Fallback.Web"
-  }
+  "content": [
+    "web.config"
+  ]
 }
diff --git a/samples/Container.Fallback.Web/web.config b/samples/Container.Fallback.Web/web.config
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<configuration>
+  <system.webServer>
+    <handlers>
+      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified"/>
+    </handlers>
+    <aspNetCore processPath=".\Container.Fallback.Web.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
+  </system.webServer>
+</configuration>
diff --git a/samples/Content.Upload.Files/Startup.cs b/samples/Content.Upload.Files/Startup.cs
@@ -69,6 +69,7 @@ public static void Main(string[] args)
             var host = new WebHostBuilder()
                 .UseDefaultHostingConfiguration(args)
                 .UseKestrel()
+                .UseIISIntegration()
                 .UseStartup<Startup>()
                 .Build();
 

diff --git a/samples/Content.Upload.Files/project.json b/samples/Content.Upload.Files/project.json
@@ -1,14 +1,7 @@
 {
   "version": "1.0.0-*",
-  "exclude": [
-    "wwwroot"
-  ],
-  "publishExclude": [
-    "**.kproj",
-    "**.user",
-    "**.vspscc"
-  ],
   "dependencies": {
+    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*"
   },
@@ -26,7 +19,7 @@
   "compilationOptions": {
     "emitEntryPoint": true
   },
-  "commands": {
-    "web": "Content.Upload.Files"
-  }
+  "content": [
+    "web.config"
+  ]
 }
diff --git a/samples/Content.Upload.Files/web.config b/samples/Content.Upload.Files/web.config
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<configuration>
+  <system.webServer>
+    <handlers>
+      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified"/>
+    </handlers>
+    <aspNetCore processPath=".\Content.Upload.Files.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
+  </system.webServer>
+</configuration>
diff --git a/samples/Content.Upload.Form/Startup.cs b/samples/Content.Upload.Form/Startup.cs
@@ -50,6 +50,7 @@ public static void Main(string[] args)
             var host = new WebHostBuilder()
                 .UseDefaultHostingConfiguration(args)
                 .UseKestrel()
+                .UseIISIntegration()
                 .UseStartup<Startup>()
                 .Build();