FDD jammy apps with globalization that opt into chiseled need -extra

Author: baronfel

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

@@ -107,7 +107,7 @@ public override bool Execute()
 
     private bool ComputeRepositoryAndTag([NotNullWhen(true)] out string? repository, [NotNullWhen(true)] out string? tag)
     {
-        if (ComputeVersionPart() is (string baseVersionPart, bool versionAllowsUsingAOTAndExtrasImages))
+        if (ComputeVersionPart() is (string baseVersionPart, SemanticVersion parsedVersion, bool versionAllowsUsingAOTAndExtrasImages))
         {
             Log.LogMessage("Computed base version tag of {0} from TFM {1} and SDK {2}", baseVersionPart, TargetFrameworkVersion, SdkVersion);
             if (baseVersionPart is null)
@@ -133,6 +133,22 @@ private bool ComputeRepositoryAndTag([NotNullWhen(true)] out string? repository,
                 // for the inferred image tags, 'family' aka 'flavor' comes after the 'version' portion (including any preview/rc segments).
                 // so it's safe to just append here
                 tag += $"-{ContainerFamily}";
+                Log.LogMessage("Using user-provided ContainerFamily");
+
+                // we can do one final check here: if the containerfamily is the 'default' for the RID
+                // in question, and the app is globalized, we can help and add -extra so the app will actually run
+
+                if (
+                    (!IsMuslRid && ContainerFamily == "jammy-chiseled") // default for linux RID
+                    && !UsesInvariantGlobalization
+                    && versionAllowsUsingAOTAndExtrasImages
+                    // the extras only became available on the stable tags of the FirstVersionWithNewTaggingScheme
+                    && (!parsedVersion.IsPrerelease && parsedVersion.Major == FirstVersionWithNewTaggingScheme))
+                {
+                    Log.LogMessage("Using extra variant because the application needs globalization");
+                    tag += "-extra";
+                }
+
                 return true;
             }
             else
@@ -180,18 +196,18 @@ private bool ComputeRepositoryAndTag([NotNullWhen(true)] out string? repository,
         }
     }
 
-    private (string, bool)? ComputeVersionPart()
+    private (string, SemanticVersion, bool)? ComputeVersionPart()
     {
         if (SemanticVersion.TryParse(TargetFrameworkVersion, out var tfm) && tfm.Major < FirstVersionWithNewTaggingScheme)
         {
             // < 8 TFMs don't support the -aot and -extras images
-            return ($"{tfm.Major}.{tfm.Minor}", false);
+            return ($"{tfm.Major}.{tfm.Minor}", tfm, false);
         }
         else if (SemanticVersion.TryParse(SdkVersion, out var version))
         {
             if (ComputeVersionInternal(version, tfm) is string majMinor)
             {
-                return (majMinor, true);
+                return (majMinor, version, true);
             }
             else
             {

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

@@ -260,7 +260,7 @@ public void WindowsUsersGetLinuxContainers(string sdkPortableRid, string expecte
     [InlineData("8.0.100-preview.2", "v8.0", "jammy", "8.0.0-preview.2-jammy")]
     [InlineData("8.0.100-preview.2", "v8.0", "jammy-chiseled", "8.0.0-preview.2-jammy-chiseled")]
     [InlineData("8.0.100-rc.2", "v8.0", "jammy-chiseled", "8.0.0-rc.2-jammy-chiseled")]
-    [InlineData("8.0.100", "v8.0", "jammy-chiseled", "8.0-jammy-chiseled")]
+    [InlineData("8.0.100", "v8.0", "jammy-chiseled", "8.0-jammy-chiseled-extra")]
     [Theory]
     public void CanTakeContainerBaseFamilyIntoAccount(string sdkVersion, string tfmMajMin, string containerFamily, string expectedTag)
     {
@@ -383,6 +383,47 @@ public void AOTAppsLessThan8DoNotGetAOTImages(string rid, string expectedImage)
         computedBaseImageTag.Should().BeEquivalentTo(expectedImage);
     }
 
+    [Fact]
+    public void FDDConsoleAppWithCulturesAndOptingIntoChiseledGetsExtras()
+    {
+        var expectedImage = "mcr.microsoft.com/dotnet/runtime:8.0-jammy-chiseled-extra";
+        var (project, logger, d) = ProjectInitializer.InitProject(new()
+        {
+            ["NetCoreSdkVersion"] = "8.0.100",
+            ["TargetFrameworkVersion"] = "v8.0",
+            [KnownStrings.Properties.ContainerRuntimeIdentifier] = "linux-x64",
+            [KnownStrings.Properties.ContainerFamily] = "jammy-chiseled",
+            [KnownStrings.Properties.InvariantGlobalization] = false.ToString(),
+        }, projectName: $"{nameof(FDDConsoleAppWithCulturesAndOptingIntoChiseledGetsExtras)}");
+        using var _ = d;
+        var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None);
+        instance.Build(new[] { ComputeContainerBaseImage }, null, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors));
+        var computedBaseImageTag = instance.GetProperty(ContainerBaseImage)?.EvaluatedValue;
+        computedBaseImageTag.Should().BeEquivalentTo(expectedImage);
+    }
+
+    [Fact]
+    public void FDDAspNetAppWithCulturesAndOptingIntoChiseledGetsExtras()
+    {
+        var expectedImage = "mcr.microsoft.com/dotnet/aspnet:8.0-jammy-chiseled-extra";
+        var (project, logger, d) = ProjectInitializer.InitProject(new()
+        {
+            ["NetCoreSdkVersion"] = "8.0.100",
+            ["TargetFrameworkVersion"] = "v8.0",
+            [KnownStrings.Properties.ContainerRuntimeIdentifier] = "linux-x64",
+            [KnownStrings.Properties.ContainerFamily] = "jammy-chiseled",
+            [KnownStrings.Properties.InvariantGlobalization] = false.ToString(),
+        }, bonusItems: new()
+        {
+            [KnownStrings.Items.FrameworkReference] = KnownFrameworkReferences.WebApp
+        }, projectName: $"{nameof(FDDAspNetAppWithCulturesAndOptingIntoChiseledGetsExtras)}");
+        using var _ = d;
+        var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None);
+        instance.Build(new[] { ComputeContainerBaseImage }, null, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors));
+        var computedBaseImageTag = instance.GetProperty(ContainerBaseImage)?.EvaluatedValue;
+        computedBaseImageTag.Should().BeEquivalentTo(expectedImage);
+    }
+
     [InlineData("linux-musl-x64", "mcr.microsoft.com/dotnet/runtime-deps:7.0-alpine")]
     [InlineData("linux-x64", "mcr.microsoft.com/dotnet/runtime-deps:7.0")]
     [Theory]