Skip to content

Commit 8b63ec0

Browse files
author
Simon Zhao (BEYONDSOFT CONSULTING INC)
committed
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/templating into merge/release/8.0.4xx-to-release/9.0.1xx
2 parents 0e56478 + 4e446d3 commit 8b63ec0

File tree

892 files changed

+6035
-16726
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

892 files changed

+6035
-16726
lines changed

‎.config/tsaoptions.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"instanceUrl": "https://devdiv.visualstudio.com/",
3+
"template": "TFSDEVDIV",
4+
"projectName": "DEVDIV",
5+
"areaPath": "DevDiv\\NET Tools\\SDK",
6+
"iterationPath": "DevDiv",
7+
"notificationAliases": [ "dotnetdevexcli@microsoft.com" ],
8+
"repositoryName": "templating",
9+
"codebaseName": "templating"
10+
}

‎.editorconfig‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,25 @@ insert_final_newline = true
1111
indent_style = space
1212
indent_size = 4
1313
trim_trailing_whitespace = true
14+
spelling_exclusion_path = exclusion.dic
1415

1516
# JSON files
1617
[*.json]
1718
indent_size = 2
1819

20+
# Xml config files
21+
[*.{props,targets,config,nuspec}]
22+
indent_size = 2
23+
24+
# Xml files
25+
[*.{xml,stylecop,resx,ruleset}]
26+
indent_size = 2
27+
28+
# Xml project files
29+
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,nativeproj,locproj}]
30+
charset = utf-8
31+
indent_size = 2
32+
1933
# Generated code
2034
[*{_AssemblyInfo.cs,.notsupported.cs}]
2135
generated_code = true

‎.gitattributes‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,7 @@
5656

5757
*.jpg binary
5858
*.png binary
59-
*.gif binary
59+
*.gif binary
60+
61+
# VerifyTests
62+
*.verified.txt text eol=lf working-tree-encoding=UTF-8

‎.github/dependabot.yml‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
11
version: 2
22
updates:
33
- package-ecosystem: "nuget"
4-
directory: "/eng/dependabot"
4+
directory: "/"
55
open-pull-requests-limit: 10
66
schedule:
77
interval: "weekly"
88
target-branch: "main"
99
labels:
1010
- "dependencies"
1111
- "dependabot: main"
12-
13-
- package-ecosystem: "nuget"
14-
directory: "/eng/dependabot"
15-
open-pull-requests-limit: 10
16-
schedule:
17-
interval: "weekly"
18-
target-branch: "release/7.0.4xx"
19-
labels:
20-
- "dependencies"
21-
- "dependabot: 7.0.4xx"
12+
ignore:
13+
- dependency-name: "Microsoft.*"
14+
- dependency-name: "NuGet.*"
15+
- dependency-name: "System.*"

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ bld/
2222
[Bb]in/
2323
[Oo]bj/
2424
dev/
25+
*.binlog
2526

26-
# Visual Studio 2015 cache/options directory
27+
# Visual Studio cache/options directory
2728
.vs/
2829
# Visual Studio launch settings
2930
**/launchSettings.json

‎.vscode/launch.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": "Run template scanner",
9+
"type": "coreclr",
10+
"request": "launch",
11+
"program": "${workspaceFolder}\\artifacts\\bin\\Microsoft.TemplateSearch.TemplateDiscovery\\Debug\\net9.0\\Microsoft.TemplateSearch.TemplateDiscovery.dll",
12+
"args": [
13+
"--basePath",
14+
"./templates",
15+
"--verbose",
16+
"--savePacks",
17+
"--diff",
18+
"true",
19+
"--test",
20+
"--allowPreviewPacks"
21+
]
22+
}
23+
]
24+
}

‎CODEOWNERS‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
* @dotnet/templating-engine-maintainers
2-
/docs/ @dotnet/templating-engine-maintainers @baronfel
3-
/eng/ @dotnet/templating-engine-maintainers @GangWang01
4-
global.json @dotnet/templating-engine-maintainers @GangWang01
2+
/docs/ @dotnet/templating-engine-maintainers
3+
/eng/ @dotnet/templating-engine-maintainers
4+
global.json @dotnet/templating-engine-maintainers

‎Directory.Build.props‎

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,40 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<Project>
3-
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
4-
<Import Project="$(RepositoryEngineeringDir)Analyzers.props" />
52

6-
<PropertyGroup>
7-
<LangVersion>preview</LangVersion>
8-
<NETCoreTargetFramework>net8.0</NETCoreTargetFramework>
9-
<NETStandardTargetFramework>netstandard2.0</NETStandardTargetFramework>
10-
<NETFullTargetFramework>net472</NETFullTargetFramework>
11-
<Product>Microsoft .NET Core</Product>
12-
<Copyright>$(CopyrightNetFoundation)</Copyright>
13-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
14-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
15-
<NoWarn>NU5105;NU5128;NU5100;NU5118;0419,0649</NoWarn>
16-
<EnableNETAnalyzers>true</EnableNETAnalyzers>
17-
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
18-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
19-
<Nullable>enable</Nullable>
20-
</PropertyGroup>
3+
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
214

22-
<PropertyGroup>
23-
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
24-
<BuildDir>$(RepoRoot)build\</BuildDir>
25-
<ArtifactsDir>$(RepoRoot)artifacts\</ArtifactsDir>
26-
<DevDir>$(RepoRoot)dev\</DevDir>
27-
<ToolsDir>$(RepoRoot)tools\</ToolsDir>
28-
<ToolsTempDir>$(RepoRoot).tools\</ToolsTempDir>
29-
<LocalizeDir>$(RepoRoot)localize\</LocalizeDir>
30-
<TemplatesDir>$(RepoRoot)template_feed\</TemplatesDir>
31-
<SrcDir>$(RepoRoot)src\</SrcDir>
32-
<TestDir>$(RepoRoot)test\</TestDir>
33-
<StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
34-
<TemplateEnginePublicKey>0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb</TemplateEnginePublicKey>
35-
<DynamicProxyGenAssembly2PublicKey>0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7</DynamicProxyGenAssembly2PublicKey>
36-
</PropertyGroup>
5+
<PropertyGroup>
6+
<LangVersion>preview</LangVersion>
7+
<Product>Microsoft .NET</Product>
8+
<Copyright>$(CopyrightNetFoundation)</Copyright>
9+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
10+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
11+
<NoWarn>$(NoWarn);NU5105;NU5128;NU5100;NU5118;0419,0649</NoWarn>
12+
<EnableNETAnalyzers>true</EnableNETAnalyzers>
13+
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
14+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
15+
<Nullable>enable</Nullable>
16+
<ImplicitUsings>enable</ImplicitUsings>
17+
18+
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
19+
<ToolsDir>$(RepoRoot)tools\</ToolsDir>
20+
<TemplatesDir>$(RepoRoot)template_feed\</TemplatesDir>
21+
<SrcDir>$(RepoRoot)src\</SrcDir>
22+
<TestDir>$(RepoRoot)test\</TestDir>
23+
<StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
24+
<TemplateEnginePublicKey>0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb</TemplateEnginePublicKey>
25+
<DynamicProxyGenAssembly2PublicKey>0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7</DynamicProxyGenAssembly2PublicKey>
26+
27+
<EnableAnalyzers>true</EnableAnalyzers>
28+
<!-- Disable analyzers in sourcebuild -->
29+
<EnableAnalyzers Condition="'$(DotNetBuildSourceOnly)' == 'true'">false</EnableAnalyzers>
30+
31+
<!-- Make packages target net472 instead of net481 for compatibility with the msbuild task package. -->
32+
<NetFrameworkCurrent>net472</NetFrameworkCurrent>
33+
</PropertyGroup>
34+
35+
<ItemGroup Condition="'$(EnableAnalyzers)' == 'true'">
36+
<PackageReference Include="StyleCop.Analyzers" PrivateAssets="all" />
37+
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="all" Condition="'$(EnablePublicApiAnalyzer)' == 'true'" />
38+
</ItemGroup>
3739

3840
</Project>

‎Directory.Build.targets‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<Project>
3-
<Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
42

5-
<Import Project="$(RepositoryEngineeringDir)Package.props" />
3+
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
64

75
<ItemGroup>
8-
<None Include="$(RepoRoot)LICENSE.txt" PackagePath="LICENSE.txt" Pack="true"/>
9-
<None Include="$(RepoRoot)THIRD-PARTY-NOTICES.txt" PackagePath="THIRD-PARTY-NOTICES.txt" Pack="true"/>
6+
<None Include="$(RepoRoot)LICENSE.txt" PackagePath="LICENSE.txt" Pack="true" />
7+
<None Include="$(RepoRoot)THIRD-PARTY-NOTICES.txt" PackagePath="THIRD-PARTY-NOTICES.txt" Pack="true" />
108
</ItemGroup>
119

12-
<!-- Leave this file here, even if it's empty. It stops chaining imports. -->
13-
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
1410
</Project>

‎Directory.Packages.props‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
6+
<!-- Using multiple feeds isn't supported by Maestro: https://github.com/dotnet/arcade/issues/14155. -->
7+
<NoWarn>$(NoWarn);NU1507</NoWarn>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<!-- Command-line-api dependencies -->
12+
<PackageVersion Include="System.CommandLine" Version="$(SystemCommandLinePackageVersion)" />
13+
14+
<!-- MSBuild dependencies -->
15+
<PackageVersion Include="Microsoft.Build.Framework" Version="17.8.3" />
16+
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.8.3" />
17+
18+
<!-- NuGet dependencies -->
19+
<PackageVersion Include="NuGet.Configuration" Version="$(NuGetConfigurationVersion)" />
20+
<PackageVersion Include="NuGet.Credentials" Version="$(NuGetCredentialsVersion)" />
21+
<PackageVersion Include="NuGet.Protocol" Version="$(NuGetProtocolVersion)" />
22+
23+
<!-- Roslyn-analyzers dependencies -->
24+
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
25+
26+
<!-- Runtime dependencies -->
27+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsVersion)" />
28+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
29+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
30+
<PackageVersion Include="Microsoft.IO.Redist" Version="6.0.1" />
31+
<PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
32+
<PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
33+
</ItemGroup>
34+
35+
<!-- External dependencies -->
36+
<ItemGroup>
37+
<PackageVersion Include="FakeItEasy" Version="8.0.0" />
38+
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
39+
<PackageVersion Include="Newtonsoft.Json.Schema" Version="3.0.15" />
40+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
41+
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
42+
<PackageVersion Include="Verify.DiffPlex" Version="3.0.0" />
43+
<PackageVersion Include="Verify.XUnit" Version="25.0.2" />
44+
<PackageVersion Include="xunit.abstractions" Version="2.0.3" />
45+
<!-- Xunit version is managed by Arcade. -->
46+
<PackageVersion Include="xunit.extensibility.execution" Version="$(XUnitVersion)" />
47+
</ItemGroup>
48+
49+
<!-- DotNetBuild overrides -->
50+
<ItemGroup>
51+
<PackageVersion Update="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" Condition="'$(MicrosoftBuildFrameworkVersion)' != ''" />
52+
<PackageVersion Update="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" Condition="'$(MicrosoftBuildUtilitiesCoreVersion)' != ''" />
53+
<PackageVersion Update="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="$(MicrosoftCodeAnalysisPublicApiAnalyzersVersion)" Condition="'$(MicrosoftCodeAnalysisPublicApiAnalyzersVersion)' != ''" />
54+
<PackageVersion Update="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" Condition="'$(NewtonsoftJsonVersion)' != ''" />
55+
</ItemGroup>
56+
</Project>

0 commit comments

Comments
 (0)