From 56d2ba9810a7f4a69c114e8010206d97d92f9d4e Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Tue, 2 Oct 2018 11:21:50 -0700
Subject: [PATCH] Adding netcoreapp3.0 templates for console apps.

---
 build/AppHostTemplate.proj              |  2 +-
 build/BundledTemplates.props            |  2 +-
 build/DependencyVersions.props          |  4 ++--
 test/EndToEnd/GivenDotNetUsesMSBuild.cs | 11 -----------
 4 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/build/AppHostTemplate.proj b/build/AppHostTemplate.proj
index 598f250b6..b470c0be7 100644
--- a/build/AppHostTemplate.proj
+++ b/build/AppHostTemplate.proj
@@ -22,7 +22,7 @@
     </ItemGroup>
 
     <Error Condition="@(NativeRestoredAppHostNETCore->Distinct()->Count()) != 1"
-           Text="Failed to determine the $(_NETCoreDotNetAppHostPackageName) executable in $(AllFileOfRestoredAppHostPackage)" />
+           Text="Failed to determine the $(_NETCoreDotNetAppHostPackageName) executable in @(AllFileOfRestoredAppHostPackage)" />
 
     <Copy
         SourceFiles="@(NativeRestoredAppHostNETCore)"
diff --git a/build/BundledTemplates.props b/build/BundledTemplates.props
index f8886e06a..47413069d 100644
--- a/build/BundledTemplates.props
+++ b/build/BundledTemplates.props
@@ -1,7 +1,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <BundledTemplate Include="Microsoft.DotNet.Common.ItemTemplates" Version="$(MicrosoftDotNetCommonItemTemplatesPackageVersion)" />
-    <BundledTemplate Include="Microsoft.DotNet.Common.ProjectTemplates.2.2" Version="$(MicrosoftDotNetCommonProjectTemplates22PackageVersion)" />
+    <BundledTemplate Include="Microsoft.DotNet.Common.ProjectTemplates.3.0" Version="$(MicrosoftDotNetCommonProjectTemplates30PackageVersion)" />
     <BundledTemplate Include="Microsoft.DotNet.Test.ProjectTemplates.2.2" Version="$(MicrosoftDotNetTestProjectTemplates22PackageVersion)" />
     <BundledTemplate Include="Microsoft.Dotnet.Wpf.ProjectTemplates" Version="$(MicrosoftDotnetWpfProjectTemplatesPackageVersion)" />
     <BundledTemplate Include="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)" />
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index adb574b48..409aba38a 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -22,8 +22,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <MicrosoftDotNetCommonItemTemplatesPackageVersion>1.0.2-beta4-20180803-1918431</MicrosoftDotNetCommonItemTemplatesPackageVersion>
-    <MicrosoftDotNetCommonProjectTemplates22PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonProjectTemplates22PackageVersion>
+    <MicrosoftDotNetCommonItemTemplatesPackageVersion>1.0.2-beta4-20181001-2078020</MicrosoftDotNetCommonItemTemplatesPackageVersion>
+    <MicrosoftDotNetCommonProjectTemplates30PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonProjectTemplates30PackageVersion>
     <MicrosoftDotNetTestProjectTemplates22PackageVersion>1.0.2-beta4-20180821-1966911</MicrosoftDotNetTestProjectTemplates22PackageVersion>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
     <NUnit3TemplatesVersion>1.5.1</NUnit3TemplatesVersion>
diff --git a/test/EndToEnd/GivenDotNetUsesMSBuild.cs b/test/EndToEnd/GivenDotNetUsesMSBuild.cs
index f0b6e5678..ed0b95c46 100644
--- a/test/EndToEnd/GivenDotNetUsesMSBuild.cs
+++ b/test/EndToEnd/GivenDotNetUsesMSBuild.cs
@@ -27,17 +27,6 @@ namespace Microsoft.DotNet.Tests.EndToEnd
                     .Execute(newArgs)
                     .Should().Pass();
 
-                string projectPath = Directory.GetFiles(projectDirectory, "*.csproj").Single();
-
-                //  Override TargetFramework since there aren't .NET Core 3 templates yet
-                //  https://github.com/dotnet/core-sdk/issues/24 tracks removing this workaround
-                XDocument project = XDocument.Load(projectPath);
-                var ns = project.Root.Name.Namespace;
-                project.Root.Element(ns + "PropertyGroup")
-                    .Element(ns + "TargetFramework")
-                    .Value = "netcoreapp3.0";
-                project.Save(projectPath);
-
                 new RestoreCommand()
                     .WithWorkingDirectory(projectDirectory)
                     .Execute("/p:SkipInvalidConfigurations=true")