Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<ContainerRepository Condition="'$(ContainerRepository)' == ''">$(AssemblyName)</ContainerRepository>

<!-- Only default a tag name if no tag names at all are provided -->
<ContainerImageTag Condition="'$(ContainerImageTag)' == '' and '$(ContainerImageTags)' == ''">$(Version)</ContainerImageTag>
<ContainerImageTag Condition="'$(ContainerImageTag)' == '' and '$(ContainerImageTags)' == ''">latest</ContainerImageTag>
<ContainerImageTag Condition="'$(AutoGenerateImageTag)' == 'true' and '$(ContainerImageTags)' == ''">$([System.DateTime]::UtcNow.ToString('yyyyMMddhhmmss'))</ContainerImageTag>

<!-- The Container RID should default to the RID used for the entire build (to ensure things run on the platform they are built for), but the user knows best and so should be able to set it explicitly.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ private string BuildLocalApp([CallerMemberName] string testName = "TestName", st
Directory.CreateDirectory(workingDirectory);

new DotnetNewCommand(_testOutput, "console", "-f", tfm, "-o", "MinimalTestApp")
.WithVirtualHive()
.WithVirtualHive()
.WithWorkingDirectory(workingDirectory)
.Execute()
.Should().Pass();
Expand Down Expand Up @@ -182,7 +182,7 @@ public async Task EndToEnd_NoAPI_Web(bool addPackageReference)
}

new DotnetNewCommand(_testOutput, "webapi", "-f", ToolsetInfo.CurrentTargetFramework)
.WithVirtualHive()
.WithVirtualHive()
.WithWorkingDirectory(newProjectDir.FullName)
// do not pollute the primary/global NuGet package store with the private package(s)
.WithEnvironmentVariable("NUGET_PACKAGES", privateNuGetAssets.FullName)
Expand Down Expand Up @@ -229,7 +229,7 @@ public async Task EndToEnd_NoAPI_Web(bool addPackageReference)
$"/p:ContainerBaseImage={DockerRegistryManager.FullyQualifiedBaseImageAspNet}",
$"/p:ContainerRegistry={DockerRegistryManager.LocalRegistry}",
$"/p:ContainerRepository={imageName}",
$"/p:Version={imageTag}",
$"/p:ContainerImageTag={imageTag}",
$"/p:RuntimeFrameworkVersion=8.0.0-preview.3.23174.8")
.WithEnvironmentVariable("NUGET_PACKAGES", privateNuGetAssets.FullName)
.WithWorkingDirectory(newProjectDir.FullName)
Expand Down Expand Up @@ -368,7 +368,7 @@ public void EndToEnd_NoAPI_Console()
$"/p:ContainerRegistry={DockerRegistryManager.LocalRegistry}",
$"/p:ContainerRepository={imageName}",
$"/p:RuntimeFrameworkVersion=8.0.0-preview.3.23174.8",
$"/p:Version={imageTag}")
$"/p:ContainerImageTag={imageTag}")
.WithEnvironmentVariable("NUGET_PACKAGES", privateNuGetAssets.FullName)
.WithWorkingDirectory(newProjectDir.FullName)
.Execute()
Expand Down