Merge branch 'release/9.0.3xx' of https://github.com/dotnet/templating into merge/release/9.0.2xx-to-release/9.0.3xx

Author: v-wuzhai

eng/Versions.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>9.0.205</VersionPrefix>
+    <VersionPrefix>9.0.301</VersionPrefix>
     <!-- When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages -->
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
     <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>

src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ParameterConverter.cs

@@ -188,6 +188,7 @@ private static bool TryResolveChoiceValue(string? literal, ITemplateParameter pa
             }
 
             string? partialMatch = null;
+            bool multiplePartialMatches = false;
 
             foreach (string choiceValue in param.Choices.Keys)
             {
@@ -205,13 +206,19 @@ private static bool TryResolveChoiceValue(string? literal, ITemplateParameter pa
                     }
                     else
                     {
-                        // multiple partial matches, can't take one.
-                        match = null;
-                        return false;
+                        // Multiple partial matches, keep searching for exact match, fail if we don't find one
+                        // because we don't know which partial match we should select.
+                        multiplePartialMatches = true;
                     }
                 }
             }
 
+            if (multiplePartialMatches)
+            {
+                match = null;
+                return false;
+            }
+
             match = partialMatch;
             return match != null;
         }

test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Approvals/TestSelectionForMultiChoicesWhenThereAreMultiplePartialMatchesAndOnePreciseMatch._.verified/TestAssets.TemplateWithMultipleChoicesAndPartialMatches/Program.cs

@@ -0,0 +1,10 @@
+namespace ConsoleApp
+{
+    internal class Program
+    {
+        static void Main(string[] args)
+        {
+            Console.WriteLine("User's choice is: aa.");
+        }
+    }
+}

test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/SnapshotTests.cs

@@ -273,6 +273,35 @@ public Task TestTemplateWithCircleDependencyInMacros()
             VerificationEngine engine = new VerificationEngine(_log);
             return engine.Execute(options);
         }
+
+        [Fact]
+        public Task TestSelectionForMultiChoicesWhenThereAreMultiplePartialMatchesAndOnePreciseMatch()
+        {
+            string templateLocation = GetTestTemplateLocation("TemplateWithMultipleChoicesAndPartialMatches");
+            var templateParams = new Dictionary<string, string?>()
+            {
+                // There are multiple choices for the parameter that overlap: "aab", "aac", "aa".
+                // We want to ensure that "aa" can be selected, because it is a precise match,
+                // even if there are more than one choices that start with "aa", and even if "aa",
+                // is not listed first in the list of choices.
+                { "tests", "aa" }
+            };
+            string workingDir = TestUtils.CreateTemporaryFolder();
+
+            TemplateVerifierOptions options =
+                new TemplateVerifierOptions(templateName: "TestAssets.TemplateWithMultipleChoicesAndPartialMatches")
+                {
+                    TemplatePath = templateLocation,
+                    OutputDirectory = workingDir,
+                    DoNotAppendTemplateArgsToScenarioName = true,
+                    DoNotPrependTemplateNameToScenarioName = true,
+                    SnapshotsDirectory = "Approvals"
+                }
+                .WithInstantiationThroughTemplateCreatorApi(templateParams);
+
+            VerificationEngine engine = new VerificationEngine(_log);
+            return engine.Execute(options);
+        }
     }
 }
 

test/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultipleChoicesAndPartialMatches/.template.config/template.json

@@ -0,0 +1,36 @@
+{
+  "$schema": "https://json.schemastore.org/template.json",
+  "author": "Test Asset",
+  "classifications": [ "Test Asset" ],
+  "name": "TemplateWithMultipleChoicesAndPartialMatches",
+  "tags": { "type": "project" },
+  "generatorVersions": "[1.0.0.0-*)",
+  "groupIdentity": "TestAssets.TemplateWithMultipleChoicesAndPartialMatches",
+  "precedence": "100",
+  "identity": "TestAssets.TemplateWithMultipleChoicesAndPartialMatches",
+  "shortName": "TestAssets.TemplateWithMultipleChoicesAndPartialMatches",
+  "symbols": {
+    "tests": {
+      "displayName": "Tests",
+      "type": "parameter",
+      "datatype": "choice",
+      "replaces": "user_selectedtests",
+      "allowMultipleValues": true,
+      "enableQuotelessLiterals": true,
+      "choices": [
+        {
+          "choice": "aab",
+          "displayName": "aab"
+        },
+        {
+          "choice": "aaa",
+          "displayName": "aaa"
+        },
+        {
+          "choice": "aa",
+          "displayName": "aa"
+        }
+      ]
+    }
+  }
+}

test/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultipleChoicesAndPartialMatches/Program.cs

@@ -0,0 +1,10 @@
+namespace ConsoleApp
+{
+    internal class Program
+    {
+        static void Main(string[] args)
+        {
+            Console.WriteLine("User's choice is: user_selectedtests.");
+        }
+    }
+}