Skip to content

Commit a581ad8

Browse files
surayya-MSsurayya-MS
committed
use net 9 base images instead of net 9 preview
1 parent b529e6f commit a581ad8

File tree

3 files changed

+17
-25
lines changed

3 files changed

+17
-25
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public void Tasks_EndToEnd_With_EnvironmentVariable_Validation()
153153

154154
File.WriteAllText(Path.Combine(newProjectDir.FullName, "Program.cs"), $"Console.Write(Environment.GetEnvironmentVariable(\"GoodEnvVar\"));");
155155

156-
new DotnetCommand(_testOutput, "build", "--configuration", "release", "/p:runtimeidentifier=linux-x64", $"/p:RuntimeFrameworkVersion={DockerRegistryManager.RuntimeFrameworkVersion}")
156+
new DotnetCommand(_testOutput, "build", "--configuration", "release", "/p:runtimeidentifier=linux-x64")
157157
.WithWorkingDirectory(newProjectDir.FullName)
158158
.Execute()
159159
.Should().Pass();
@@ -162,7 +162,7 @@ public void Tasks_EndToEnd_With_EnvironmentVariable_Validation()
162162
(IBuildEngine buildEngine, List<string?> errors) = SetupBuildEngine();
163163
pcp.BuildEngine = buildEngine;
164164

165-
pcp.FullyQualifiedBaseImageName = $"mcr.microsoft.com/{DockerRegistryManager.RuntimeBaseImage}:{DockerRegistryManager.Net9PreviewImageTag}";
165+
pcp.FullyQualifiedBaseImageName = $"mcr.microsoft.com/{DockerRegistryManager.RuntimeBaseImage}:{DockerRegistryManager.Net9ImageTag}";
166166
pcp.ContainerRegistry = "";
167167
pcp.ContainerRepository = "dotnet/envvarvalidation";
168168
pcp.ContainerImageTag = "latest";
@@ -175,7 +175,7 @@ public void Tasks_EndToEnd_With_EnvironmentVariable_Validation()
175175
Assert.True(pcp.Execute(), FormatBuildMessages(errors));
176176
Assert.Equal("mcr.microsoft.com", pcp.ParsedContainerRegistry);
177177
Assert.Equal("dotnet/runtime", pcp.ParsedContainerImage);
178-
Assert.Equal(DockerRegistryManager.Net9PreviewImageTag, pcp.ParsedContainerTag);
178+
Assert.Equal(DockerRegistryManager.Net9ImageTag, pcp.ParsedContainerTag);
179179
Assert.Single(pcp.NewContainerEnvironmentVariables);
180180
Assert.Equal("Foo", pcp.NewContainerEnvironmentVariables[0].GetMetadata("Value"));
181181

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@ public class DockerRegistryManager
1515
public const string Net6ImageTag = "6.0";
1616
public const string Net7ImageTag = "7.0";
1717
public const string Net8ImageTag = "8.0";
18-
public const string Net9PreviewImageTag = "9.0-preview";
19-
public const string RuntimeFrameworkVersion = "9.0.0-preview.3.24172.9";
18+
public const string Net9ImageTag = "9.0";
2019
public const string Net8PreviewWindowsSpecificImageTag = $"{Net8ImageTag}-nanoserver-ltsc2022";
2120
public const string LocalRegistry = "localhost:5010";
22-
public const string FullyQualifiedBaseImageDefault = $"{BaseImageSource}/{RuntimeBaseImage}:{Net9PreviewImageTag}";
23-
public const string FullyQualifiedBaseImageAspNet = $"{BaseImageSource}/{AspNetBaseImage}:{Net9PreviewImageTag}";
21+
public const string FullyQualifiedBaseImageDefault = $"{BaseImageSource}/{RuntimeBaseImage}:{Net9ImageTag}";
22+
public const string FullyQualifiedBaseImageAspNet = $"{BaseImageSource}/{AspNetBaseImage}:{Net9ImageTag}";
2423
private static string? s_registryContainerId;
2524

2625
internal class SameArchManifestPicker : IManifestPicker
@@ -72,7 +71,7 @@ public static async Task StartAndPopulateDockerRegistry(ITestOutputHelper testOu
7271

7372
EnsureRegistryLoaded(new Uri($"http://{LocalRegistry}"), s_registryContainerId, logger, testOutput);
7473

75-
foreach (string? tag in new[] { Net6ImageTag, Net7ImageTag, Net8ImageTag, Net9PreviewImageTag })
74+
foreach (string? tag in new[] { Net6ImageTag, Net7ImageTag, Net8ImageTag, Net9ImageTag })
7675
{
7776
logger.LogInformation("Pulling image '{repo}/{image}:{tag}'.", BaseImageSource, RuntimeBaseImage, tag);
7877
string dotnetdll = System.Reflection.Assembly.GetExecutingAssembly().Location;

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

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public async Task ApiEndToEndWithRegistryPushAndPull()
5353

5454
ImageBuilder imageBuilder = await registry.GetImageManifestAsync(
5555
DockerRegistryManager.RuntimeBaseImage,
56-
DockerRegistryManager.Net9PreviewImageTag,
56+
DockerRegistryManager.Net9ImageTag,
5757
"linux-x64",
5858
ToolsetUtils.RidGraphManifestPicker,
5959
cancellationToken: default).ConfigureAwait(false);
@@ -69,7 +69,7 @@ public async Task ApiEndToEndWithRegistryPushAndPull()
6969
BuiltImage builtImage = imageBuilder.Build();
7070

7171
// Push the image back to the local registry
72-
var sourceReference = new SourceImageReference(registry, DockerRegistryManager.RuntimeBaseImage, DockerRegistryManager.Net9PreviewImageTag);
72+
var sourceReference = new SourceImageReference(registry, DockerRegistryManager.RuntimeBaseImage, DockerRegistryManager.Net9ImageTag);
7373
var destinationReference = new DestinationImageReference(registry, NewImageName(), new[] { "latest", "1.0" });
7474

7575
await registry.PushAsync(builtImage, sourceReference, destinationReference, cancellationToken: default).ConfigureAwait(false);
@@ -100,7 +100,7 @@ public async Task ApiEndToEndWithLocalLoad()
100100

101101
ImageBuilder imageBuilder = await registry.GetImageManifestAsync(
102102
DockerRegistryManager.RuntimeBaseImage,
103-
DockerRegistryManager.Net9PreviewImageTag,
103+
DockerRegistryManager.Net9ImageTag,
104104
"linux-x64",
105105
ToolsetUtils.RidGraphManifestPicker,
106106
cancellationToken: default).ConfigureAwait(false);
@@ -115,7 +115,7 @@ public async Task ApiEndToEndWithLocalLoad()
115115
BuiltImage builtImage = imageBuilder.Build();
116116

117117
// Load the image into the local registry
118-
var sourceReference = new SourceImageReference(registry, DockerRegistryManager.RuntimeBaseImage, DockerRegistryManager.Net9PreviewImageTag);
118+
var sourceReference = new SourceImageReference(registry, DockerRegistryManager.RuntimeBaseImage, DockerRegistryManager.Net9ImageTag);
119119
var destinationReference = new DestinationImageReference(registry, NewImageName(), new[] { "latest", "1.0" });
120120

121121
await new DockerCli(_loggerFactory).LoadAsync(builtImage, sourceReference, destinationReference, default).ConfigureAwait(false);
@@ -141,7 +141,7 @@ public async Task ApiEndToEndWithArchiveWritingAndLoad()
141141

142142
ImageBuilder imageBuilder = await registry.GetImageManifestAsync(
143143
DockerRegistryManager.RuntimeBaseImage,
144-
DockerRegistryManager.Net9PreviewImageTag,
144+
DockerRegistryManager.Net9ImageTag,
145145
"linux-x64",
146146
ToolsetUtils.RidGraphManifestPicker,
147147
cancellationToken: default).ConfigureAwait(false);
@@ -158,7 +158,7 @@ public async Task ApiEndToEndWithArchiveWritingAndLoad()
158158
// Write the image to disk
159159
var archiveFile = Path.Combine(TestSettings.TestArtifactsDirectory,
160160
nameof(ApiEndToEndWithArchiveWritingAndLoad), "app.tar.gz");
161-
var sourceReference = new SourceImageReference(registry, DockerRegistryManager.RuntimeBaseImage, DockerRegistryManager.Net9PreviewImageTag);
161+
var sourceReference = new SourceImageReference(registry, DockerRegistryManager.RuntimeBaseImage, DockerRegistryManager.Net9ImageTag);
162162
var destinationReference = new DestinationImageReference(new ArchiveFileRegistry(archiveFile), NewImageName(), new[] { "latest", "1.0" });
163163

164164
await destinationReference.LocalRegistry!.LoadAsync(builtImage, sourceReference, destinationReference, default).ConfigureAwait(false);
@@ -342,11 +342,6 @@ private string BuildLocalApp([CallerMemberName] string testName = "TestName", st
342342
new DotnetCommand(_testOutput, "publish", "-bl", "MinimalTestApp", "-r", rid, "-f", tfm, "-c", "Debug")
343343
.WithWorkingDirectory(workingDirectory);
344344

345-
if (tfm == ToolsetInfo.CurrentTargetFramework)
346-
{
347-
publishCommand.Arguments.AddRange(new[] { "-p", $"RuntimeFrameworkVersion={DockerRegistryManager.RuntimeFrameworkVersion}" });
348-
}
349-
350345
publishCommand.Execute()
351346
.Should().Pass();
352347

@@ -510,8 +505,7 @@ public async Task EndToEnd_NoAPI_ProjectType(string projectType, bool addPackage
510505
$"/p:ContainerRegistry={DockerRegistryManager.LocalRegistry}",
511506
$"/p:ContainerRepository={imageName}",
512507
$"/p:ContainerImageTag={imageTag}",
513-
"/p:UseRazorSourceGenerator=false",
514-
$"/p:RuntimeFrameworkVersion={DockerRegistryManager.RuntimeFrameworkVersion}")
508+
"/p:UseRazorSourceGenerator=false")
515509
.WithEnvironmentVariable("NUGET_PACKAGES", privateNuGetAssets.FullName)
516510
.WithWorkingDirectory(newProjectDir.FullName)
517511
.Execute();
@@ -670,8 +664,7 @@ public void EndToEnd_NoAPI_Console()
670664
$"/p:ContainerRegistry={DockerRegistryManager.LocalRegistry}",
671665
$"/p:ContainerRepository={imageName}",
672666
$"/p:ContainerImageTag={imageTag}",
673-
"/p:EnableSdkContainerSupport=true",
674-
$"/p:RuntimeFrameworkVersion={DockerRegistryManager.RuntimeFrameworkVersion}")
667+
"/p:EnableSdkContainerSupport=true")
675668
.WithEnvironmentVariable("NUGET_PACKAGES", privateNuGetAssets.FullName)
676669
.WithWorkingDirectory(newProjectDir.FullName)
677670
.Execute()
@@ -1190,7 +1183,7 @@ public async Task CanPackageForAllSupportedContainerRIDs(string dockerPlatform,
11901183
var isWin = rid.StartsWith("win");
11911184
ImageBuilder? imageBuilder = await registry.GetImageManifestAsync(
11921185
DockerRegistryManager.RuntimeBaseImage,
1193-
isWin ? DockerRegistryManager.Net8PreviewWindowsSpecificImageTag : DockerRegistryManager.Net9PreviewImageTag,
1186+
isWin ? DockerRegistryManager.Net8PreviewWindowsSpecificImageTag : DockerRegistryManager.Net9ImageTag,
11941187
rid,
11951188
ToolsetUtils.RidGraphManifestPicker,
11961189
cancellationToken: default).ConfigureAwait(false);
@@ -1207,7 +1200,7 @@ public async Task CanPackageForAllSupportedContainerRIDs(string dockerPlatform,
12071200
BuiltImage builtImage = imageBuilder.Build();
12081201

12091202
// Load the image into the local registry
1210-
var sourceReference = new SourceImageReference(registry, DockerRegistryManager.RuntimeBaseImage, DockerRegistryManager.Net9PreviewImageTag);
1203+
var sourceReference = new SourceImageReference(registry, DockerRegistryManager.RuntimeBaseImage, DockerRegistryManager.Net9ImageTag);
12111204
var destinationReference = new DestinationImageReference(registry, NewImageName(), new[] { rid });
12121205
await new DockerCli(_loggerFactory).LoadAsync(builtImage, sourceReference, destinationReference, default).ConfigureAwait(false);
12131206

0 commit comments

Comments
 (0)