From 0e51ddbe2dbb980fcc451fd813c63977fdc84e43 Mon Sep 17 00:00:00 2001
From: Justin Kotalik <jukotali@microsoft.com>
Date: Wed, 15 Jul 2020 19:57:01 -0700
Subject: [PATCH] Add support for 5.0 and change sample to 5.0 (#585)

* Add support for 5.0 and change sample to 5.0

* targetframeworkversion
---
 samples/frontend-backend/backend/backend.csproj   | 2 +-
 samples/frontend-backend/frontend/frontend.csproj | 2 +-
 src/Microsoft.Tye.Core/DockerfileGenerator.cs     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/frontend-backend/backend/backend.csproj b/samples/frontend-backend/backend/backend.csproj
index 4e98f5a2..7271366f 100644
--- a/samples/frontend-backend/backend/backend.csproj
+++ b/samples/frontend-backend/backend/backend.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>Backend</RootNamespace>
   </PropertyGroup>
 
diff --git a/samples/frontend-backend/frontend/frontend.csproj b/samples/frontend-backend/frontend/frontend.csproj
index 0aa4abc0..26249ad7 100644
--- a/samples/frontend-backend/frontend/frontend.csproj
+++ b/samples/frontend-backend/frontend/frontend.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>Frontend</RootNamespace>
   </PropertyGroup>
 
diff --git a/src/Microsoft.Tye.Core/DockerfileGenerator.cs b/src/Microsoft.Tye.Core/DockerfileGenerator.cs
index e4503ff7..68d19d44 100644
--- a/src/Microsoft.Tye.Core/DockerfileGenerator.cs
+++ b/src/Microsoft.Tye.Core/DockerfileGenerator.cs
@@ -101,7 +101,7 @@ namespace Microsoft.Tye
                 container.BaseImageName = "mcr.microsoft.com/dotnet/core/runtime";
             }
 
-            if (string.IsNullOrEmpty(container.BaseImageTag) && project.TargetFrameworkName == "netcoreapp")
+            if (string.IsNullOrEmpty(container.BaseImageTag) && (project.TargetFrameworkName == "netcoreapp" || project.TargetFrameworkName == "net"))
             {
                 container.BaseImageTag = project.TargetFrameworkVersion;
             }
@@ -112,7 +112,7 @@ namespace Microsoft.Tye
             }
 
             container.BuildImageName ??= "mcr.microsoft.com/dotnet/core/sdk";
-            container.BuildImageTag ??= "3.1";
+            container.BuildImageTag ??= project.TargetFrameworkVersion;
 
             if (container.ImageName == null && application.Registry?.Hostname == null)
             {