From 39238d1884c578acb12fd470f9eb6432ab441320 Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Wed, 11 Apr 2018 15:33:17 +0100
Subject: [PATCH] Show templates in VS for ASP.NET 2.0 and 2.1

---
 .../BlazorHosted.CSharp/.template.config/template.json    | 8 ++++++--
 .../BlazorHosted.CSharp.Server.csproj                     | 8 ++++++--
 .../BlazorLibrary.CSharp/.template.config/template.json   | 8 ++++++--
 .../.template.config/template.json                        | 8 ++++++--
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/.template.config/template.json b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/.template.config/template.json
index f71fe1eb9f..99d79b413e 100644
--- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/.template.config/template.json
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/.template.config/template.json
@@ -73,10 +73,14 @@
         {
           "choice": "netcoreapp2.0",
           "description": "Target netcoreapp2.0"
+        },
+        {
+          "choice": "netcoreapp2.1",
+          "description": "Target netcoreapp2.1"
         }
       ],
-      "replaces": "netcoreapp2.0",
-      "defaultValue": "netcoreapp2.0"
+      "replaces": "netcoreapp2.1",
+      "defaultValue": "netcoreapp2.1"
     },
     "HostIdentifier": {
       "type": "bind",
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Server/BlazorHosted.CSharp.Server.csproj b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Server/BlazorHosted.CSharp.Server.csproj
index 0c9cd691c1..4014ba1ce2 100644
--- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Server/BlazorHosted.CSharp.Server.csproj
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Server/BlazorHosted.CSharp.Server.csproj
@@ -1,13 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
 
     <!-- This custom package feed is required only when using nightly builds of Blazor -->
     <RestoreSources>$(RestoreSources);https://dotnet.myget.org/f/blazor-dev/api/v3/index.json</RestoreSources>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(Framework)' == 'netcoreapp2.1'">
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0-preview1-final" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="0.2.0-preview1-10189" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(Framework)' == 'netcoreapp2.0'">
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="0.2.0-preview1-10189" />
   </ItemGroup>
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/.template.config/template.json b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/.template.config/template.json
index ddb3db03bd..8037a7ea93 100644
--- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/.template.config/template.json
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/.template.config/template.json
@@ -34,10 +34,14 @@
         {
           "choice": "netcoreapp2.0",
           "description": "Target netcoreapp2.0"
+        },
+        {
+          "choice": "netcoreapp2.1",
+          "description": "Target netcoreapp2.1"
         }
       ],
-      "replaces": "netcoreapp2.0",
-      "defaultValue": "netcoreapp2.0"
+      "replaces": "netcoreapp2.1",
+      "defaultValue": "netcoreapp2.1"
     },
     "HostIdentifier": {
       "type": "bind",
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/.template.config/template.json b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/.template.config/template.json
index 010fdd93c6..b56d17679d 100644
--- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/.template.config/template.json
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/.template.config/template.json
@@ -34,10 +34,14 @@
         {
           "choice": "netcoreapp2.0",
           "description": "Target netcoreapp2.0"
+        },
+        {
+          "choice": "netcoreapp2.1",
+          "description": "Target netcoreapp2.1"
         }
       ],
-      "replaces": "netcoreapp2.0",
-      "defaultValue": "netcoreapp2.0"
+      "replaces": "netcoreapp2.1",
+      "defaultValue": "netcoreapp2.1"
     },
     "HostIdentifier": {
       "type": "bind",