fix dotnet (#2900)

Author: sarsharma

src/BuildScriptGenerator/DotNetCore/DotnetCorePlatform.cs

@@ -287,11 +287,27 @@ public string GetInstallerScriptSnippet(
             // 3. Try Direct-ACR (direct OCI API calls)
             if (this.commonOptions.EnableAcrSdkProvider)
             {
-                var runtimeVersion = dotNetCorePlatformDetectorResult.PlatformVersion;
-                var result = this.TryInstallFromAcrSdkProvider(sdkVersion, runtimeVersion);
-                if (result != null)
+                // DirectACR needs the exact runtime version for the tag (e.g. "10.0.4", not "10.0").
+                // If ExternalACR handled version resolution, PlatformVersion may still be raw.
+                // Try to resolve it — the version map is lazily loaded and cached.
+                // If resolution fails, skip DirectACR entirely and let next provider handle it.
+                try
                 {
-                    return result;
+                    var runtimeVersion = this.GetMaxSatisfyingRuntimeVersionAndVerify(
+                        dotNetCorePlatformDetectorResult.PlatformVersion);
+                    dotNetCorePlatformDetectorResult.PlatformVersion = runtimeVersion;
+
+                    var result = this.TryInstallFromAcrSdkProvider(sdkVersion, runtimeVersion);
+                    if (result != null)
+                    {
+                        return result;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    this.logger.LogWarning(
+                        ex,
+                        "Could not resolve runtime version for DirectACR. Skipping to next provider.");
                 }
             }
 
@@ -314,17 +330,14 @@ public void ResolveVersions(RepositoryContext context, PlatformDetectorResult de
                     $"'{typeof(DotNetCorePlatformDetectorResult)}' but got '{detectorResult.GetType()}'.");
             }
 
-            // Resolve runtime version (same for all flows — ExternalAcrSdkProvider does not affect this).
-            var resolvedRuntimeVersion = this.GetRuntimeVersionUsingHierarchicalRules(
-                dotNetCorePlatformDetectorResult.PlatformVersion);
-            resolvedRuntimeVersion = this.GetMaxSatisfyingRuntimeVersionAndVerify(resolvedRuntimeVersion);
-            dotNetCorePlatformDetectorResult.PlatformVersion = resolvedRuntimeVersion;
-
-            // Resolve SDK version.
-            // External ACR provider dictates the SDK version directly — no runtime→SDK lookup needed.
-            // This is .NET-specific: other platforms have a single version,
-            // but .NET has separate runtime and SDK versions. The external host already knows
-            // which SDK companion image to use, so we trust its SDK version.
+            // When External ACR is enabled, try it first — it dictates the SDK version
+            // directly, without needing the runtime→SDK version map from blob/CDN.
+            // The runtime version is expected to come from the user (--platform-version / DOTNET_VERSION)
+            // or from .csproj detection (<TargetFramework>). We use it as-is without
+            // validation against a version map — the external host already ensures
+            // compatibility between the runtime and the SDK it provides.
+            // If the SDK fetch later falls back to DirectACR, the runtime version is
+            // resolved on demand at that point
             if (this.commonOptions.EnableExternalAcrSdkProvider)
             {
                 try
@@ -335,6 +348,10 @@ public void ResolveVersions(RepositoryContext context, PlatformDetectorResult de
                         this.logger.LogInformation(
                             "External ACR provider returned .NET SDK version {Version}. Using it directly.",
                             dictatedSdk);
+
+                        var resolvedRuntime = this.GetRuntimeVersionUsingHierarchicalRules(
+                            dotNetCorePlatformDetectorResult.PlatformVersion);
+                        dotNetCorePlatformDetectorResult.PlatformVersion = resolvedRuntime;
                         dotNetCorePlatformDetectorResult.SdkVersion = dictatedSdk;
                         return;
                     }
@@ -347,7 +364,12 @@ public void ResolveVersions(RepositoryContext context, PlatformDetectorResult de
                 }
             }
 
-            // Normal SDK resolution: look up from runtime→SDK version map.
+            // Normal path: resolve runtime version using the version map, then look up SDK.
+            var resolvedRuntimeVersion = this.GetRuntimeVersionUsingHierarchicalRules(
+                dotNetCorePlatformDetectorResult.PlatformVersion);
+            resolvedRuntimeVersion = this.GetMaxSatisfyingRuntimeVersionAndVerify(resolvedRuntimeVersion);
+            dotNetCorePlatformDetectorResult.PlatformVersion = resolvedRuntimeVersion;
+
             var versionMap = this.versionProvider.GetSupportedVersions();
             var sdkVersion = this.GetSdkVersion(context, dotNetCorePlatformDetectorResult.PlatformVersion, versionMap);
             dotNetCorePlatformDetectorResult.SdkVersion = sdkVersion;

tests/BuildScriptGenerator.Tests/DotnetCore/DotNetCorePlatformTest.cs

@@ -172,13 +172,17 @@ public void GetInstallerScript_UsesDirectAcrProvider_IfEnabled_AndSdkIsNotAlread
                 detector,
                 commonOptions: commonOptions,
                 sdkAlreadyInstalled: false,
-                acrSdkProvider: acrSdkProvider);
+                acrSdkProvider: acrSdkProvider,
+                supportedVersions: new Dictionary<string, string>
+                {
+                    { "3.1.32", "3.1.426" },
+                });
             var context = CreateContext();
             var detectorResult = new DotNetCorePlatformDetectorResult
             {
                 Platform = DotNetCoreConstants.PlatformName,
-                PlatformVersion = "3.1.2",
-                SdkVersion = "3.1.2",
+                PlatformVersion = "3.1.32",
+                SdkVersion = "3.1.426",
             };
 
             // Act
@@ -247,13 +251,17 @@ public void GetInstallerScript_FallsBackToCdn_WhenAllProvidersFail()
                 sdkAlreadyInstalled: false,
                 externalAcrSdkProvider: externalAcrSdkProvider,
                 acrSdkProvider: acrSdkProvider,
-                externalSdkProvider: externalSdkProvider);
+                externalSdkProvider: externalSdkProvider,
+                supportedVersions: new Dictionary<string, string>
+                {
+                    { "3.1.32", "3.1.426" },
+                });
             var context = CreateContext();
             var detectorResult = new DotNetCorePlatformDetectorResult
             {
                 Platform = DotNetCoreConstants.PlatformName,
-                PlatformVersion = "3.1.2",
-                SdkVersion = "3.1.2",
+                PlatformVersion = "3.1.32",
+                SdkVersion = "3.1.426",
             };
 
             // Act
@@ -285,14 +293,14 @@ public void GetInstallerScript_DirectAcrProvider_PassesRuntimeVersion()
                 acrSdkProvider: acrSdkProvider,
                 supportedVersions: new Dictionary<string, string>
                 {
-                    { "3.1.2", "3.1.2" },
+                    { "3.1.32", "3.1.426" },
                 });
             var context = CreateContext();
             var detectorResult = new DotNetCorePlatformDetectorResult
             {
                 Platform = DotNetCoreConstants.PlatformName,
-                PlatformVersion = "3.1.2",
-                SdkVersion = "3.1.2",
+                PlatformVersion = "3.1.32",
+                SdkVersion = "3.1.426",
             };
 
             // Act
@@ -302,9 +310,9 @@ public void GetInstallerScript_DirectAcrProvider_PassesRuntimeVersion()
             Assert.NotNull(snippet);
             Assert.True(acrSdkProvider.RequestSdkFromAcrAsyncCalled);
             Assert.Equal(DotNetCoreConstants.PlatformName, acrSdkProvider.LastRequestedPlatformName);
-            Assert.Equal("3.1.2", acrSdkProvider.LastRequestedVersion);
+            Assert.Equal("3.1.426", acrSdkProvider.LastRequestedVersion);
             Assert.Equal(OsTypes.DebianBookworm, acrSdkProvider.LastRequestedDebianFlavor);
-            Assert.Equal("3.1.2", acrSdkProvider.LastRequestedRuntimeVersion);
+            Assert.Equal("3.1.32", acrSdkProvider.LastRequestedRuntimeVersion);
         }
 
         [Fact]
@@ -329,13 +337,17 @@ public void GetInstallerScript_FallsBackFromExternalAcrToDirectAcr_WhenBothExter
                 sdkAlreadyInstalled: false,
                 externalAcrSdkProvider: externalAcrSdkProvider,
                 acrSdkProvider: acrSdkProvider,
-                externalSdkProvider: externalSdkProvider);
+                externalSdkProvider: externalSdkProvider,
+                supportedVersions: new Dictionary<string, string>
+                {
+                    { "3.1.32", "3.1.426" },
+                });
             var context = CreateContext();
             var detectorResult = new DotNetCorePlatformDetectorResult
             {
                 Platform = DotNetCoreConstants.PlatformName,
-                PlatformVersion = "3.1.2",
-                SdkVersion = "3.1.2",
+                PlatformVersion = "3.1.32",
+                SdkVersion = "3.1.426",
             };
 
             // Act
@@ -380,8 +392,11 @@ public void ResolveVersions_UsesExternalAcrSdkVersion_WhenEnabled()
             // Act
             platform.ResolveVersions(context, detectorResult);
 
-            // Assert - ExternalACR dictates SDK version, overriding normal map lookup
+            // Assert - ExternalACR dictates SDK version, overriding normal map lookup.
+            // PlatformVersion is only processed by hierarchical rules (not fully resolved
+            // against the version map), so it stays as the detected value.
             Assert.Equal("3.1.415", detectorResult.SdkVersion);
+            Assert.Equal("3.1", detectorResult.PlatformVersion);
         }
 
         [Fact]
@@ -416,8 +431,10 @@ public void ResolveVersions_FallsBackToVersionMap_WhenExternalAcrReturnsNull()
             // Act
             platform.ResolveVersions(context, detectorResult);
 
-            // Assert - Falls back to normal version map
+            // Assert - Falls back to normal version map.
+            // PlatformVersion is fully resolved (hierarchical rules + version map).
             Assert.Equal("3.1.302", detectorResult.SdkVersion);
+            Assert.Equal("3.1.2", detectorResult.PlatformVersion);
         }
 
         private BuildScriptGeneratorContext CreateContext(ISourceRepo sourceRepo = null)
@@ -637,4 +654,4 @@ private DotNetCorePlatform CreatePlatformWithExternalAcrVersionProvider(
                 new DefaultStandardOutputWriter());
         }
     }
-}
+}