Browse Source
Add support for 5.0 and change sample to 5.0 (#585)
* Add support for 5.0 and change sample to 5.0
* targetframeworkversion
jkotalik/fixAzureFunctions
Justin Kotalik
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
4 additions and
4 deletions
-
samples/frontend-backend/backend/backend.csproj
-
samples/frontend-backend/frontend/frontend.csproj
-
src/Microsoft.Tye.Core/DockerfileGenerator.cs
|
|
|
@ -1,7 +1,7 @@ |
|
|
|
<Project Sdk="Microsoft.NET.Sdk.Web"> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>netcoreapp3.1</TargetFramework> |
|
|
|
<TargetFramework>net5.0</TargetFramework> |
|
|
|
<RootNamespace>Backend</RootNamespace> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
|
|
|
|
@ -1,7 +1,7 @@ |
|
|
|
<Project Sdk="Microsoft.NET.Sdk.Web"> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>netcoreapp3.1</TargetFramework> |
|
|
|
<TargetFramework>net5.0</TargetFramework> |
|
|
|
<RootNamespace>Frontend</RootNamespace> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
|
|
|
|
@ -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) |
|
|
|
{ |
|
|
|
|
