Implemented latest ITemplateInfo interface and updated .NET analyzers.

microsoft · Feb 11, 2023 · 68b5079 · 68b5079
1 parent 952b3a6
commit 68b5079
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 22 deletions.
diff --git a/code/SharedFunctionality.Core/Gen/GenComposer.cs b/code/SharedFunctionality.Core/Gen/GenComposer.cs
@@ -132,7 +132,7 @@ private static void AddTemplates(IEnumerable<UserSelectionItem> selectedTemplate
 
                     foreach (var dependency in genInfo?.Template.GetDependencyList())
                     {
-                        if (genInfo.Template.Parameters.Any(p => p.Name == dependency))
+                        if (genInfo.Template.ParameterDefinitions.Any(p => p.Name == dependency))
                         {
                             var dependencyName = genQueue.FirstOrDefault(t => t.Template.Identity == dependency).Name;
                             genInfo.Parameters.Add(dependency, dependencyName);

diff --git a/code/TemplateStudioForWPF/TemplateStudioForWPF.csproj b/code/TemplateStudioForWPF/TemplateStudioForWPF.csproj
@@ -84,7 +84,7 @@
       <Version>2.20.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
-      <Version>6.0.0</Version>
+      <Version>7.0.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/code/TemplateStudioForWinUICpp/TemplateStudioForWinUICpp.csproj b/code/TemplateStudioForWinUICpp/TemplateStudioForWinUICpp.csproj
@@ -83,7 +83,7 @@
       <Version>2.20.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
-      <Version>6.0.0</Version>
+      <Version>7.0.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/code/TemplateStudioForWinUICs/TemplateStudioForWinUICs.csproj b/code/TemplateStudioForWinUICs/TemplateStudioForWinUICs.csproj
@@ -84,7 +84,7 @@
       <Version>2.20.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
-      <Version>6.0.0</Version>
+      <Version>7.0.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/code/test/SharedFunctionality.Core.Tests/Composition/FakeTemplateInfo.cs b/code/test/SharedFunctionality.Core.Tests/Composition/FakeTemplateInfo.cs
@@ -5,6 +5,8 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.TemplateEngine.Abstractions;
+using Microsoft.TemplateEngine.Abstractions.Constraints;
+using Microsoft.TemplateEngine.Abstractions.Parameters;
 
 namespace Microsoft.Templates.Core.Test.Composition
 {
@@ -69,5 +71,11 @@ public void AddTag(string key, string value)
         public string MountPointUri { get; set; }
 
         public IReadOnlyList<string> ShortNameList { get; set; }
+
+        IParameterDefinitionSet ITemplateInfo.ParameterDefinitions { get; }
+
+        IReadOnlyList<Guid> ITemplateInfo.PostActions { get; }
+
+        IReadOnlyList<TemplateConstraintInfo> ITemplateInfo.Constraints { get; }
     }
 }
diff --git a/code/test/SharedFunctionality.Core.Tests/SharedFunctionality.Core.Tests.csproj b/code/test/SharedFunctionality.Core.Tests/SharedFunctionality.Core.Tests.csproj
@@ -221,15 +221,15 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.20.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.TemplateEngine.Edge" Version="6.0.200" />
-    <PackageReference Include="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="6.0.200" />
+    <PackageReference Include="Microsoft.TemplateEngine.Edge" Version="7.0.102" />
+    <PackageReference Include="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="7.0.102" />
     <PackageReference Include="Microsoft.VisualStudio.TemplateWizardInterface" Version="17.2.32505.113" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="NuGet.Frameworks" Version="6.1.0" />
+    <PackageReference Include="NuGet.Frameworks" Version="6.3.1" />
     <PackageReference Include="NuGet.VisualStudio" Version="6.0.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
     <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />

diff --git a/code/test/SharedFunctionality.Tests/TemplateValidator/TemplateJsonVerifier.cs b/code/test/SharedFunctionality.Tests/TemplateValidator/TemplateJsonVerifier.cs
@@ -13,6 +13,7 @@
 using Microsoft.Templates.Core;
 using Microsoft.Templates.Core.Composition;
 using Microsoft.Templates.Core.Gen;
+using Microsoft.Templates.Core.PostActions;
 using Newtonsoft.Json;
 
 namespace TemplateValidator
@@ -709,7 +710,7 @@ private static void VerifyLicensesAndProjPostactions(ValidationTemplateInfo temp
             }
             else
             {
-                if (template.PostActions != null && template.PostActions.Any(p => p.ActionId == "0B814718-16A3-4F7F-89F1-69C0F9170EAD"))
+                if (template.PostActions != null && template.PostActions.Any(p => p.ToString("D") == "0B814718-16A3-4F7F-89F1-69C0F9170EAD"))
                 {
                     results.Add($"Missing license on template {template.Identity}");
                 }
@@ -718,10 +719,11 @@ private static void VerifyLicensesAndProjPostactions(ValidationTemplateInfo temp
 
         private static void VerifyPostactionsPath(ValidationTemplateInfo template, List<string> results)
         {
-            if (template.PostActions != null && template.PostActions.Any(p => p.Args.Any(a => a.Key == "projectPath" && a.Value.Contains("/"))))
-            {
-                results.Add("Post-action projectPath should use '\\' instead of '/' to indicate the project file path");
-            }
+            // TODO: TemplateEngine 7.x packages changed PostActions to just a list of GUIDs. Unclear how to implement this.
+            //if (template.PostActions != null && template.PostActions.Any(p => p.Args.Any(a => a.Key == "projectPath" && a.Value.Contains("/"))))
+            //{
+            //    results.Add("Post-action projectPath should use '\\' instead of '/' to indicate the project file path");
+            //}
         }
 
         private static void EnsureValidPrimaryOutputPaths(ValidationTemplateInfo template, List<string> results)

diff --git a/code/test/SharedFunctionality.Tests/TemplateValidator/ValidationTemplateInfo.cs b/code/test/SharedFunctionality.Tests/TemplateValidator/ValidationTemplateInfo.cs
@@ -6,6 +6,8 @@
 using System.Collections.Generic;
 using ApiAnalysis;
 using Microsoft.TemplateEngine.Abstractions;
+using Microsoft.TemplateEngine.Abstractions.Constraints;
+using Microsoft.TemplateEngine.Abstractions.Parameters;
 using Newtonsoft.Json;
 
 namespace TemplateValidator
@@ -95,7 +97,13 @@ public class ValidationTemplateInfo : ITemplateInfo
         public IReadOnlyDictionary<string, SymbolInfo> Symbols { get; set; }
 
         [ApiAnalysisOptional]
-        public List<PostActionInfo> PostActions { get; set; }
+        public IReadOnlyList<TemplateConstraintInfo> Constraints { get; }
+
+        [ApiAnalysisOptional]
+        public IParameterDefinitionSet ParameterDefinitions { get; }
+
+        [ApiAnalysisOptional]
+        public IReadOnlyList<Guid> PostActions { get; set; }
 
         public string SourceName { get; set; }
 

diff --git a/code/test/SharedFunctionality.UI.Tests/SharedFunctionality.UI.Tests.csproj b/code/test/SharedFunctionality.UI.Tests/SharedFunctionality.UI.Tests.csproj
@@ -96,10 +96,10 @@
       <Version>3.1.4097</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.TemplateEngine.Edge">
-      <Version>6.0.200</Version>
+      <Version>7.0.102</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.TemplateEngine.Orchestrator.RunnableProjects">
-      <Version>6.0.200</Version>
+      <Version>7.0.102</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.ProjectSystem">
       <Version>17.0.1313-pre</Version>
@@ -226,4 +226,4 @@
   <Import Project="..\..\SharedFunctionality.UI\SharedFunctionality.UI.projitems" Label="Shared" />
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
diff --git a/code/test/TemplateStudioForUWP.Tests/TemplateStudioForUWP.Tests.csproj b/code/test/TemplateStudioForUWP.Tests/TemplateStudioForUWP.Tests.csproj
@@ -135,7 +135,7 @@
       <Version>4.2.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
-      <Version>6.0.0</Version>
+      <Version>7.0.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/code/test/TemplateStudioForWPF.Tests/TemplateStudioForWPF.Tests.csproj b/code/test/TemplateStudioForWPF.Tests/TemplateStudioForWPF.Tests.csproj
@@ -131,7 +131,7 @@
       <Version>4.2.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
-      <Version>6.0.0</Version>
+      <Version>7.0.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/code/test/TemplateStudioForWinUICpp.Tests/TemplateStudioForWinUICpp.Tests.csproj b/code/test/TemplateStudioForWinUICpp.Tests/TemplateStudioForWinUICpp.Tests.csproj
@@ -94,7 +94,7 @@
       <Version>4.2.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
-      <Version>6.0.0</Version>
+      <Version>7.0.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/code/test/TemplateStudioForWinUICs.Tests/TemplateStudioForWinUICs.Tests.csproj b/code/test/TemplateStudioForWinUICs.Tests/TemplateStudioForWinUICs.Tests.csproj
@@ -104,7 +104,7 @@
       <Version>4.2.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
-      <Version>6.0.0</Version>
+      <Version>7.0.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/code/test/VsEmulator/VsEmulator.csproj b/code/test/VsEmulator/VsEmulator.csproj
@@ -312,7 +312,7 @@
       <Version>2.20.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
-      <Version>6.0.0</Version>
+      <Version>7.0.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>