[release/9.0.2xx] allow reading all mcr image names (#45906)

github-actions[bot] · baronfel · web-flow · commit 6bb87ba3de4f · 2025-01-15T13:05:56.000-06:00
Co-authored-by: Chet Husk &lt;chusk3@gmail.com&gt;
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/ComputeDotnetBaseImageAndTag.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/ComputeDotnetBaseImageAndTag.cs
@@ -320,11 +320,11 @@ private bool ComputeRepositoryAndTag([NotNullWhen(true)] out string? repository,
         };
     }
 
-    private bool UserImageIsMicrosoftBaseImage => UserBaseImage?.StartsWith("mcr.microsoft.com/dotnet") ?? false;
+    private bool UserImageIsMicrosoftBaseImage => UserBaseImage?.StartsWith("mcr.microsoft.com/") ?? false;
 
     private void LogNoInferencePerformedTelemetry()
     {
-        // we should only log the base image, tag, containerFamily if we _know_ they are .NET's MCR images
+        // we should only log the base image, tag, containerFamily if we _know_ they are MCR images
         string? userBaseImage = null;
         string? userTag = null;
         string? containerFamily = null;

Original file line number	Diff line number	Diff line change
`@@ -320,11 +320,11 @@ private bool ComputeRepositoryAndTag([NotNullWhen(true)] out string? repository,`
`320`	`320`	`};`
`321`	`321`	`}`
`322`	`322`
`323`		`- private bool UserImageIsMicrosoftBaseImage => UserBaseImage?.StartsWith("mcr.microsoft.com/dotnet") ?? false;`
	`323`	`+ private bool UserImageIsMicrosoftBaseImage => UserBaseImage?.StartsWith("mcr.microsoft.com/") ?? false;`
`324`	`324`
`325`	`325`	`private void LogNoInferencePerformedTelemetry()`
`326`	`326`	`{`
`327`		`- // we should only log the base image, tag, containerFamily if we _know_ they are .NET's MCR images`
	`327`	`+ // we should only log the base image, tag, containerFamily if we _know_ they are MCR images`
`328`	`328`	`string? userBaseImage = null;`
`329`	`329`	`string? userTag = null;`
`330`	`330`	`string? containerFamily = null;`