Skip to content

Commit 511c121

Browse files
make globalized, AOT apps no longer require nightly (#39195)
Co-authored-by: Rainer Sigwald <[email protected]>
1 parent 6c1ba2f commit 511c121

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/Containers/Microsoft.NET.Build.Containers/Tasks/ComputeDotnetBaseImageAndTag.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@ public sealed class ComputeDotnetBaseImageAndTag : Microsoft.Build.Utilities.Tas
8080

8181
private bool IsMuslRid => TargetRuntimeIdentifier.StartsWith("linux-musl", StringComparison.Ordinal);
8282
private bool IsBundledRuntime => IsSelfContained;
83-
private bool NeedsNightlyImages => IsAotPublished;
83+
84+
// as of March 2024, the -extra images are on stable MCR, but the -aot images are still on nightly. This means AOT, invariant apps need the /nightly/ base.
85+
private bool NeedsNightlyImages => IsAotPublished && UsesInvariantGlobalization;
8486
private bool AllowsExperimentalTagInference => String.IsNullOrEmpty(ContainerFamily);
8587

8688
public ComputeDotnetBaseImageAndTag()

src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,8 +320,8 @@ public void AOTAppsGetAOTImages(string rid, string expectedImage)
320320
computedBaseImageTag.Should().BeEquivalentTo(expectedImage);
321321
}
322322

323-
[InlineData("linux-musl-x64", "mcr.microsoft.com/dotnet/nightly/runtime-deps:8.0-alpine-extra")]
324-
[InlineData("linux-x64", "mcr.microsoft.com/dotnet/nightly/runtime-deps:8.0-jammy-chiseled-extra")]
323+
[InlineData("linux-musl-x64", "mcr.microsoft.com/dotnet/runtime-deps:8.0-alpine-extra")]
324+
[InlineData("linux-x64", "mcr.microsoft.com/dotnet/runtime-deps:8.0-jammy-chiseled-extra")]
325325
[Theory]
326326
public void AOTAppsWithCulturesGetExtraImages(string rid, string expectedImage)
327327
{

0 commit comments

Comments
 (0)