From 2d56e6bdfd41b6d3693243ba070a6aea35aa1aec Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 12 Mar 2020 13:50:47 +0100
Subject: [PATCH] Update .NET 5 templates with net5.0 tfm

---
 .../.template.config/dotnetcli.host.json             |  2 +-
 .../.template.config/template.json                   |  8 ++++----
 .../.template.config/dotnetcli.host.json             |  2 +-
 .../.template.config/template.json                   | 12 ++++++------
 .../ClassLibrary-FSharp/Company.ClassLibrary1.fsproj |  2 +-
 .../.template.config/dotnetcli.host.json             |  2 +-
 .../.template.config/template.json                   | 12 ++++++------
 .../Company.ClassLibrary1.vbproj                     |  2 +-
 .../.template.config/template.json                   |  8 ++++----
 .../Company.ConsoleApplication1.csproj               |  2 +-
 .../.template.config/template.json                   |  8 ++++----
 .../Company.ConsoleApplication1.fsproj               |  2 +-
 .../.template.config/template.json                   |  8 ++++----
 .../Company.ConsoleApplication1.vbproj               |  2 +-
 14 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-CSharp/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-CSharp/.template.config/dotnetcli.host.json
index 0a061cc07af..6d7891de2e0 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-CSharp/.template.config/dotnetcli.host.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-CSharp/.template.config/dotnetcli.host.json
@@ -19,6 +19,6 @@
     }
   },
   "usageExamples": [
-    "--framework netcoreapp3.1"
+    "--framework net5.0"
   ]
 }
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-CSharp/.template.config/template.json
index 6e51fb6a149..980f4e8ad58 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-CSharp/.template.config/template.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-CSharp/.template.config/template.json
@@ -17,9 +17,9 @@
   "preferNameDirectory": true,
   "baselines": {
     "app": {
-      "description": "Target netcoreapp",
+      "description": "Target .NET",
       "defaultOverrides": {
-        "Framework": "netcoreapp5.0"
+        "Framework": "net5.0"
       }
     },
     "standard": {
@@ -43,8 +43,8 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "netcoreapp5.0",
-          "description": "Target netcoreapp5.0"
+          "choice": "net5.0",
+          "description": "Target net5.0"
         },
         {
           "choice": "netstandard2.1",
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-FSharp/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-FSharp/.template.config/dotnetcli.host.json
index 5e9001212f7..8deed60f678 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-FSharp/.template.config/dotnetcli.host.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-FSharp/.template.config/dotnetcli.host.json
@@ -15,6 +15,6 @@
     }
   },
   "usageExamples": [
-    "--framework netcoreapp3.1"
+    "--framework net5.0"
   ]
 }
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-FSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-FSharp/.template.config/template.json
index 801b83e3a1f..2282587634f 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-FSharp/.template.config/template.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-FSharp/.template.config/template.json
@@ -17,9 +17,9 @@
   "preferNameDirectory": true,
   "baselines": {
     "app": {
-      "description": "Target netcoreapp",
+      "description": "Target .NET",
       "defaultOverrides": {
-        "Framework": "netcoreapp5.0"
+        "Framework": "net5.0"
       }
     },
     "standard": {
@@ -43,8 +43,8 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "netcoreapp5.0",
-          "description": "Target netcoreapp5.0"
+          "choice": "net5.0",
+          "description": "Target net5.0"
         },
         {
           "choice": "netstandard2.1",
@@ -55,8 +55,8 @@
           "description": "Target netstandard2.0"
         }
       ],
-      "replaces": "netstandard2.0",
-      "defaultValue": "netstandard2.0"
+      "replaces": "net5.0",
+      "defaultValue": "net5.0"
     },
     "HostIdentifier": {
       "type": "bind",
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-FSharp/Company.ClassLibrary1.fsproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-FSharp/Company.ClassLibrary1.fsproj
index 0f84550d8e3..a8df5024d9a 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-FSharp/Company.ClassLibrary1.fsproj
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-FSharp/Company.ClassLibrary1.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netstandard2.0</TargetFramework>
+    <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net5.0</TargetFramework>
     <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.ClassLibrary1</RootNamespace>
   </PropertyGroup>
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-VisualBasic/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-VisualBasic/.template.config/dotnetcli.host.json
index 0a061cc07af..6d7891de2e0 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-VisualBasic/.template.config/dotnetcli.host.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-VisualBasic/.template.config/dotnetcli.host.json
@@ -19,6 +19,6 @@
     }
   },
   "usageExamples": [
-    "--framework netcoreapp3.1"
+    "--framework net5.0"
   ]
 }
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-VisualBasic/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-VisualBasic/.template.config/template.json
index 2eec5d9b8c9..26c8cd936b3 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-VisualBasic/.template.config/template.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-VisualBasic/.template.config/template.json
@@ -17,9 +17,9 @@
   "preferNameDirectory": true,
   "baselines": {
     "app": {
-      "description": "Target netcoreapp",
+      "description": "Target .NET",
       "defaultOverrides": {
-        "Framework": "netcoreapp5.0"
+        "Framework": "net5.0"
       }
     },
     "standard": {
@@ -43,8 +43,8 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "netcoreapp5.0",
-          "description": "Target netcoreapp5.0"
+          "choice": "net5.0",
+          "description": "Target net5.0"
         },
         {
           "choice": "netstandard2.1",
@@ -55,8 +55,8 @@
           "description": "Target netstandard2.0"
         }
       ],
-      "replaces": "netstandard2.0",
-      "defaultValue": "netstandard2.0"
+      "replaces": "net5.0",
+      "defaultValue": "net5.0"
     },
     "langVersion": {
       "type": "parameter",
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-VisualBasic/Company.ClassLibrary1.vbproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-VisualBasic/Company.ClassLibrary1.vbproj
index a90352beaa9..8b834c6ca40 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-VisualBasic/Company.ClassLibrary1.vbproj
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ClassLibrary-VisualBasic/Company.ClassLibrary1.vbproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <RootNamespace>Company.ClassLibrary1</RootNamespace>
-    <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netstandard2.0</TargetFramework>
+    <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net5.0</TargetFramework>
     <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
     <LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>
   </PropertyGroup>
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ConsoleApplication-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ConsoleApplication-CSharp/.template.config/template.json
index a3c0a8e919e..a5954542afb 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ConsoleApplication-CSharp/.template.config/template.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ConsoleApplication-CSharp/.template.config/template.json
@@ -29,12 +29,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "netcoreapp5.0",
-          "description": "Target netcoreapp5.0"
+          "choice": "net5.0",
+          "description": "Target net5.0"
         }
       ],
-      "replaces": "netcoreapp5.0",
-      "defaultValue": "netcoreapp5.0"
+      "replaces": "net5.0",
+      "defaultValue": "net5.0"
     },
     "langVersion": {
       "type": "parameter",
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ConsoleApplication-CSharp/Company.ConsoleApplication1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ConsoleApplication-CSharp/Company.ConsoleApplication1.csproj
index 7a7ccd6884d..549442c743e 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ConsoleApplication-CSharp/Company.ConsoleApplication1.csproj
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ConsoleApplication-CSharp/Company.ConsoleApplication1.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp5.0</TargetFramework>
+    <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net5.0</TargetFramework>
     <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.ConsoleApplication1</RootNamespace>
     <LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ConsoleApplication-FSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ConsoleApplication-FSharp/.template.config/template.json
index f539a4678a6..d49ca12e268 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ConsoleApplication-FSharp/.template.config/template.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ConsoleApplication-FSharp/.template.config/template.json
@@ -29,12 +29,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "netcoreapp5.0",
-          "description": "Target netcoreapp5.0"
+          "choice": "net5.0",
+          "description": "Target net5.0"
         }
       ],
-      "replaces": "netcoreapp5.0",
-      "defaultValue": "netcoreapp5.0"
+      "replaces": "net5.0",
+      "defaultValue": "net5.0"
     },
     "HostIdentifier": {
       "type": "bind",
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ConsoleApplication-FSharp/Company.ConsoleApplication1.fsproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ConsoleApplication-FSharp/Company.ConsoleApplication1.fsproj
index 5863c9e77ae..432e0855fbe 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ConsoleApplication-FSharp/Company.ConsoleApplication1.fsproj
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ConsoleApplication-FSharp/Company.ConsoleApplication1.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp5.0</TargetFramework>
+    <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net5.0</TargetFramework>
     <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.ConsoleApplication1</RootNamespace>
   </PropertyGroup>
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ConsoleApplication-VisualBasic/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ConsoleApplication-VisualBasic/.template.config/template.json
index 055da67994d..b0f5a89240e 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ConsoleApplication-VisualBasic/.template.config/template.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ConsoleApplication-VisualBasic/.template.config/template.json
@@ -29,12 +29,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "netcoreapp5.0",
-          "description": "Target netcoreapp5.0"
+          "choice": "net5.0",
+          "description": "Target net5.0"
         }
       ],
-      "replaces": "netcoreapp5.0",
-      "defaultValue": "netcoreapp5.0"
+      "replaces": "net5.0",
+      "defaultValue": "net5.0"
     },
     "langVersion": {
       "type": "parameter",
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ConsoleApplication-VisualBasic/Company.ConsoleApplication1.vbproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ConsoleApplication-VisualBasic/Company.ConsoleApplication1.vbproj
index a6b2ae9a1ee..21986aa79a4 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ConsoleApplication-VisualBasic/Company.ConsoleApplication1.vbproj
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.5.0/content/ConsoleApplication-VisualBasic/Company.ConsoleApplication1.vbproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <RootNamespace>Company.ConsoleApplication1</RootNamespace>
-    <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp5.0</TargetFramework>
+    <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net5.0</TargetFramework>
     <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
     <LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>
   </PropertyGroup>