Merge branch 'release' into dev

aspnet · May 4, 2016 · 2e8a0e3 · 2e8a0e3
2 parents d9d5ec0 + f67ba5f
commit 2e8a0e3
Show file tree

Hide file tree

Showing 38 changed files with 338 additions and 439 deletions.
diff --git a/Templates.Settings.targets b/Templates.Settings.targets
@@ -47,7 +47,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <ApplicationInsightsPackageVersion>1.0.0-rc2-beta1</ApplicationInsightsPackageVersion>
+        <ApplicationInsightsPackageVersion>1.0.0-rc2</ApplicationInsightsPackageVersion>
         <DefaultNugetFeedSource Condition="'$(NugetFeedSource)' == ''">api.nuget.org=https://api.nuget.org/v3/index.json</DefaultNugetFeedSource>
         <NugetFeedSource Condition="'$(NugetFeedSource)' == '' and '$(TemplateBuildBranch)' == 'release' and '$(ReleaseNugetFeedSource)' != ''">$(ReleaseNugetFeedSource)|$(DefaultNugetFeedSource)</NugetFeedSource>
         <NugetFeedSource Condition="'$(NugetFeedSource)' == '' and '$(TemplateBuildBranch)' == 'dev' and '$(DevNugetFeedSource)' != ''">$(DevNugetFeedSource)|$(DefaultNugetFeedSource)</NugetFeedSource>

diff --git a/src/BaseTemplates/ConsoleApp/project.json b/src/BaseTemplates/ConsoleApp/project.json
@@ -1,6 +1,6 @@
 {
   "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true
   },
 

diff --git a/src/BaseTemplates/EmptyWeb/Program.cs b/src/BaseTemplates/EmptyWeb/Program.cs
@@ -13,9 +13,8 @@ public static void Main(string[] args)
         {
             var host = new WebHostBuilder()
                 .UseKestrel()
-                .UseContentRoot(Directory.GetCurrentDirectory())
-                .UseDefaultHostingConfiguration(args)
-                .UseIISIntegration()
+                .UseContentRoot(Directory.GetCurrentDirectory())$if$ ($aspnet_useplatformhandler$ == false)$else$
+                .UseIISIntegration()$endif$
                 .UseStartup<Startup>()
                 .Build();
 

diff --git a/src/BaseTemplates/EmptyWeb/project.json b/src/BaseTemplates/EmptyWeb/project.json
@@ -3,16 +3,16 @@
     "Microsoft.NETCore.App": {
       "version": "__NetCorePlatformVersion__",
       "type": "platform"
-    },$endif$
-    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
+    },$endif$$if$ ($aspnet_useplatformhandler$ == false)$else$
+    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",$endif$
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
   },
 
-  "tools": {
+  "tools": {$if$ ($aspnet_useplatformhandler$ == false)$else$
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "__AspNetCorePlatformVersion__",
       "imports": "portable-net45+win8+dnxcore50"
-    }
+    }$endif$
   },
 
   "frameworks": {$if$ ($context$ == WebCore)
@@ -26,27 +26,23 @@
     "$netframeworkversion$": { }$endif$
   },
 
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
 $if$ ($context$ == WebCore)
   "runtimeOptions": {
-    "configProperties": {
-      "System.GC.Server": true
-    }
+    "gcServer": true
   },
 $endif$
-  "content": [
-    "wwwroot",
-    "web.config"
-  ],
-
-  "exclude": [
-    "node_modules"
-  ],
+  "publishOptions": {
+    "include": [
+      "wwwroot",
+      "web.config"
+    ]
+  },
 
-  "scripts": {
-    "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
+  "scripts": {$if$ ($aspnet_useplatformhandler$ == false)$else$
+    "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]$endif$
   }
 }
diff --git a/src/BaseTemplates/StarterWeb/Program.cs b/src/BaseTemplates/StarterWeb/Program.cs
@@ -13,9 +13,8 @@ public static void Main(string[] args)
         {
             var host = new WebHostBuilder()
                 .UseKestrel()
-                .UseContentRoot(Directory.GetCurrentDirectory())
-                .UseDefaultHostingConfiguration(args)
-                .UseIISIntegration()
+                .UseContentRoot(Directory.GetCurrentDirectory())$if$ ($aspnet_useplatformhandler$ == false)$else$
+                .UseIISIntegration()$endif$
                 .UseStartup<Startup>()
                 .Build();
 

diff --git a/src/BaseTemplates/StarterWeb/Startup.cs b/src/BaseTemplates/StarterWeb/Startup.cs
@@ -16,11 +16,7 @@ public Startup(IHostingEnvironment env)
         {
             var builder = new ConfigurationBuilder()
                 .SetBasePath(env.ContentRootPath)
-                .AddJsonFile(source =>
-                {
-                    source.Path = "appsettings.json";
-                    source.ReloadOnChange = true;
-                })
+                .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
                 .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true)
                 .AddEnvironmentVariables();
             Configuration = builder.Build();

diff --git a/src/BaseTemplates/StarterWeb/project.json b/src/BaseTemplates/StarterWeb/project.json
@@ -3,32 +3,33 @@
     "Microsoft.NETCore.App": {
       "version": "__NetCorePlatformVersion__",
       "type": "platform"
-    },
-    "dotnet-razor-tooling": {
-      "version": "__AspNetCorePlatformVersion__",
-      "type": "build"
     },$endif$
     "Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
     "Microsoft.AspNetCore.Mvc": "1.0.0-*",
-    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
+    "Microsoft.AspNetCore.Razor.Tools": {
+      "version": "__AspNetCorePlatformVersion__",
+      "type": "build"
+    },$if$ ($aspnet_useplatformhandler$ == false)$else$
+    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",$endif$
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
     "Microsoft.AspNetCore.StaticFiles": "1.0.0-*",
+    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-*",
     "Microsoft.Extensions.Configuration.Json": "1.0.0-*",
     "Microsoft.Extensions.Logging": "1.0.0-*",
     "Microsoft.Extensions.Logging.Console": "1.0.0-*",
     "Microsoft.Extensions.Logging.Debug": "1.0.0-*",
     "Microsoft.VisualStudio.Web.BrowserLink.Loader": "__VSVER__.0-*"
   },
 
-  "tools": {$if$ ($context$ == WebCore)
-    "dotnet-razor-tooling": {
+  "tools": {
+    "Microsoft.AspNetCore.Razor.Tools": {
       "version": "__AspNetCorePlatformVersion__",
       "imports": "portable-net45+win8+dnxcore50"
-    },$endif$
+    }$if$ ($aspnet_useplatformhandler$ == false)$else$,
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "__AspNetCorePlatformVersion__",
       "imports": "portable-net45+win8+dnxcore50"
-    }
+    }$endif$
   },
 
   "frameworks": {$if$ ($context$ == WebCore)
@@ -42,30 +43,26 @@
     "$netframeworkversion$": { }$endif$
   },
 
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
 $if$ ($context$ == WebCore)
   "runtimeOptions": {
-    "configProperties": {
-      "System.GC.Server": true
-    }
+    "gcServer": true
   },
 $endif$
-  "content": [
-    "wwwroot",
-    "Views",
-    "appsettings.json",
-    "web.config"
-  ],
-
-  "exclude": [
-    "node_modules"
-  ],
+  "publishOptions": {
+    "include": [
+      "wwwroot",
+      "Views",
+      "appsettings.json",
+      "web.config"
+    ]
+  },
 
   "scripts": {
-    "prepublish": [ "npm install", "bower install", "gulp clean", "gulp min" ],
-    "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
+    "prepublish": [ "npm install", "bower install", "gulp clean", "gulp min" ]$if$ ($aspnet_useplatformhandler$ == false)$else$,
+    "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]$endif$
   }
 }
diff --git a/src/BaseTemplates/WebAPI/Program.cs b/src/BaseTemplates/WebAPI/Program.cs
@@ -14,9 +14,8 @@ public static void Main(string[] args)
         {
             var host = new WebHostBuilder()
                 .UseKestrel()
-                .UseContentRoot(Directory.GetCurrentDirectory())
-                .UseDefaultHostingConfiguration(args)
-                .UseIISIntegration()
+                .UseContentRoot(Directory.GetCurrentDirectory())$if$ ($aspnet_useplatformhandler$ == false)$else$
+                .UseIISIntegration()$endif$
                 .UseStartup<Startup>()
                 .Build();
 

diff --git a/src/BaseTemplates/WebAPI/Startup.cs b/src/BaseTemplates/WebAPI/Startup.cs
@@ -16,11 +16,7 @@ public Startup(IHostingEnvironment env)
         {
             var builder = new ConfigurationBuilder()
                 .SetBasePath(env.ContentRootPath)
-                .AddJsonFile(source =>
-                {
-                    source.Path = "appsettings.json";
-                    source.ReloadOnChange = true;
-                })
+                .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
                 .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true)
                 .AddEnvironmentVariables();
             Configuration = builder.Build();

diff --git a/src/BaseTemplates/WebAPI/project.json b/src/BaseTemplates/WebAPI/project.json
@@ -4,21 +4,22 @@
       "version": "__NetCorePlatformVersion__",
       "type": "platform"
     },$endif$
-    "Microsoft.AspNetCore.Mvc": "1.0.0-*",
-    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
+    "Microsoft.AspNetCore.Mvc": "1.0.0-*",$if$ ($aspnet_useplatformhandler$ == false)$else$
+    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",$endif$
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
+    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-*",
     "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0-*",
     "Microsoft.Extensions.Configuration.Json": "1.0.0-*",
     "Microsoft.Extensions.Logging": "1.0.0-*",
     "Microsoft.Extensions.Logging.Console": "1.0.0-*",
     "Microsoft.Extensions.Logging.Debug": "1.0.0-*"
   },
 
-  "tools": {
+  "tools": {$if$ ($aspnet_useplatformhandler$ == false)$else$
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "__AspNetCorePlatformVersion__",
       "imports": "portable-net45+win8+dnxcore50"
-    }
+    }$endif$
   },
 
   "frameworks": {$if$ ($context$ == WebCore)
@@ -32,29 +33,25 @@
     "$netframeworkversion$": { }$endif$
   },
 
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
 $if$ ($context$ == WebCore)
   "runtimeOptions": {
-    "configProperties": {
-      "System.GC.Server": true
-    }
+    "gcServer": true
   },
 $endif$
-  "content": [
-    "wwwroot",
-    "Views",
-    "appsettings.json",
-    "web.config"
-  ],
-
-  "exclude": [
-    "node_modules"
-  ],
+  "publishOptions": {
+    "include": [
+      "wwwroot",
+      "Views",
+      "appsettings.json",
+      "web.config"
+    ]
+  },
 
-  "scripts": {
-    "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
+  "scripts": {$if$ ($aspnet_useplatformhandler$ == false)$else$
+    "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]$endif$
   }
 }
diff --git a/src/Rules/StarterWeb/AI/IndividualAuth/Startup.cs b/src/Rules/StarterWeb/AI/IndividualAuth/Startup.cs
@@ -21,11 +21,7 @@ public Startup(IHostingEnvironment env)
         {
             var builder = new ConfigurationBuilder()
                 .SetBasePath(env.ContentRootPath)
-                .AddJsonFile(source =>
-                {
-                    source.Path = "appsettings.json";
-                    source.ReloadOnChange = true;
-                })
+                .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
                 .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true);
 
             if (env.IsDevelopment())