Merge branch 'release/9.0.1xx' of https://github.com/dotnet/templating …

…into merge/release/8.0.4xx-to-release/9.0.1xx

.editorconfig

@@ -11,11 +11,25 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
+spelling_exclusion_path = exclusion.dic
 
 # JSON files
 [*.json]
 indent_size = 2
 
+# Xml config files
+[*.{props,targets,config,nuspec}]
+indent_size = 2
+
+# Xml files
+[*.{xml,stylecop,resx,ruleset}]
+indent_size = 2
+
+# Xml project files
+[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,nativeproj,locproj}]
+charset = utf-8
+indent_size = 2
+
 # Generated code
 [*{_AssemblyInfo.cs,.notsupported.cs}]
 generated_code = true

.gitattributes

@@ -56,4 +56,7 @@
 
 *.jpg   binary
 *.png   binary
-*.gif   binary
+*.gif   binary
+
+# VerifyTests
+*.verified.txt text eol=lf working-tree-encoding=UTF-8

.github/dependabot.yml

@@ -1,21 +1,15 @@
 version: 2
 updates:
   - package-ecosystem: "nuget"
-    directory: "/eng/dependabot"
+    directory: "/"
     open-pull-requests-limit: 10
     schedule:
       interval: "weekly"
     target-branch: "main"
     labels:
       - "dependencies"
       - "dependabot: main"
-
-  - package-ecosystem: "nuget"
-    directory: "/eng/dependabot"
-    open-pull-requests-limit: 10
-    schedule:
-      interval: "weekly"
-    target-branch: "release/7.0.4xx"
-    labels:
-      - "dependencies"
-      - "dependabot: 7.0.4xx"
+    ignore:
+      - dependency-name: "Microsoft.*"
+      - dependency-name: "NuGet.*"
+      - dependency-name: "System.*"

.gitignore

@@ -22,8 +22,9 @@ bld/
 [Bb]in/
 [Oo]bj/
 dev/
+*.binlog
 
-# Visual Studio 2015 cache/options directory
+# Visual Studio cache/options directory
 .vs/
 # Visual Studio launch settings
 **/launchSettings.json

.vscode/launch.json

@@ -0,0 +1,24 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Run template scanner",
+      "type": "coreclr",
+      "request": "launch",
+      "program": "${workspaceFolder}\\artifacts\\bin\\Microsoft.TemplateSearch.TemplateDiscovery\\Debug\\net9.0\\Microsoft.TemplateSearch.TemplateDiscovery.dll",
+      "args": [
+        "--basePath",
+        "./templates",
+        "--verbose",
+        "--savePacks",
+        "--diff",
+        "true",
+        "--test",
+        "--allowPreviewPacks"
+      ]
+    }
+  ]
+}

CODEOWNERS

@@ -1,4 +1,4 @@
 * @dotnet/templating-engine-maintainers 
-/docs/ @dotnet/templating-engine-maintainers @baronfel
-/eng/ @dotnet/templating-engine-maintainers @GangWang01
-global.json @dotnet/templating-engine-maintainers @GangWang01
+/docs/ @dotnet/templating-engine-maintainers
+/eng/ @dotnet/templating-engine-maintainers
+global.json @dotnet/templating-engine-maintainers

Directory.Build.props

@@ -1,38 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project>
-    <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
-    <Import Project="$(RepositoryEngineeringDir)Analyzers.props" />
 
-    <PropertyGroup>
-        <LangVersion>preview</LangVersion>
-        <NETCoreTargetFramework>net8.0</NETCoreTargetFramework>
-        <NETStandardTargetFramework>netstandard2.0</NETStandardTargetFramework>
-        <NETFullTargetFramework>net472</NETFullTargetFramework>
-        <Product>Microsoft .NET Core</Product>
-        <Copyright>$(CopyrightNetFoundation)</Copyright>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <NoWarn>NU5105;NU5128;NU5100;NU5118;0419,0649</NoWarn>
-        <EnableNETAnalyzers>true</EnableNETAnalyzers>
-        <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
+  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 
-    <PropertyGroup>
-        <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
-        <BuildDir>$(RepoRoot)build\</BuildDir>
-        <ArtifactsDir>$(RepoRoot)artifacts\</ArtifactsDir>
-        <DevDir>$(RepoRoot)dev\</DevDir>
-        <ToolsDir>$(RepoRoot)tools\</ToolsDir>
-        <ToolsTempDir>$(RepoRoot).tools\</ToolsTempDir>
-        <LocalizeDir>$(RepoRoot)localize\</LocalizeDir>
-        <TemplatesDir>$(RepoRoot)template_feed\</TemplatesDir>
-        <SrcDir>$(RepoRoot)src\</SrcDir>
-        <TestDir>$(RepoRoot)test\</TestDir>
-        <StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
-        <TemplateEnginePublicKey>0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb</TemplateEnginePublicKey>
-        <DynamicProxyGenAssembly2PublicKey>0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7</DynamicProxyGenAssembly2PublicKey>
-    </PropertyGroup>
+  <PropertyGroup>
+    <LangVersion>preview</LangVersion>
+    <Product>Microsoft .NET</Product>
+    <Copyright>$(CopyrightNetFoundation)</Copyright>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <NoWarn>$(NoWarn);NU5105;NU5128;NU5100;NU5118;0419,0649</NoWarn>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+
+    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
+    <ToolsDir>$(RepoRoot)tools\</ToolsDir>
+    <TemplatesDir>$(RepoRoot)template_feed\</TemplatesDir>
+    <SrcDir>$(RepoRoot)src\</SrcDir>
+    <TestDir>$(RepoRoot)test\</TestDir>
+    <StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
+    <TemplateEnginePublicKey>0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb</TemplateEnginePublicKey>
+    <DynamicProxyGenAssembly2PublicKey>0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7</DynamicProxyGenAssembly2PublicKey>
+
+    <EnableAnalyzers>true</EnableAnalyzers>
+    <!-- Disable analyzers in sourcebuild -->
+    <EnableAnalyzers Condition="'$(DotNetBuildSourceOnly)' == 'true'">false</EnableAnalyzers>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(EnableAnalyzers)' == 'true'">
+    <PackageReference Include="StyleCop.Analyzers" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="all" Condition="'$(EnablePublicApiAnalyzer)' == 'true'" />
+  </ItemGroup>
 
 </Project>

Directory.Build.targets

@@ -1,14 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project>
-  <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
 
-  <Import Project="$(RepositoryEngineeringDir)Package.props" />
+  <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 
   <ItemGroup>
-    <None Include="$(RepoRoot)LICENSE.txt" PackagePath="LICENSE.txt" Pack="true"/>
-    <None Include="$(RepoRoot)THIRD-PARTY-NOTICES.txt" PackagePath="THIRD-PARTY-NOTICES.txt" Pack="true"/>
+    <None Include="$(RepoRoot)LICENSE.txt" PackagePath="LICENSE.txt" Pack="true" />
+    <None Include="$(RepoRoot)THIRD-PARTY-NOTICES.txt" PackagePath="THIRD-PARTY-NOTICES.txt" Pack="true" />
   </ItemGroup>
 
-  <!-- Leave this file here, even if it's empty. It stops chaining imports. -->
-  <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 </Project>

Directory.Packages.props

@@ -0,0 +1,62 @@
+<Project>
+
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
+    <!-- Using multiple feeds isn't supported by Maestro: https://github.com/dotnet/arcade/issues/14155. -->
+    <NoWarn>$(NoWarn);NU1507</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- Command-line-api dependencies -->
+    <PackageVersion Include="System.CommandLine" Version="$(SystemCommandLinePackageVersion)" />
+
+    <!-- MSBuild dependencies -->
+    <PackageVersion Include="Microsoft.Build.Framework" Version="17.8.3" />
+    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.8.3" />
+
+    <!-- NuGet dependencies -->
+    <PackageVersion Include="NuGet.Configuration" Version="6.8.1" />
+    <PackageVersion Include="NuGet.Credentials" Version="6.8.1" />
+    <PackageVersion Include="NuGet.Protocol" Version="6.8.1" />
+
+    <!-- Roslyn-analyzers dependencies -->
+    <PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
+
+    <!-- Runtime dependencies -->    
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.IO.Redist" Version="6.0.1" />
+    <PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
+  </ItemGroup>
+
+  <!-- External dependencies -->
+  <ItemGroup>
+    <PackageVersion Include="FakeItEasy" Version="8.0.0" />
+    <PackageVersion Include="FluentAssertions" Version="6.12.0" />
+    <PackageVersion Include="Newtonsoft.Json.Schema" Version="3.0.15" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
+    <PackageVersion Include="Verify.DiffPlex" Version="3.0.0" />
+    <PackageVersion Include="Verify.XUnit" Version="25.0.2" />
+    <PackageVersion Include="xunit.abstractions" Version="2.0.3" />
+    <!-- Xunit version is managed by Arcade. -->
+    <PackageVersion Include="xunit.extensibility.execution" Version="$(XUnitVersion)" />
+  </ItemGroup>
+
+  <!-- DotNetBuild overrides -->
+  <ItemGroup>
+    <PackageVersion Update="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" Condition="'$(MicrosoftBuildFrameworkVersion)' != ''" />
+    <PackageVersion Update="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" Condition="'$(MicrosoftBuildUtilitiesCoreVersion)' != ''" />
+    <PackageVersion Update="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="$(MicrosoftCodeAnalysisPublicApiAnalyzersVersion)" Condition="'$(MicrosoftCodeAnalysisPublicApiAnalyzersVersion)' != ''" />
+    <PackageVersion Update="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsVersion)" Condition="'$(MicrosoftExtensionsLoggingAbstractionsVersion)' != ''" />
+    <PackageVersion Update="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" Condition="'$(MicrosoftExtensionsLoggingConsoleVersion)' != ''" />
+    <PackageVersion Update="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" Condition="'$(MicrosoftExtensionsLoggingVersion)' != ''" />
+    <PackageVersion Update="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" Condition="'$(NewtonsoftJsonVersion)' != ''" />
+    <PackageVersion Update="NuGet.Configuration" Version="$(NuGetConfigurationVersion)" Condition="'$(NuGetConfigurationVersion)' != ''" />
+    <PackageVersion Update="NuGet.Credentials" Version="$(NuGetCredentialsVersion)" Condition="'$(NuGetCredentialsVersion)' != ''" />
+    <PackageVersion Update="NuGet.Protocol" Version="$(NuGetProtocolVersion)" Condition="'$(NuGetProtocolVersion)' != ''" />
+  </ItemGroup>
+
+</Project>

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 .NET Foundation
+Copyright (c) .NET Foundation and Contributors
 
 All rights reserved.
 
@@ -20,4 +20,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

Microsoft.TemplateEngine.sln

@@ -62,6 +62,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
+		exclusion.dic = exclusion.dic
+		Directory.Packages.props = Directory.Packages.props
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{B794BF86-4185-4DCE-AC86-C27D5D966B9B}"