aspnetcore/modules/Templating

commit 3570f1a2b1a34ce29655e760937f2e58c5c12a10
Merge: 2d335431172 ed19e34256d
Author: Ryan Brandenburg <[email protected]>
Date:   Thu Aug 23 10:32:20 2018 -0700

    Merge branch 'merge/release/2.2-to-master'

diff --cc .vsts-pipelines/builds/ci-internal.yml
index da3790459ee,84d17f934f5..da64d3f0d66
--- a/.vsts-pipelines/builds/ci-internal.yml
+++ b/.vsts-pipelines/builds/ci-internal.yml
@@@ -8,39 -7,7 +7,7 @@@ resources
    - repository: buildtools
      type: git
      name: aspnet-BuildTools
 -    ref: refs/heads/release/2.2
 +    ref: refs/heads/master
  
  phases:
- - template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
-   parameters:
-     agentOs: Windows
-     beforeBuild:
-     - task: NodeTool@0
-       displayName: Use Node 8.x
-       inputs:
-         versionSpec: 8.x
- 
- - template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
-   parameters:
-     agentOs: macOS
-     beforeBuild:
-     - task: NodeTool@0
-       displayName: Use Node 8.x
-       inputs:
-         versionSpec: 8.x
-     - script: ./run.sh install-tools; $(Agent.WorkFolder)/.dotnet/dotnet dev-certs https
-       displayName: install certs
-       env:
-         DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
-         DOTNET_CLI_TELEMETRY_OPTOUT: 1
-   
- - template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
-   parameters:
-     agentOs: Linux
-     beforeBuild:
-     - task: NodeTool@0
-       displayName: Use Node 8.x
-       inputs:
-         versionSpec: 8.x
-     - script: ./run.sh install-tools; $(Agent.WorkFolder)/.dotnet/dotnet dev-certs https
-       displayName: install certs
+ - template: ../templates/project-ci.yml
diff --cc .vsts-pipelines/builds/ci-public.yml
index 48474e50cb5,b75ca3bae80..c4e6cf5de3f
--- a/.vsts-pipelines/builds/ci-public.yml
+++ b/.vsts-pipelines/builds/ci-public.yml
@@@ -9,39 -9,7 +9,7 @@@ resources
      type: github
      endpoint: DotNet-Bot GitHub Connection
      name: aspnet/BuildTools
 -    ref: refs/heads/release/2.2
 +    ref: refs/heads/master
  
  phases:
- - template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
-   parameters:
-     agentOs: Windows
-     beforeBuild:
-     - task: NodeTool@0
-       displayName: Use Node 8.x
-       inputs:
-         versionSpec: 8.x
- 
- - template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
-   parameters:
-     agentOs: macOS
-     beforeBuild:
-     - task: NodeTool@0
-       displayName: Use Node 8.x
-       inputs:
-         versionSpec: 8.x
-     - script: ./run.sh install-tools; $(Agent.WorkFolder)/.dotnet/dotnet dev-certs https
-       displayName: install certs
-       env:
-         DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
-         DOTNET_CLI_TELEMETRY_OPTOUT: 1
-   
- - template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
-   parameters:
-     agentOs: Linux
-     beforeBuild:
-     - task: NodeTool@0
-       displayName: Use Node 8.x
-       inputs:
-         versionSpec: 8.x
-     - script: ./run.sh install-tools; $(Agent.WorkFolder)/.dotnet/dotnet dev-certs https
-       displayName: install certs
+ - template: ../templates/project-ci.yml
diff --cc src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json
index 071c77b32c6,dd8af990f6a..391e226158a
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json
@@@ -9,8 -9,8 +9,8 @@@
    "generatorVersions": "[1.0.0.0-*)",
    "description": "An empty project template for creating an ASP.NET Core application. This template does not have any content in it.",
    "groupIdentity": "Microsoft.Web.Empty",
-   "precedence": "3000",
 -  "precedence": "4000",
 -  "identity": "Microsoft.Web.Empty.CSharp.2.2",
++  "precedence": "5000",
 +  "identity": "Microsoft.Web.Empty.CSharp.3.0",
    "shortName": "web",
    "tags": {
      "language": "C#",
diff --cc src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json
index 9ea39a49dbb,30348dc508f..5fcbabce052
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json
@@@ -8,8 -8,8 +8,8 @@@
    "generatorVersions": "[1.0.0.0-*)",
    "description": "An empty project template for creating an ASP.NET Core application. This template does not have any content in it.",
    "groupIdentity": "Microsoft.Web.Empty",
-   "precedence": "3000",
 -  "precedence": "4000",
 -  "identity": "Microsoft.Web.Empty.FSharp.2.2",
++  "precedence": "5000",
 +  "identity": "Microsoft.Web.Empty.FSharp.3.0",
    "shortName": "web",
    "tags": {
      "language": "F#",
diff --cc src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json
index c7998b848f5,6a9262d5169..317a21659f5
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json
@@@ -11,8 -11,8 +11,8 @@@
    "generatorVersions": "[1.0.0.0-*)",
    "description": "A project for creating a Razor class library that targets .NET Standard",
    "groupIdentity": "Microsoft.Web.Razor",
-   "precedence": "3000",
 -  "precedence": "4000",
 -  "identity": "Microsoft.Web.Razor.Library.CSharp.2.2",
++  "precedence": "5000",
 +  "identity": "Microsoft.Web.Razor.Library.CSharp.3.0",
    "shortName": "razorclasslib",
    "tags": {
      "language": "C#",
diff --cc src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json
index 6f8f2808287,1f0cdc54e1b..eba7ce658e0
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json
@@@ -10,8 -10,8 +10,8 @@@
    "generatorVersions": "[1.0.0.0-*)",
    "description": "A project template for creating an ASP.NET Core application with example ASP.NET Razor Pages content",
    "groupIdentity": "Microsoft.Web.RazorPages",
-   "precedence": "3000",
 -  "precedence": "4000",
 -  "identity": "Microsoft.Web.RazorPages.CSharp.2.2",
++  "precedence": "5000",
 +  "identity": "Microsoft.Web.RazorPages.CSharp.3.0",
    "shortName": [
      "razor",
      "webapp"
diff --cc src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json
index e3bb14c1de9,440408cab89..fbca0bdeb3d
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json
@@@ -9,8 -9,8 +9,8 @@@
    "generatorVersions": "[1.0.0.0-*)",
    "description": "A project template for creating an ASP.NET Core application with example ASP.NET Core MVC Views and Controllers. This template can also be used for RESTful HTTP services.",
    "groupIdentity": "Microsoft.Web.Mvc",
-   "precedence": "3000",
 -  "precedence": "4000",
 -  "identity": "Microsoft.Web.Mvc.CSharp.2.2",
++  "precedence": "5000",
 +  "identity": "Microsoft.Web.Mvc.CSharp.3.0",
    "shortName": "mvc",
    "thirdPartyNotices": "https://aka.ms/aspnetcore-template-3pn-210",
    "tags": {
@@@ -360,4 -360,4 +360,4 @@@
        "continueOnError": true
      }
    ]
--}
++}
diff --cc src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json
index 0ba5846a69c,bc613689e58..f8041a2dd18
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json
@@@ -9,8 -9,8 +9,8 @@@
    "generatorVersions": "[1.0.0.0-*)",
    "description": "A project template for creating an ASP.NET Core application with example ASP.NET Core MVC Views and Controllers. This template can also be used for RESTful HTTP services.",
    "groupIdentity": "Microsoft.Web.Mvc",
-   "precedence": "3000",
 -  "precedence": "4000",
 -  "identity": "Microsoft.Web.Mvc.FSharp.2.2",
++  "precedence": "5000",
 +  "identity": "Microsoft.Web.Mvc.FSharp.3.0",
    "shortName": "mvc",
    "thirdPartyNotices": "https://aka.ms/aspnetcore-template-3pn-210",
    "tags": {
@@@ -153,4 -153,4 +153,4 @@@
        "continueOnError": true
      }
    ]
--}
++}
diff --cc src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json
index 3e805b4d899,67f8851fe18..8f6feec3db0
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json
@@@ -9,8 -9,8 +9,8 @@@
    "generatorVersions": "[1.0.0.0-*)",
    "description": "A project template for creating an ASP.NET Core application with an example Controller for a RESTful HTTP service. This template can also be used for ASP.NET Core MVC Views and Controllers.",
    "groupIdentity": "Microsoft.Web.WebApi",
-   "precedence": "3000",
 -  "precedence": "4000",
 -  "identity": "Microsoft.Web.WebApi.CSharp.2.2",
++  "precedence": "5000",
 +  "identity": "Microsoft.Web.WebApi.CSharp.3.0",
    "shortName": "webapi",
    "tags": {
      "language": "C#",
diff --cc src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json
index 27b83646d13,8bf6f04d4ba..1591a1c0e7d
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json
@@@ -8,8 -8,8 +8,8 @@@
    "generatorVersions": "[1.0.0.0-*)",
    "description": "A project template for creating an ASP.NET Core application with an example Controller for a RESTful HTTP service. This template can also be used for ASP.NET Core MVC Views and Controllers.",
    "groupIdentity": "Microsoft.Web.WebApi",
-   "precedence": "3000",
 -  "precedence": "4000",
 -  "identity": "Microsoft.Web.WebApi.FSharp.2.2",
++  "precedence": "5000",
 +  "identity": "Microsoft.Web.WebApi.FSharp.3.0",
    "shortName": "webapi",
    "tags": {
      "language": "F#",