Merge branch 'release/9.0.3xx' into merge/release/9.0.1xx-to-release/9.0.3xx

Author: SimonZhao888

azure-pipelines-pr.yml

@@ -51,7 +51,7 @@ stages:
       enablePublishTestResults: true
       enablePublishBuildAssets: true
       enablePublishUsingPipelines: ${{ variables._PublishUsingPipelines }}
-      enableSourceBuild: true
+      enableSourceBuild: false
       sourceBuildParameters:
         enableInternalSources: true
       enableTelemetry: true

azure-pipelines.yml

@@ -81,7 +81,7 @@ extends:
           enablePublishTestResults: true
           enablePublishBuildAssets: true
           enablePublishUsingPipelines: ${{ variables._PublishUsingPipelines }}
-          enableSourceBuild: true
+          enableSourceBuild: false
           publishAssetsImmediately: true
           sourceBuildParameters:
             enableInternalSources: true

eng/Version.Details.xml

@@ -2,9 +2,9 @@
 <Dependencies>
   <ProductDependencies>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.24575.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.24515.2">
       <Uri>https://github.com/dotnet/source-build-externals</Uri>
-      <Sha>ab469606a3e6b026dcac301e2dab96117c94faeb</Sha>
+      <Sha>659bf534d9fbf673493b821be99df12032277549</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
     <!-- Intermediate is necessary for source build. -->

eng/Versions.props

@@ -1,11 +1,11 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>9.0.112</VersionPrefix>
+    <VersionPrefix>9.0.307</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>
     <!-- Calculate prerelease label -->
-    <PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">rtm</PreReleaseVersionLabel>
+    <PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">preview</PreReleaseVersionLabel>
     <PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and $(VersionPrefix.EndsWith('00'))">rtm</PreReleaseVersionLabel>
     <PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and !$(VersionPrefix.EndsWith('00'))">servicing</PreReleaseVersionLabel>
     <PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">

src/Microsoft.TemplateEngine.Edge/Constraints/WorkloadConstraintFactory.cs

@@ -11,6 +11,8 @@ namespace Microsoft.TemplateEngine.Edge.Constraints
 {
     public sealed class WorkloadConstraintFactory : ITemplateConstraintFactory
     {
+        private static readonly SemaphoreSlim Mutex = new(1);
+
         Guid IIdentifiedComponent.Id { get; } = Guid.Parse("{F8BA5B13-7BD6-47C8-838C-66626526817B}");
 
         string ITemplateConstraintFactory.Type => "workload";
@@ -97,8 +99,17 @@ private static IEnumerable<string> ParseArgs(string? args)
                 }
 
                 token.ThrowIfCancellationRequested();
-                IEnumerable<WorkloadInfo> currentProviderWorkloads = await providers[0].GetInstalledWorkloadsAsync(token).ConfigureAwait(false);
-                workloads = currentProviderWorkloads.ToList();
+
+                await Mutex.WaitAsync(token).ConfigureAwait(false);
+                try
+                {
+                    IEnumerable<WorkloadInfo> currentProviderWorkloads = await providers[0].GetInstalledWorkloadsAsync(token).ConfigureAwait(false);
+                    workloads = currentProviderWorkloads.ToList();
+                }
+                finally
+                {
+                    Mutex.Release();
+                }
 
                 if (workloads.Select(w => w.Id).HasDuplicates(StringComparer.InvariantCultureIgnoreCase))
                 {

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.");
+        }
+    }
+}