From 7ddc5746f3d351623f54dea75c19b7f82e197064 Mon Sep 17 00:00:00 2001
From: Phil Henning <phenning@microsoft.com>
Date: Mon, 24 Feb 2020 10:32:21 -0800
Subject: [PATCH 1/2] Add 5.0 common project templates to Bundle.

---
 eng/Versions.props                          | 2 +-
 src/redist/targets/BundledTemplates.targets | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index a5bbe3005..5cf13e9fd 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -97,7 +97,7 @@
     <MicrosoftDotNetWpfProjectTemplates31PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates31PackageVersion>
     <NUnit3Templates31PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates31PackageVersion>
     <MicrosoftDotNetCommonItemTemplates31PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonItemTemplates31PackageVersion>
-    <MicrosoftDotNetCommonProjectTemplates31PackageVersion>3.1.0-preview1.19475.1</MicrosoftDotNetCommonProjectTemplates31PackageVersion>
+    <MicrosoftDotNetCommonProjectTemplates31PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonProjectTemplates31PackageVersion>
     <AspNetCorePackageVersionFor31Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor31Templates>
     <!-- 3.0 Template versions -->
     <MicrosoftDotnetWinFormsProjectTemplates30PackageVersion>4.8.0-rc2.19462.10</MicrosoftDotnetWinFormsProjectTemplates30PackageVersion>
diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets
index 68f15cabb..cc6da8c91 100644
--- a/src/redist/targets/BundledTemplates.targets
+++ b/src/redist/targets/BundledTemplates.targets
@@ -40,7 +40,7 @@
 
   <ItemGroup>
     <Bundled31Templates Include="Microsoft.DotNet.Common.ItemTemplates" PackageVersion="$(MicrosoftDotNetCommonItemTemplates31PackageVersion)" />
-    <Bundled31Templates Include="Microsoft.DotNet.Common.ProjectTemplates.3.1" PackageVersion="$(MicrosoftDotNetCommonProjectTemplates31PackageVersion)" />
+    <Bundled31Templates Include="Microsoft.DotNet.Common.ProjectTemplates.5.0" PackageVersion="$(MicrosoftDotNetCommonProjectTemplates31PackageVersion)" />
     <Bundled31Templates Include="Microsoft.DotNet.Test.ProjectTemplates.3.1" PackageVersion="$(MicrosoftDotNetTestProjectTemplates31PackageVersion)" />
     <Bundled31Templates Include="Microsoft.Dotnet.Wpf.ProjectTemplates" PackageVersion="$(MicrosoftDotnetWpfProjectTemplates31PackageVersion)" />
     <Bundled31Templates Include="Microsoft.Dotnet.WinForms.ProjectTemplates" PackageVersion="$(MicrosoftDotnetWinFormsProjectTemplates31PackageVersion)" />

From d6516293c0e7926a5090d2a867d5bb529990af29 Mon Sep 17 00:00:00 2001
From: Phil Henning <phenning@microsoft.com>
Date: Tue, 25 Feb 2020 08:09:40 -0800
Subject: [PATCH 2/2] Update EndToEnd tests for 5.0 templates

---
 test/EndToEnd/ProjectBuildTests.cs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs
index e0080792f..8a88bbc08 100644
--- a/test/EndToEnd/ProjectBuildTests.cs
+++ b/test/EndToEnd/ProjectBuildTests.cs
@@ -36,9 +36,7 @@ namespace EndToEnd.Tests
             var runCommand = new RunCommand()
                 .WithWorkingDirectory(projectDirectory)
                 .ExecuteWithCapturedOutput()
-                // Templates are still at 3.1 and will not run on 5.0, revert to commented out assertion when 5.0 templates land
-                //.Should().Pass().And.HaveStdOutContaining("Hello World!");
-                .Should().Fail().And.HaveStdErrContaining("https://aka.ms/dotnet-core-applaunch");
+                .Should().Pass().And.HaveStdOutContaining("Hello World!");
 
             var binDirectory = new DirectoryInfo(projectDirectory).Sub("bin");
             binDirectory.Should().HaveFilesMatching("*.dll", SearchOption.AllDirectories);
@@ -80,10 +78,7 @@ namespace EndToEnd.Tests
             var runCommand = new RunCommand()
                 .WithWorkingDirectory(projectDirectory)
                 .ExecuteWithCapturedOutput()
-                // Templates are still at 3.1 and will not run on 5.0, revert to commented out assertion when 5.0 templates land
-                //.Should().Pass().And.HaveStdOutContaining("Hello World!");
-                .Should().Fail().And.HaveStdErrContaining("https://aka.ms/dotnet-core-applaunch");
-
+                .Should().Pass().And.HaveStdOutContaining("Hello World!");
         }
 
         [Theory]