зеркало из https://github.com/dotnet/tye.git
Add support for 5.0 and change sample to 5.0 (#585)
* Add support for 5.0 and change sample to 5.0 * targetframeworkversion
This commit is contained in:
Родитель
e6899851f5
Коммит
0e51ddbe2d
|
@ -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)
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче