Skip to content

Commit b48e508

Browse files
baronfelbaronfel
committed
Update containers multipublishing tests to still target 9.0 to align with existing containers tests.
1 parent 2fe5f22 commit b48e508

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

‎test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ public void EndToEnd_NoAPI_Console(string baseImage)
659659
.Should().Pass();
660660

661661
// Add package to the project
662-
new DotnetCommand(_testOutput, "add", "package", "Microsoft.NET.Build.Containers", "-f", _oldFramework , "-v", packageVersion ?? string.Empty)
662+
new DotnetCommand(_testOutput, "add", "package", "Microsoft.NET.Build.Containers", "-f", _oldFramework, "-v", packageVersion ?? string.Empty)
663663
.WithEnvironmentVariable("NUGET_PACKAGES", privateNuGetAssets.FullName)
664664
.WithWorkingDirectory(newProjectDir.FullName)
665665
.Execute()
@@ -706,7 +706,7 @@ public void EndToEnd_NoAPI_Console(string baseImage)
706706
public void EndToEnd_SingleArch_NoRid()
707707
{
708708
// Create a new console project
709-
DirectoryInfo newProjectDir = CreateNewProject("console");
709+
DirectoryInfo newProjectDir = CreateNewProject("console", _oldFramework);
710710

711711
string imageName = NewImageName();
712712
string imageTag = "1.0";
@@ -744,7 +744,7 @@ public void EndToEndMultiArch_LocalRegistry()
744744
string imageArm64 = $"{imageName}:{imageTag}-linux-arm64";
745745

746746
// Create a new console project
747-
DirectoryInfo newProjectDir = CreateNewProject("console");
747+
DirectoryInfo newProjectDir = CreateNewProject("console", _oldFramework);
748748

749749
// Run PublishContainer for multi-arch
750750
CommandResult commandResult = new DotnetCommand(
@@ -763,8 +763,8 @@ public void EndToEndMultiArch_LocalRegistry()
763763
// images were created locally for each RID
764764
// and image index was NOT created
765765
commandResult.Should().Pass()
766-
.And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-x64"))
767-
.And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-arm64"))
766+
.And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, _oldFramework, "linux-x64"))
767+
.And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, _oldFramework, "linux-arm64"))
768768
.And.HaveStdOutContaining($"Pushed image '{imageX64}' to local registry")
769769
.And.HaveStdOutContaining($"Pushed image '{imageArm64}' to local registry")
770770
.And.NotHaveStdOutContaining("Pushed image index");
@@ -800,7 +800,7 @@ public void MultiArchStillAllowsSingleRID()
800800
string qualifiedImageName = $"{imageName}:{imageTag}";
801801

802802
// Create a new console project
803-
DirectoryInfo newProjectDir = CreateNewProject("console");
803+
DirectoryInfo newProjectDir = CreateNewProject("console", _oldFramework);
804804

805805
// Run PublishContainer for multi-arch-capable, but single-arch actual
806806
CommandResult commandResult = new DotnetCommand(
@@ -826,7 +826,7 @@ public void MultiArchStillAllowsSingleRID()
826826
// and image index was NOT created
827827
commandResult.Should().Pass()
828828
// no rid-specific path because we didn't pass RuntimeIdentifier
829-
.And.NotHaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-x64"))
829+
.And.NotHaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, _oldFramework, "linux-x64"))
830830
.And.HaveStdOutContaining($"Pushed image '{qualifiedImageName}' to local registry")
831831
.And.NotHaveStdOutContaining("Pushed image index");
832832

@@ -852,7 +852,7 @@ public void MultiArchStillAllowsSingleRIDUsingJustRIDProperties()
852852
string qualifiedImageName = $"{imageName}:{imageTag}";
853853

854854
// Create a new console project
855-
DirectoryInfo newProjectDir = CreateNewProject("console");
855+
DirectoryInfo newProjectDir = CreateNewProject("console", _oldFramework);
856856

857857
// Run PublishContainer for multi-arch-capable, but single-arch actual
858858
CommandResult commandResult = new DotnetCommand(
@@ -875,8 +875,8 @@ public void MultiArchStillAllowsSingleRIDUsingJustRIDProperties()
875875
// images were created locally for each RID
876876
// and image index was NOT created
877877
commandResult.Should().Pass()
878-
.And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-x64", configuration: "Release"))
879-
.And.NotHaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-arm64", configuration: "Release"))
878+
.And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, _oldFramework, "linux-x64", configuration: "Release"))
879+
.And.NotHaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, _oldFramework, "linux-arm64", configuration: "Release"))
880880
.And.HaveStdOutContaining($"Pushed image '{qualifiedImageName}' to local registry")
881881
.And.NotHaveStdOutContaining("Pushed image index");
882882

@@ -894,7 +894,7 @@ public void MultiArchStillAllowsSingleRIDUsingJustRIDProperties()
894894
newProjectDir.Delete(true);
895895
}
896896

897-
private DirectoryInfo CreateNewProject(string template, [CallerMemberName] string callerMemberName = "")
897+
private DirectoryInfo CreateNewProject(string template, string tfm = ToolsetInfo.CurrentTargetFramework, [CallerMemberName] string callerMemberName = "")
898898
{
899899
DirectoryInfo newProjectDir = new DirectoryInfo(Path.Combine(TestSettings.TestArtifactsDirectory, callerMemberName));
900900

@@ -905,7 +905,7 @@ private DirectoryInfo CreateNewProject(string template, [CallerMemberName] strin
905905

906906
newProjectDir.Create();
907907

908-
new DotnetNewCommand(_testOutput, template, "-f", ToolsetInfo.CurrentTargetFramework)
908+
new DotnetNewCommand(_testOutput, template, "-f", tfm)
909909
.WithVirtualHive()
910910
.WithWorkingDirectory(newProjectDir.FullName)
911911
.Execute()
@@ -914,8 +914,8 @@ private DirectoryInfo CreateNewProject(string template, [CallerMemberName] strin
914914
return newProjectDir;
915915
}
916916

917-
private string GetPublishArtifactsPath(string projectDir, string rid, string configuration = "Debug")
918-
=> Path.Combine(projectDir, "bin", configuration, ToolsetInfo.CurrentTargetFramework, rid, "publish");
917+
private string GetPublishArtifactsPath(string projectDir, string tfm, string rid, string configuration = "Debug")
918+
=> Path.Combine(projectDir, "bin", configuration, tfm, rid, "publish");
919919

920920
[DockerIsAvailableAndSupportsArchFact("linux/arm64")]
921921
public void EndToEndMultiArch_ArchivePublishing()
@@ -929,7 +929,7 @@ public void EndToEndMultiArch_ArchivePublishing()
929929
string imageArm64Tarball = Path.Combine(archiveOutput, $"{imageName}-linux-arm64.tar.gz");
930930

931931
// Create a new console project
932-
DirectoryInfo newProjectDir = CreateNewProject("console");
932+
DirectoryInfo newProjectDir = CreateNewProject("console", _oldFramework);
933933

934934
// Run PublishContainer for multi-arch with ContainerArchiveOutputPath
935935
CommandResult commandResult = new DotnetCommand(
@@ -949,8 +949,8 @@ public void EndToEndMultiArch_ArchivePublishing()
949949
// images were created locally for each RID
950950
// and image index was NOT created
951951
commandResult.Should().Pass()
952-
.And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-x64"))
953-
.And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-arm64"))
952+
.And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, _oldFramework, "linux-x64"))
953+
.And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, _oldFramework, "linux-arm64"))
954954
.And.HaveStdOutContaining($"Pushed image '{imageX64}' to local archive at '{imageX64Tarball}'")
955955
.And.HaveStdOutContaining($"Pushed image '{imageArm64}' to local archive at '{imageArm64Tarball}'")
956956
.And.NotHaveStdOutContaining("Pushed image index");
@@ -1001,7 +1001,7 @@ public void EndToEndMultiArch_RemoteRegistry()
10011001
string imageIndex = $"{imageName}:{imageTag}";
10021002

10031003
// Create a new console project
1004-
DirectoryInfo newProjectDir = CreateNewProject("console");
1004+
DirectoryInfo newProjectDir = CreateNewProject("console", _oldFramework);
10051005

10061006
// Run PublishContainer for multi-arch with ContainerRegistry
10071007
CommandResult commandResult = new DotnetCommand(
@@ -1021,8 +1021,8 @@ public void EndToEndMultiArch_RemoteRegistry()
10211021
// images were created locally for each RID
10221022
// and image index was created
10231023
commandResult.Should().Pass()
1024-
.And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-x64"))
1025-
.And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-arm64"))
1024+
.And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, _oldFramework, "linux-x64"))
1025+
.And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, _oldFramework, "linux-arm64"))
10261026
.And.HaveStdOutContaining($"Pushed image '{imageX64}' to registry")
10271027
.And.HaveStdOutContaining($"Pushed image '{imageArm64}' to registry")
10281028
.And.HaveStdOutContaining($"Pushed image index '{imageIndex}' to registry '{registry}'");
@@ -1084,7 +1084,7 @@ public void EndToEndMultiArch_RemoteRegistry()
10841084
public void EndToEndMultiArch_ContainerRuntimeIdentifiersOverridesRuntimeIdentifiers()
10851085
{
10861086
// Create a new console project
1087-
DirectoryInfo newProjectDir = CreateNewProject("console");
1087+
DirectoryInfo newProjectDir = CreateNewProject("console", _oldFramework);
10881088
string imageName = NewImageName();
10891089
string imageTag = "1.0";
10901090

@@ -1106,8 +1106,8 @@ public void EndToEndMultiArch_ContainerRuntimeIdentifiersOverridesRuntimeIdentif
11061106
// Check that the app was published only for RID from ContainerRuntimeIdentifiers
11071107
// images were created locally only for RID for from ContainerRuntimeIdentifiers
11081108
commandResult.Should().Pass()
1109-
.And.NotHaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-x64"))
1110-
.And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-arm64"))
1109+
.And.NotHaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, _oldFramework, "linux-x64"))
1110+
.And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, _oldFramework, "linux-arm64"))
11111111
.And.NotHaveStdOutContaining($"Pushed image '{imageName}:{imageTag}-linux-x64' to local registry")
11121112
.And.HaveStdOutContaining($"Pushed image '{imageName}:{imageTag}-linux-arm64' to local registry");
11131113

@@ -1124,7 +1124,7 @@ public void EndToEndMultiArch_EnvVariables()
11241124
string imageArm64 = $"{imageName}:{imageTag}-linux-arm64";
11251125

11261126
// Create new console app, set ContainerEnvironmentVariables, and set to output env variable
1127-
DirectoryInfo newProjectDir = CreateNewProject("console");
1127+
DirectoryInfo newProjectDir = CreateNewProject("console", _oldFramework);
11281128
var csprojPath = Path.Combine(newProjectDir.FullName, $"{nameof(EndToEndMultiArch_EnvVariables)}.csproj");
11291129
var csprojContent = File.ReadAllText(csprojPath);
11301130
csprojContent = csprojContent.Replace("</Project>",
@@ -1191,7 +1191,7 @@ public void EndToEndMultiArch_Ports()
11911191
string imageArm64 = $"{imageName}:{imageTag}-linux-arm64";
11921192

11931193
// Create new web app, set ContainerPort
1194-
DirectoryInfo newProjectDir = CreateNewProject("webapp");
1194+
DirectoryInfo newProjectDir = CreateNewProject("webapp", _oldFramework);
11951195
var csprojPath = Path.Combine(newProjectDir.FullName, $"{nameof(EndToEndMultiArch_Ports)}.csproj");
11961196
var csprojContent = File.ReadAllText(csprojPath);
11971197
csprojContent = csprojContent.Replace("</Project>",

0 commit comments

Comments
 (0)