Merge branch 'release/7.0.4xx'

Jason Zhai · Jason Zhai · commit f921fc644637 · 2023-04-19T23:13:10.000-07:00
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/ComputeDotnetBaseImageTag.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/ComputeDotnetBaseImageTag.cs
@@ -77,7 +77,7 @@ public override bool Execute()
     }
 
      private string? DetermineLabelBasedOnChannel(int major, int minor, string[] releaseLabels) {
-      // this would be a switch, but we have to support net47s where Range and Index aren't available
+      // this would be a switch, but we have to support net47x where Range and Index aren't available
         if (releaseLabels.Length == 0)
         {
             return $"{major}.{minor}";
@@ -89,19 +89,17 @@ public override bool Execute()
             {
                 if (releaseLabels.Length > 1)
                 {
-                    return $"{major}.{minor}-{channel}.{releaseLabels[1]}";
+                    // Per the dotnet-docker team, the major.minor preview tag format is a fluke and the major.minor.0 form
+                    // should be used for all previews going forward.
+                    return $"{major}.{minor}.0-{channel}.{releaseLabels[1]}";
                 }
                 else
                 {
                     Log.LogError(Resources.Strings.InvalidSdkPrereleaseVersion, channel);
                     return null;
                 }
             }
-            else if (channel == "alpha")
-            {
-                return $"{major}.{minor}-preview.1";
-            }
-            else if (channel == "dev" || channel == "ci")
+            else if (channel == "alpha" || channel == "dev" || channel == "ci")
             {
                 return $"{major}.{minor}-preview";
             }
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
@@ -144,7 +144,8 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
                 {
                     if (BuildEngine != null)
                     {
-                        Log.LogErrorWithCodeFromResources(nameof(Strings.RegistryOutputPushFailed), e);
+                        Log.LogErrorWithCodeFromResources(nameof(Strings.RegistryOutputPushFailed), e.Message);
+                        Log.LogMessage(MessageImportance.Low, "Details: {0}", e);
                     }
                 }
             }
diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs
@@ -131,8 +131,8 @@ public void ShouldNotIncludeSourceControlLabelsUnlessUserOptsIn(bool includeSour
     [InlineData("7.0.100-rc.1", "v7.0", "7.0")]
     [InlineData("8.0.100", "v8.0", "8.0")]
     [InlineData("8.0.100", "v7.0", "7.0")]
-    [InlineData("8.0.100-preview.7", "v8.0", "8.0-preview.7")]
-    [InlineData("8.0.100-rc.1", "v8.0", "8.0-rc.1")]
+    [InlineData("8.0.100-preview.7", "v8.0", "8.0.0-preview.7")]
+    [InlineData("8.0.100-rc.1", "v8.0", "8.0.0-rc.1")]
     [InlineData("8.0.100-rc.1", "v7.0", "7.0")]
     [InlineData("8.0.200", "v8.0", "8.0")]
     [InlineData("8.0.200", "v7.0", "7.0")]
@@ -142,8 +142,8 @@ public void ShouldNotIncludeSourceControlLabelsUnlessUserOptsIn(bool includeSour
     [InlineData("6.0.100-preview.1", "v6.0", "6.0")]
     [InlineData("8.0.100-dev", "v8.0", "8.0-preview")]
     [InlineData("8.0.100-ci", "v8.0", "8.0-preview")]
-    [InlineData("8.0.100-alpha.12345", "v8.0", "8.0-preview.1")]
-    [InlineData("9.0.100-alpha.12345", "v9.0", "9.0-preview.1")]
+    [InlineData("8.0.100-alpha.12345", "v8.0", "8.0-preview")]
+    [InlineData("9.0.100-alpha.12345", "v9.0", "9.0-preview")]
     [Theory]
     public void CanComputeTagsForSupportedSDKVersions(string sdkVersion, string tfm, string expectedTag)
     {

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public override bool Execute()`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`private string? DetermineLabelBasedOnChannel(int major, int minor, string[] releaseLabels) {`
`80`		`- // this would be a switch, but we have to support net47s where Range and Index aren't available`
	`80`	`+ // this would be a switch, but we have to support net47x where Range and Index aren't available`
`81`	`81`	`if (releaseLabels.Length == 0)`
`82`	`82`	`{`
`83`	`83`	`return $"{major}.{minor}";`
`@@ -89,19 +89,17 @@ public override bool Execute()`
`89`	`89`	`{`
`90`	`90`	`if (releaseLabels.Length > 1)`
`91`	`91`	`{`
`92`		`- return $"{major}.{minor}-{channel}.{releaseLabels[1]}";`
	`92`	`+ // Per the dotnet-docker team, the major.minor preview tag format is a fluke and the major.minor.0 form`
	`93`	`+ // should be used for all previews going forward.`
	`94`	`+ return $"{major}.{minor}.0-{channel}.{releaseLabels[1]}";`
`93`	`95`	`}`
`94`	`96`	`else`
`95`	`97`	`{`
`96`	`98`	`Log.LogError(Resources.Strings.InvalidSdkPrereleaseVersion, channel);`
`97`	`99`	`return null;`
`98`	`100`	`}`
`99`	`101`	`}`
`100`		`- else if (channel == "alpha")`
`101`		`- {`
`102`		`- return $"{major}.{minor}-preview.1";`
`103`		`- }`
`104`		`- else if (channel == "dev" \|\| channel == "ci")`
	`102`	`+ else if (channel == "alpha" \|\| channel == "dev" \|\| channel == "ci")`
`105`	`103`	`{`
`106`	`104`	`return $"{major}.{minor}-preview";`
`107`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,8 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)`
`144`	`144`	`{`
`145`	`145`	`if (BuildEngine != null)`
`146`	`146`	`{`
`147`		`- Log.LogErrorWithCodeFromResources(nameof(Strings.RegistryOutputPushFailed), e);`
	`147`	`+ Log.LogErrorWithCodeFromResources(nameof(Strings.RegistryOutputPushFailed), e.Message);`
	`148`	`+ Log.LogMessage(MessageImportance.Low, "Details: {0}", e);`
`148`	`149`	`}`
`149`	`150`	`}`
`150`	`151`	`}`