Add support for 5.0 and change sample to 5.0 (dotnet#585)

* Add support for 5.0 and change sample to 5.0 * targetframeworkversion
mas-programer · Jul 16, 2020 · 0e51ddb · 0e51ddb
1 parent e689985
commit 0e51ddb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -101,7 +101,7 @@ public static void ApplyContainerDefaults(ApplicationBuilder application, Dotnet
                 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 @@ public static void ApplyContainerDefaults(ApplicationBuilder application, Dotnet
             }
 
             container.BuildImageName ??= "mcr.microsoft.com/dotnet/core/sdk";
-            container.BuildImageTag ??= "3.1";
+            container.BuildImageTag ??= project.TargetFrameworkVersion;
 
             if (container.ImageName == null && application.Registry?.Hostname == null)
             {