From 261609d8c36adbe1ffcc2b5b7b6f36a5c2b5bebc Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 31 Mar 2026 15:19:52 +0000 Subject: [PATCH 01/48] Add TemplateEngine package versions and signing configuration Directory.Packages.props: - Added FakeItEasy, JsonSchema.Net, Verify.*, xunit V3 packages - Added Microsoft.IO.Redist, NuGet.Credentials - Set StyleCop.Analyzers to explicit version 1.2.0-beta.556 - Added xunit.abstractions, xunit.extensibility.execution eng/Signing.props: - Added TemplateEngine non-shipping packages to signing exclusion list --- Directory.Packages.props | 14 +++++++++++++- eng/Signing.props | 5 +++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 2cb60d612604..17100b72004a 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -118,7 +118,7 @@ - + @@ -146,8 +146,20 @@ + + + + + + + + + + + + + + + + + From e163b62a8e53f129123b5401f9fdb313f7c506f3 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 31 Mar 2026 15:21:12 +0000 Subject: [PATCH 02/48] Add TemplateEngine build infrastructure Added src/TemplateEngine/Directory.Build.props: - Chains to repo root props via GetPathOfFileAbove - StrongNameKeyId: MicrosoftAspNetCore - GenerateDocumentationFile: true - StyleCop.Analyzers + PublicApiAnalyzers package references - Suppressed RS0016/RS0041 (Public API analyzer version differences) - Suppressed NU5105/NU5128/NU5100/NU5118/0419/0649 Added src/TemplateEngine/.editorconfig: - Migrated StyleCop rule suppressions from dotnet/templating - Downgraded IDE0005 to suggestion (multi-target implicit usings conflict) Root Directory.Build.props: - Added TemplateEngineRoot, TemplatesDir, NetFrameworkMinimum properties Updated all TE csproj/props files: - Replaced $(SrcDir) with $(TemplateEngineRoot) - Replaced $(ToolsDir) with $(TemplateEngineRoot)Tools/ - Replaced $(TestDir) with $(RepoRoot)test/TemplateEngine/ --- Directory.Build.props | 8 +++ src/TemplateEngine/.editorconfig | 61 +++++++++++++++++++ src/TemplateEngine/Directory.Build.props | 30 +++++++++ ...osoft.TemplateEngine.Core.Contracts.csproj | 2 +- .../Microsoft.TemplateEngine.Core.csproj | 6 +- .../Microsoft.TemplateEngine.Edge.csproj | 4 +- .../Microsoft.TemplateEngine.IDE.csproj | 8 +-- ...ngine.Orchestrator.RunnableProjects.csproj | 4 +- .../Microsoft.TemplateEngine.Utils.csproj | 2 +- .../Microsoft.TemplateSearch.Common.csproj | 2 +- ...rosoft.TemplateEngine.Authoring.CLI.csproj | 10 +-- ...soft.TemplateEngine.Authoring.Tasks.csproj | 6 +- ...thoring.TemplateApiVerifier.XunitV3.csproj | 4 +- ...Authoring.TemplateApiVerifier.Shared.props | 6 +- ...ngine.Authoring.TemplateApiVerifier.csproj | 4 +- ...ne.Authoring.TemplateVerifier.Shared.props | 2 +- ...ft.TemplateSearch.TemplateDiscovery.csproj | 6 +- ...gine.Authoring.CLI.IntegrationTests.csproj | 6 +- ...plateEngine.Authoring.CLI.UnitTests.csproj | 4 +- ...ne.Authoring.Tasks.IntegrationTests.csproj | 4 +- ...teVerifier.IntegrationTests.XunitV3.csproj | 8 +-- ...g.TemplateVerifier.IntegrationTests.csproj | 8 +-- ....TemplateVerifier.UnitTests.XunitV3.csproj | 4 +- ...uthoring.TemplateVerifier.UnitTests.csproj | 4 +- ...uthoring.Templates.IntegrationTests.csproj | 6 +- ...osoft.TemplateEngine.Core.UnitTests.csproj | 10 +-- ...osoft.TemplateEngine.Edge.UnitTests.csproj | 10 +-- ...TemplateEngine.IDE.IntegrationTests.csproj | 14 ++--- ...icrosoft.TemplateEngine.Mocks.Shared.props | 12 ++-- ...estrator.RunnableProjects.UnitTests.csproj | 16 ++--- ...ne.TemplateLocalizer.Core.UnitTests.csproj | 4 +- ...oft.TemplateEngine.TestHelper.Shared.props | 6 +- ...soft.TemplateEngine.Utils.UnitTests.csproj | 6 +- ...oft.TemplateSearch.Common.UnitTests.csproj | 6 +- ....TemplateDiscovery.IntegrationTests.csproj | 4 +- 35 files changed, 198 insertions(+), 99 deletions(-) create mode 100644 src/TemplateEngine/.editorconfig create mode 100644 src/TemplateEngine/Directory.Build.props diff --git a/Directory.Build.props b/Directory.Build.props index 358a629fabb2..505fcb0d53c4 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -47,6 +47,14 @@ $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src')) + + + $(MSBuildThisFileDirectory)src\TemplateEngine\ + $(MSBuildThisFileDirectory)template_feed\ + + + net472 + $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'redist', '$(Configuration)')) $([MSBuild]::NormalizeDirectory('$(TestHostFolder)', 'dotnet')) $(TestHostDotNetRoot)$([System.IO.Path]::GetFileName('$(DotNetTool)')) diff --git a/src/TemplateEngine/.editorconfig b/src/TemplateEngine/.editorconfig new file mode 100644 index 000000000000..8389f7ab6958 --- /dev/null +++ b/src/TemplateEngine/.editorconfig @@ -0,0 +1,61 @@ +# EditorConfig for TemplateEngine projects +# Migrated from dotnet/templating repo root .editorconfig +# These StyleCop rules were disabled in the original repo + +[*.cs] +# IDE0005: Unnecessary using - TE projects multi-target including net472 which +# doesn't support implicit usings, so many usings are needed for net472 but +# flagged as unnecessary for netcoreapp TFMs. +dotnet_diagnostic.IDE0005.severity = suggestion + +dotnet_diagnostic.SA0001.severity = none +dotnet_diagnostic.SA1005.severity = none +dotnet_diagnostic.SA1101.severity = none +dotnet_diagnostic.SA1108.severity = none +dotnet_diagnostic.SA1118.severity = none +dotnet_diagnostic.SA1119.severity = none +dotnet_diagnostic.SA1120.severity = none +dotnet_diagnostic.SA1123.severity = none +dotnet_diagnostic.SA1124.severity = none +dotnet_diagnostic.SA1127.severity = none +dotnet_diagnostic.SA1128.severity = none +dotnet_diagnostic.SA1141.severity = warning +dotnet_diagnostic.SA1142.severity = warning +dotnet_diagnostic.SA1200.severity = none +dotnet_diagnostic.SA1201.severity = none +dotnet_diagnostic.SA1202.severity = none +dotnet_diagnostic.SA1203.severity = none +dotnet_diagnostic.SA1204.severity = none +dotnet_diagnostic.SA1214.severity = none +dotnet_diagnostic.SA1308.severity = none +dotnet_diagnostic.SA1309.severity = none +dotnet_diagnostic.SA1316.severity = warning +dotnet_diagnostic.SA1400.severity = none +dotnet_diagnostic.SA1402.severity = none +dotnet_diagnostic.SA1405.severity = silent +dotnet_diagnostic.SA1413.severity = none +dotnet_diagnostic.SA1414.severity = none +dotnet_diagnostic.SA1501.severity = none +dotnet_diagnostic.SA1502.severity = none +dotnet_diagnostic.SA1504.severity = none +dotnet_diagnostic.SA1508.severity = none +dotnet_diagnostic.SA1509.severity = none +dotnet_diagnostic.SA1512.severity = none +dotnet_diagnostic.SA1513.severity = none +dotnet_diagnostic.SA1515.severity = none +dotnet_diagnostic.SA1518.severity = none +dotnet_diagnostic.SA1600.severity = none +dotnet_diagnostic.SA1601.severity = none +dotnet_diagnostic.SA1602.severity = none +dotnet_diagnostic.SA1611.severity = none +dotnet_diagnostic.SA1614.severity = none +dotnet_diagnostic.SA1615.severity = none +dotnet_diagnostic.SA1616.severity = none +dotnet_diagnostic.SA1618.severity = none +dotnet_diagnostic.SA1622.severity = none +dotnet_diagnostic.SA1623.severity = none +dotnet_diagnostic.SA1625.severity = none +dotnet_diagnostic.SA1627.severity = none +dotnet_diagnostic.SA1633.severity = none +dotnet_diagnostic.SA1642.severity = none +dotnet_diagnostic.SA1649.severity = none diff --git a/src/TemplateEngine/Directory.Build.props b/src/TemplateEngine/Directory.Build.props new file mode 100644 index 000000000000..fe8d77d11371 --- /dev/null +++ b/src/TemplateEngine/Directory.Build.props @@ -0,0 +1,30 @@ + + + + + + + + + $(NoWarn);NU5105;NU5128;NU5100;NU5118;0419;0649;RS0016;RS0041 + + + MicrosoftAspNetCore + + + true + + + true + false + + + + + + + + diff --git a/src/TemplateEngine/Microsoft.TemplateEngine.Core.Contracts/Microsoft.TemplateEngine.Core.Contracts.csproj b/src/TemplateEngine/Microsoft.TemplateEngine.Core.Contracts/Microsoft.TemplateEngine.Core.Contracts.csproj index b63552193378..924aa520a687 100644 --- a/src/TemplateEngine/Microsoft.TemplateEngine.Core.Contracts/Microsoft.TemplateEngine.Core.Contracts.csproj +++ b/src/TemplateEngine/Microsoft.TemplateEngine.Core.Contracts/Microsoft.TemplateEngine.Core.Contracts.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/TemplateEngine/Microsoft.TemplateEngine.Core/Microsoft.TemplateEngine.Core.csproj b/src/TemplateEngine/Microsoft.TemplateEngine.Core/Microsoft.TemplateEngine.Core.csproj index fc34c94724cc..51067d5a51e5 100644 --- a/src/TemplateEngine/Microsoft.TemplateEngine.Core/Microsoft.TemplateEngine.Core.csproj +++ b/src/TemplateEngine/Microsoft.TemplateEngine.Core/Microsoft.TemplateEngine.Core.csproj @@ -19,9 +19,9 @@ - - - + + + diff --git a/src/TemplateEngine/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj b/src/TemplateEngine/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj index b6bd9226e0d2..df081eb9a08b 100644 --- a/src/TemplateEngine/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj +++ b/src/TemplateEngine/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj @@ -24,8 +24,8 @@ - - + + diff --git a/src/TemplateEngine/Microsoft.TemplateEngine.IDE/Microsoft.TemplateEngine.IDE.csproj b/src/TemplateEngine/Microsoft.TemplateEngine.IDE/Microsoft.TemplateEngine.IDE.csproj index 7c17ac1e4746..98490826cba2 100644 --- a/src/TemplateEngine/Microsoft.TemplateEngine.IDE/Microsoft.TemplateEngine.IDE.csproj +++ b/src/TemplateEngine/Microsoft.TemplateEngine.IDE/Microsoft.TemplateEngine.IDE.csproj @@ -14,10 +14,10 @@ - - - - + + + + diff --git a/src/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.csproj b/src/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.csproj index 537f201c6c3d..fab4e136b1be 100644 --- a/src/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.csproj +++ b/src/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/TemplateEngine/Microsoft.TemplateEngine.Utils/Microsoft.TemplateEngine.Utils.csproj b/src/TemplateEngine/Microsoft.TemplateEngine.Utils/Microsoft.TemplateEngine.Utils.csproj index 59c4595003b9..8880b802a392 100644 --- a/src/TemplateEngine/Microsoft.TemplateEngine.Utils/Microsoft.TemplateEngine.Utils.csproj +++ b/src/TemplateEngine/Microsoft.TemplateEngine.Utils/Microsoft.TemplateEngine.Utils.csproj @@ -26,7 +26,7 @@ - + diff --git a/src/TemplateEngine/Microsoft.TemplateSearch.Common/Microsoft.TemplateSearch.Common.csproj b/src/TemplateEngine/Microsoft.TemplateSearch.Common/Microsoft.TemplateSearch.Common.csproj index 670d6633b999..ce630ce3b51c 100644 --- a/src/TemplateEngine/Microsoft.TemplateSearch.Common/Microsoft.TemplateSearch.Common.csproj +++ b/src/TemplateEngine/Microsoft.TemplateSearch.Common/Microsoft.TemplateSearch.Common.csproj @@ -24,7 +24,7 @@ - + diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.CLI/Microsoft.TemplateEngine.Authoring.CLI.csproj b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.CLI/Microsoft.TemplateEngine.Authoring.CLI.csproj index 58ed25d6d231..e12b67f7950e 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.CLI/Microsoft.TemplateEngine.Authoring.CLI.csproj +++ b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.CLI/Microsoft.TemplateEngine.Authoring.CLI.csproj @@ -19,11 +19,11 @@ - - - - - + + + + + diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.Tasks/Microsoft.TemplateEngine.Authoring.Tasks.csproj b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.Tasks/Microsoft.TemplateEngine.Authoring.Tasks.csproj index f36611acab8b..ae259dc3b462 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.Tasks/Microsoft.TemplateEngine.Authoring.Tasks.csproj +++ b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.Tasks/Microsoft.TemplateEngine.Authoring.Tasks.csproj @@ -23,9 +23,9 @@ - - - + + + diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3.csproj b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3.csproj index 2d4d285746ef..cd09b8486bf9 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3.csproj +++ b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.Shared.props b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.Shared.props index f09e43958a25..d2b0789fb8e1 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.Shared.props +++ b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.Shared.props @@ -12,9 +12,9 @@ - - - + + + diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj index 8d392054d3f5..46d739053a71 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj +++ b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj @@ -3,8 +3,8 @@ - - + + diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.Shared.props b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.Shared.props index e6a27cb882e9..98ac392a627f 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.Shared.props +++ b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.Shared.props @@ -17,7 +17,7 @@ - + diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj b/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj index 3824b7cbca60..7317141b0592 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj +++ b/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj @@ -19,9 +19,9 @@ - - - + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj index 257fabe0ffd2..cf4cbbac468b 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.UnitTests/Microsoft.TemplateEngine.Authoring.CLI.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.UnitTests/Microsoft.TemplateEngine.Authoring.CLI.UnitTests.csproj index 462969e7e66a..e78b9edeb57d 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.UnitTests/Microsoft.TemplateEngine.Authoring.CLI.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.UnitTests/Microsoft.TemplateEngine.Authoring.CLI.UnitTests.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj index d7e054333855..546f04e5c1cb 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3.csproj index 3112ec90ef5f..6ba0bdcbfd8c 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3.csproj @@ -12,10 +12,10 @@ - - - - + + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj index 41f44b6d2310..9d1f6d8b4338 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj @@ -3,10 +3,10 @@ - - - - + + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3.csproj index 7e966c33ead2..ce2b49e879e1 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj index 2e9d35f0d3ce..037eef1a3f20 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj @@ -3,8 +3,8 @@ - - + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests.csproj index a6c2777544c2..bbf7cd56c752 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Core.UnitTests/Microsoft.TemplateEngine.Core.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Core.UnitTests/Microsoft.TemplateEngine.Core.UnitTests.csproj index 24c1d04d7009..ed179da9e10f 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Core.UnitTests/Microsoft.TemplateEngine.Core.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Core.UnitTests/Microsoft.TemplateEngine.Core.UnitTests.csproj @@ -9,11 +9,11 @@ - - - - - + + + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Edge.UnitTests/Microsoft.TemplateEngine.Edge.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Edge.UnitTests/Microsoft.TemplateEngine.Edge.UnitTests.csproj index 7b7f81c75763..78578526b7e1 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Edge.UnitTests/Microsoft.TemplateEngine.Edge.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Edge.UnitTests/Microsoft.TemplateEngine.Edge.UnitTests.csproj @@ -9,11 +9,11 @@ - - - - - + + + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/Microsoft.TemplateEngine.IDE.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/Microsoft.TemplateEngine.IDE.IntegrationTests.csproj index 3f2316d34148..7fb99c00f687 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/Microsoft.TemplateEngine.IDE.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/Microsoft.TemplateEngine.IDE.IntegrationTests.csproj @@ -11,16 +11,16 @@ - - - - - + + + + + - - + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/Microsoft.TemplateEngine.Mocks.Shared.props b/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/Microsoft.TemplateEngine.Mocks.Shared.props index e4e5ea4ba0fa..d4853f673b5a 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/Microsoft.TemplateEngine.Mocks.Shared.props +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/Microsoft.TemplateEngine.Mocks.Shared.props @@ -13,12 +13,12 @@ - - - - - - + + + + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj index 73604304db2b..5c77fb84cc3d 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj @@ -20,17 +20,17 @@ - - - - - - + + + + + + - - + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj index b218c68a6be8..6fe3f920996a 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/Microsoft.TemplateEngine.TestHelper.Shared.props b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/Microsoft.TemplateEngine.TestHelper.Shared.props index 97fada325741..e36a6a1e6d48 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/Microsoft.TemplateEngine.TestHelper.Shared.props +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/Microsoft.TemplateEngine.TestHelper.Shared.props @@ -10,9 +10,9 @@ - - - + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/Microsoft.TemplateEngine.Utils.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/Microsoft.TemplateEngine.Utils.UnitTests.csproj index d530d5d99d24..001731dfe8f3 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/Microsoft.TemplateEngine.Utils.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/Microsoft.TemplateEngine.Utils.UnitTests.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/test/TemplateEngine/Microsoft.TemplateSearch.Common.UnitTests/Microsoft.TemplateSearch.Common.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateSearch.Common.UnitTests/Microsoft.TemplateSearch.Common.UnitTests.csproj index d7f1c7b705d5..5e9f06b4fcdb 100644 --- a/test/TemplateEngine/Microsoft.TemplateSearch.Common.UnitTests/Microsoft.TemplateSearch.Common.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateSearch.Common.UnitTests/Microsoft.TemplateSearch.Common.UnitTests.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/test/TemplateEngine/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests.csproj index 3707971ea1ac..eb91a8acd171 100644 --- a/test/TemplateEngine/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests.csproj @@ -5,8 +5,8 @@ - - + + From bbc8e931754c47213b2592ccaf9f39be0539b4dd Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 31 Mar 2026 15:22:19 +0000 Subject: [PATCH 03/48] Convert TemplateEngine PackageReferences to ProjectReferences MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that TemplateEngine source is in-repo, convert external package references to in-tree project references: src/Cli/Microsoft.TemplateEngine.Cli: - Microsoft.TemplateEngine.Edge → ProjectReference - Microsoft.TemplateSearch.Common → ProjectReference src/Cli/dotnet: - Microsoft.TemplateEngine.Orchestrator.RunnableProjects → ProjectReference test/Microsoft.TemplateEngine.Cli.UnitTests: - Microsoft.TemplateEngine.Mocks → ProjectReference - Microsoft.TemplateEngine.TestHelper → ProjectReference - Microsoft.TemplateEngine.Orchestrator.RunnableProjects → ProjectReference test/dotnet-new.IntegrationTests: - Microsoft.TemplateEngine.TestHelper → ProjectReference - Microsoft.TemplateEngine.Authoring.TemplateVerifier → ProjectReference test/dotnet.Tests: - Microsoft.TemplateEngine.Mocks → ProjectReference - Microsoft.TemplateEngine.TestHelper → ProjectReference --- .../Microsoft.TemplateEngine.Cli.csproj | 4 ++-- src/Cli/dotnet/dotnet.csproj | 2 +- .../Microsoft.TemplateEngine.Cli.UnitTests.csproj | 6 +++--- .../dotnet-new.IntegrationTests.csproj | 4 ++-- test/dotnet.Tests/dotnet.Tests.csproj | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Microsoft.TemplateEngine.Cli.csproj b/src/Cli/Microsoft.TemplateEngine.Cli/Microsoft.TemplateEngine.Cli.csproj index d590b2d17add..cda40a4ff05f 100644 --- a/src/Cli/Microsoft.TemplateEngine.Cli/Microsoft.TemplateEngine.Cli.csproj +++ b/src/Cli/Microsoft.TemplateEngine.Cli/Microsoft.TemplateEngine.Cli.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/src/Cli/dotnet/dotnet.csproj b/src/Cli/dotnet/dotnet.csproj index de6c67859456..bbe486da6993 100644 --- a/src/Cli/dotnet/dotnet.csproj +++ b/src/Cli/dotnet/dotnet.csproj @@ -87,7 +87,7 @@ - + diff --git a/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj b/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj index bf6139c9af64..e52bd95c98c1 100644 --- a/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj +++ b/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj @@ -18,9 +18,9 @@ - - - + + + diff --git a/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj b/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj index 06014f7dfcda..8a52e580284e 100644 --- a/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj +++ b/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/test/dotnet.Tests/dotnet.Tests.csproj b/test/dotnet.Tests/dotnet.Tests.csproj index e5655de02a0f..fca04c8e3fb6 100644 --- a/test/dotnet.Tests/dotnet.Tests.csproj +++ b/test/dotnet.Tests/dotnet.Tests.csproj @@ -89,8 +89,8 @@ - - + + From 00a591e4425f20914f2805a07eee141a0c305cf6 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 31 Mar 2026 15:32:04 +0000 Subject: [PATCH 04/48] Add TemplateEngine projects to sdk.slnx Added /src/TemplateEngine/ folder with 8 source projects Added /src/TemplateEngine/Tools/ folder with 8 tool projects Added 19 TemplateEngine test projects to /test/ folder --- sdk.slnx | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/sdk.slnx b/sdk.slnx index d00715f702e3..4e4fd36f1945 100644 --- a/sdk.slnx +++ b/sdk.slnx @@ -312,6 +312,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -362,6 +382,24 @@ + + + + + + + + + + + + + + + + + + From 8032d8618ff9f17e62f1bf9230c681f91a3e7b4b Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 31 Mar 2026 15:33:19 +0000 Subject: [PATCH 05/48] Fix TemplateEngine test infrastructure integration test/Directory.Build.props: - Added _IsTemplateEngineTestProject detection property - StrongNameKeyId: MicrosoftAspNetCore for TE test projects (InternalsVisibleTo) - GenerateProgramFile: true for TE test projects (different test runner) - Suppressed IDE0005, CS0649, CA2016, CA5394, CA1802 for TE tests test/Directory.Build.targets: - Scoped FluentAssertions/TestFramework global usings to non-TE tests - Scoped Common/Program.cs inclusion to non-TE tests - TE test projects get minimal Xunit global using only test/UnitTests.proj: - Added TemplateEngine test template assets for Helix payload --- test/Directory.Build.props | 21 +++++++++++++++++++++ test/Directory.Build.targets | 11 +++++++++-- test/UnitTests.proj | 6 ++++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/test/Directory.Build.props b/test/Directory.Build.props index cff60a43a07d..e5c361f88668 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -24,4 +24,25 @@ false + + + <_IsTemplateEngineTestProject Condition="$(MSBuildProjectName.StartsWith('Microsoft.TemplateEngine')) OR $(MSBuildProjectName.StartsWith('Microsoft.TemplateSearch'))">true + <_IsTemplateEngineTestProject Condition="$(MSBuildProjectName) == 'Microsoft.TemplateEngine.Cli.UnitTests'">false + + + + + MicrosoftAspNetCore + true + + $(NoWarn);IDE0005;0649;CA2016;CA5394;CA1802 + + diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets index edd1cbc3f09a..f053a2189b5e 100644 --- a/test/Directory.Build.targets +++ b/test/Directory.Build.targets @@ -9,7 +9,9 @@ true - + + @@ -20,7 +22,12 @@ - + + + + + + diff --git a/test/UnitTests.proj b/test/UnitTests.proj index 2eef751199e5..6d6e8a8120df 100644 --- a/test/UnitTests.proj +++ b/test/UnitTests.proj @@ -93,6 +93,11 @@ + + + + + @@ -132,6 +137,7 @@ + From 22677ce0d9d4849a434b3a1891c7e26fe38d14a4 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 31 Mar 2026 15:44:12 +0000 Subject: [PATCH 06/48] Fix build issues from integration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Removed duplicate PackageVersion entries (FakeItEasy, Verify.DiffPlex, Verify.XUnit) that conflicted with eng/dependabot/Packages.props - Bumped Microsoft.IO.Redist 6.0.1 → 6.1.0 (MSBuild transitive dependency) - Restored Microsoft.DotNet.Build.Tasks.Templating (Arcade package, not TE) to Version.Details.xml, Version.Details.props, and Directory.Packages.props - Fixed template.json schema path in RunnableProjects.UnitTests to use $(TemplateEngineRoot) instead of $(SolutionDir) - Fixed Authoring.Tasks.IntegrationTests Compile include to use $(TemplateEngineRoot)Tools\Shared instead of broken relative path --- Directory.Packages.props | 5 +---- ...ft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj | 2 +- ...lateEngine.Orchestrator.RunnableProjects.UnitTests.csproj | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 17100b72004a..0ac132a3d3de 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -153,12 +153,9 @@ - - + - - diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj index 546f04e5c1cb..b80bfe2c5276 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj @@ -25,7 +25,7 @@ - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj index 5c77fb84cc3d..0546d5ad377a 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj @@ -43,7 +43,7 @@ - From 110aa494c39beae0c9493f31a5f22789e15ca0d2 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 31 Mar 2026 16:26:43 +0000 Subject: [PATCH 07/48] Address review feedback - Move NetFrameworkMinimum override from repo root to TemplateEngine scope - Remove signing exclusions from eng/Signing.props (Arcade handles non-shipping) - Inline package versions alphabetically in Directory.Packages.props - Fix Version.Details.xml formatting - Restore full .editorconfig (rules aren't covered by root editorconfig) - Remove redundant ExcludeFromSourceOnlyBuild (inherited from parent) - Move TemplateEngine test config into test/TemplateEngine/Directory.Build.props and test/TemplateEngine/Directory.Build.targets - Restore test/Directory.Build.props and test/Directory.Build.targets to original state (no TE-specific conditioning) - Remove only the global usings that TE tests don't reference (FluentAssertions, Microsoft.NET.TestFramework.*) --- Directory.Build.props | 3 -- Directory.Packages.props | 9 +++--- eng/Signing.props | 5 --- eng/Version.Details.xml | 36 --------------------- src/TemplateEngine/Directory.Build.props | 3 ++ test/Directory.Build.props | 21 ------------ test/Directory.Build.targets | 11 ++----- test/TemplateEngine/Directory.Build.props | 11 ++++++- test/TemplateEngine/Directory.Build.targets | 20 ++++++++++++ 9 files changed, 39 insertions(+), 80 deletions(-) create mode 100644 test/TemplateEngine/Directory.Build.targets diff --git a/Directory.Build.props b/Directory.Build.props index 505fcb0d53c4..e007dbd77bdf 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -52,9 +52,6 @@ $(MSBuildThisFileDirectory)src\TemplateEngine\ $(MSBuildThisFileDirectory)template_feed\ - - net472 - $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'redist', '$(Configuration)')) $([MSBuild]::NormalizeDirectory('$(TestHostFolder)', 'dotnet')) $(TestHostDotNetRoot)$([System.IO.Path]::GetFileName('$(DotNetTool)')) diff --git a/Directory.Packages.props b/Directory.Packages.props index 0ac132a3d3de..160d1b083269 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -13,6 +13,7 @@ + @@ -64,6 +65,7 @@ + @@ -106,6 +108,7 @@ + @@ -144,6 +147,7 @@ + @@ -152,11 +156,6 @@ - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0aa499bbaad1..52bf4febef58 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,42 +2,6 @@ - - https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b - - - https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b - - - https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b - - - https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b - - - https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b - - - https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b - - - https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b - - - https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b - - - https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b - https://github.com/dotnet/dotnet 15ac4103422d47f7c8f14fa98e813f315432d03b diff --git a/src/TemplateEngine/Directory.Build.props b/src/TemplateEngine/Directory.Build.props index fe8d77d11371..5685df153b0e 100644 --- a/src/TemplateEngine/Directory.Build.props +++ b/src/TemplateEngine/Directory.Build.props @@ -11,6 +11,9 @@ $(NoWarn);NU5105;NU5128;NU5100;NU5118;0419;0649;RS0016;RS0041 + + net472 + MicrosoftAspNetCore diff --git a/test/Directory.Build.props b/test/Directory.Build.props index e5c361f88668..cff60a43a07d 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -24,25 +24,4 @@ false - - - <_IsTemplateEngineTestProject Condition="$(MSBuildProjectName.StartsWith('Microsoft.TemplateEngine')) OR $(MSBuildProjectName.StartsWith('Microsoft.TemplateSearch'))">true - <_IsTemplateEngineTestProject Condition="$(MSBuildProjectName) == 'Microsoft.TemplateEngine.Cli.UnitTests'">false - - - - - MicrosoftAspNetCore - true - - $(NoWarn);IDE0005;0649;CA2016;CA5394;CA1802 - - diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets index f053a2189b5e..edd1cbc3f09a 100644 --- a/test/Directory.Build.targets +++ b/test/Directory.Build.targets @@ -9,9 +9,7 @@ true - - + @@ -22,12 +20,7 @@ - - - - - - + diff --git a/test/TemplateEngine/Directory.Build.props b/test/TemplateEngine/Directory.Build.props index e4fe79a83479..0d7dc3d448fd 100644 --- a/test/TemplateEngine/Directory.Build.props +++ b/test/TemplateEngine/Directory.Build.props @@ -3,7 +3,16 @@ - true + + net472 + + + MicrosoftAspNetCore + + + true + + $(NoWarn);IDE0005;0649;CA2016;CA5394;CA1802 diff --git a/test/TemplateEngine/Directory.Build.targets b/test/TemplateEngine/Directory.Build.targets new file mode 100644 index 000000000000..b3cc1c01ac6a --- /dev/null +++ b/test/TemplateEngine/Directory.Build.targets @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + From 654e9e05b88a9c6b6253cf8b70b3dc11172e8c4c Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 31 Mar 2026 17:00:33 +0000 Subject: [PATCH 08/48] Address additional review feedback - Inline TemplateEngineRoot/TemplatesDir properties in Directory.Build.props - Add TODO comment for RS0016/RS0041 PublicAPI analyzer suppression - Simplify test/TemplateEngine/Directory.Build.targets - Update TemplateEngine.slnf to be a filter over sdk.slnx - Remove stale Microsoft.TemplateEngine.sln --- Directory.Build.props | 3 - TemplateEngine.slnf | 45 +- src/TemplateEngine/Directory.Build.props | 3 +- .../Microsoft.TemplateEngine.sln | 652 ------------------ test/TemplateEngine/Directory.Build.targets | 5 - 5 files changed, 39 insertions(+), 669 deletions(-) delete mode 100644 src/TemplateEngine/Microsoft.TemplateEngine.sln diff --git a/Directory.Build.props b/Directory.Build.props index e007dbd77bdf..a1821cfccd39 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -47,11 +47,8 @@ $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src')) - - $(MSBuildThisFileDirectory)src\TemplateEngine\ $(MSBuildThisFileDirectory)template_feed\ - $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'redist', '$(Configuration)')) $([MSBuild]::NormalizeDirectory('$(TestHostFolder)', 'dotnet')) $(TestHostDotNetRoot)$([System.IO.Path]::GetFileName('$(DotNetTool)')) diff --git a/TemplateEngine.slnf b/TemplateEngine.slnf index 2467a6ebabbd..6dd116c4b80e 100644 --- a/TemplateEngine.slnf +++ b/TemplateEngine.slnf @@ -2,7 +2,6 @@ "solution": { "path": "sdk.slnx", "projects": [ - "test\\TestAssets\\TestPackages\\dotnet-new\\Microsoft.TemplateEngine.TestTemplates.csproj", "src\\Cli\\Microsoft.DotNet.Cli.Sln.Internal\\Microsoft.DotNet.Cli.Sln.Internal.csproj", "src\\Cli\\Microsoft.DotNet.Cli.Utils\\Microsoft.DotNet.Cli.Utils.csproj", "src\\Cli\\Microsoft.DotNet.Configurer\\Microsoft.DotNet.Configurer.csproj", @@ -10,15 +9,47 @@ "src\\Cli\\Microsoft.TemplateEngine.Cli\\Microsoft.TemplateEngine.Cli.csproj", "src\\Cli\\dotnet\\dotnet.csproj", "src\\Microsoft.DotNet.TemplateLocator\\Microsoft.DotNet.TemplateLocator.csproj", - "src\\Microsoft.Win32.Msi\\Microsoft.Win32.Msi.csproj", - "src\\Resolvers\\Microsoft.DotNet.NativeWrapper\\Microsoft.DotNet.NativeWrapper.csproj", - "src\\Resolvers\\Microsoft.DotNet.SdkResolver\\Microsoft.DotNet.SdkResolver.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.Abstractions\\Microsoft.TemplateEngine.Abstractions.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.Core.Contracts\\Microsoft.TemplateEngine.Core.Contracts.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.Core\\Microsoft.TemplateEngine.Core.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.Edge\\Microsoft.TemplateEngine.Edge.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.IDE\\Microsoft.TemplateEngine.IDE.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.Orchestrator.RunnableProjects\\Microsoft.TemplateEngine.Orchestrator.RunnableProjects.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.Utils\\Microsoft.TemplateEngine.Utils.csproj", + "src\\TemplateEngine\\Microsoft.TemplateSearch.Common\\Microsoft.TemplateSearch.Common.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.CLI\\Microsoft.TemplateEngine.Authoring.CLI.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.Tasks\\Microsoft.TemplateEngine.Authoring.Tasks.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3\\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier\\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.TemplateVerifier\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.TemplateLocalizer.Core\\Microsoft.TemplateEngine.TemplateLocalizer.Core.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateSearch.TemplateDiscovery\\Microsoft.TemplateSearch.TemplateDiscovery.csproj", + "template_feed\\Microsoft.DotNet.Common.ItemTemplates\\Microsoft.DotNet.Common.ItemTemplates.csproj", + "template_feed\\Microsoft.DotNet.Common.ProjectTemplates.11.0\\Microsoft.DotNet.Common.ProjectTemplates.11.0.csproj", "test\\Microsoft.NET.TestFramework\\Microsoft.NET.TestFramework.csproj", "test\\Microsoft.TemplateEngine.Cli.UnitTests\\Microsoft.TemplateEngine.Cli.UnitTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests\\Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.CLI.UnitTests\\Microsoft.TemplateEngine.Authoring.CLI.UnitTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests\\Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests\\Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.Core.UnitTests\\Microsoft.TemplateEngine.Core.UnitTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.Edge.UnitTests\\Microsoft.TemplateEngine.Edge.UnitTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.IDE.IntegrationTests\\Microsoft.TemplateEngine.IDE.IntegrationTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.Mocks\\Microsoft.TemplateEngine.Mocks.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests\\Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests\\Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.TestHelper\\Microsoft.TemplateEngine.TestHelper.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.Utils.UnitTests\\Microsoft.TemplateEngine.Utils.UnitTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateSearch.Common.UnitTests\\Microsoft.TemplateSearch.Common.UnitTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests\\Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests.csproj", + "test\\TestAssets\\TestPackages\\dotnet-new\\Microsoft.TemplateEngine.TestTemplates.csproj", "test\\dotnet-new.IntegrationTests\\dotnet-new.IntegrationTests.csproj", - "test\\dotnet.Tests\\dotnet.Tests.csproj", - "template_feed\\Microsoft.DotNet.Common.ItemTemplates\\Microsoft.DotNet.Common.ItemTemplates.csproj", - "template_feed\\Microsoft.DotNet.Common.ProjectTemplates.11.0\\Microsoft.DotNet.Common.ProjectTemplates.11.0.csproj" + "test\\dotnet.Tests\\dotnet.Tests.csproj" ] } } diff --git a/src/TemplateEngine/Directory.Build.props b/src/TemplateEngine/Directory.Build.props index 5685df153b0e..ab99a56dd0ab 100644 --- a/src/TemplateEngine/Directory.Build.props +++ b/src/TemplateEngine/Directory.Build.props @@ -7,8 +7,7 @@ repo root Directory.Build.props. These apply only to projects under src/TemplateEngine/. --> - - + $(NoWarn);NU5105;NU5128;NU5100;NU5118;0419;0649;RS0016;RS0041 diff --git a/src/TemplateEngine/Microsoft.TemplateEngine.sln b/src/TemplateEngine/Microsoft.TemplateEngine.sln deleted file mode 100644 index fb6a5b8be009..000000000000 --- a/src/TemplateEngine/Microsoft.TemplateEngine.sln +++ /dev/null @@ -1,652 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31429.26 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7DAC892E-ADAE-4CEB-8A0C-EDC452A5826A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8B498D0C-F488-4B38-8A7D-B20BF9DB6F60}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Core", "src\Microsoft.TemplateEngine.Core\Microsoft.TemplateEngine.Core.csproj", "{72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Abstractions", "src\Microsoft.TemplateEngine.Abstractions\Microsoft.TemplateEngine.Abstractions.csproj", "{0C92EDA7-492F-4CBA-9F36-61932CA5C1F4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Orchestrator.RunnableProjects", "src\Microsoft.TemplateEngine.Orchestrator.RunnableProjects\Microsoft.TemplateEngine.Orchestrator.RunnableProjects.csproj", "{578CE255-E412-4CC7-9A03-1EDCA522DA27}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Core.UnitTests", "test\Microsoft.TemplateEngine.Core.UnitTests\Microsoft.TemplateEngine.Core.UnitTests.csproj", "{62BD1600-18A2-400E-94F5-C33BBD67CA97}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Edge", "src\Microsoft.TemplateEngine.Edge\Microsoft.TemplateEngine.Edge.csproj", "{E22B59BD-A658-4E32-9407-C8D9570B9FDF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Utils", "src\Microsoft.TemplateEngine.Utils\Microsoft.TemplateEngine.Utils.csproj", "{A86924AE-4B77-47A8-A690-EDA395F075A9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Core.Contracts", "src\Microsoft.TemplateEngine.Core.Contracts\Microsoft.TemplateEngine.Core.Contracts.csproj", "{9FCFAD2A-061E-4FC0-848E-F0E8AA03676D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Utils.UnitTests", "test\Microsoft.TemplateEngine.Utils.UnitTests\Microsoft.TemplateEngine.Utils.UnitTests.csproj", "{62BD1609-18A2-400E-94F5-C33BBD67CA97}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Mocks", "test\Microsoft.TemplateEngine.Mocks\Microsoft.TemplateEngine.Mocks.csproj", "{865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests", "test\Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests\Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj", "{D9B16B88-4B85-4208-8F1C-39DFB248250C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.TestHelper", "test\Microsoft.TemplateEngine.TestHelper\Microsoft.TemplateEngine.TestHelper.csproj", "{FCB1B0F2-3067-4FE8-8A98-5EC80F38D534}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.IDE", "src\Microsoft.TemplateEngine.IDE\Microsoft.TemplateEngine.IDE.csproj", "{D26D7FC1-3DCD-434C-8261-63FCCEF27278}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Edge.UnitTests", "test\Microsoft.TemplateEngine.Edge.UnitTests\Microsoft.TemplateEngine.Edge.UnitTests.csproj", "{C416006F-FAE9-4263-8290-81B2AA81E024}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateSearch.Common", "src\Microsoft.TemplateSearch.Common\Microsoft.TemplateSearch.Common.csproj", "{4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateSearch.TemplateDiscovery", "tools\Microsoft.TemplateSearch.TemplateDiscovery\Microsoft.TemplateSearch.TemplateDiscovery.csproj", "{FBEBB725-F645-40DC-856C-D1BC7FB52CF3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.TestTemplates", "test\Microsoft.TemplateEngine.TestTemplates\Microsoft.TemplateEngine.TestTemplates.csproj", "{FC7516FB-7F44-4786-ADF2-589EF06C2EDE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.IDE.IntegrationTests", "test\Microsoft.TemplateEngine.IDE.IntegrationTests\Microsoft.TemplateEngine.IDE.IntegrationTests.csproj", "{0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateSearch.Common.UnitTests", "test\Microsoft.TemplateSearch.Common.UnitTests\Microsoft.TemplateSearch.Common.UnitTests.csproj", "{15304624-1774-4990-A0CC-7B9DA27A8FF6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.CLI", "tools\Microsoft.TemplateEngine.Authoring.CLI\Microsoft.TemplateEngine.Authoring.CLI.csproj", "{F8C5BBAA-99E9-46BA-87C9-9FB7F388F403}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.TemplateLocalizer.Core", "tools\Microsoft.TemplateEngine.TemplateLocalizer.Core\Microsoft.TemplateEngine.TemplateLocalizer.Core.csproj", "{ED5D6873-220B-4F9D-A30B-B99E950F8E26}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests", "test\Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests\Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj", "{858B2E28-1FF8-4ED2-A356-B576BD793B71}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests", "test\Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests\Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj", "{BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests", "test\Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests\Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests.csproj", "{B0330A2C-3F10-4C46-97DF-13D187564F70}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.Tasks", "tools\Microsoft.TemplateEngine.Authoring.Tasks\Microsoft.TemplateEngine.Authoring.Tasks.csproj", "{BD758B10-A47F-4159-B9A1-997723AF7349}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests", "test\Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests\Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj", "{2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C5186341-2064-49AA-B398-CDF4302D2823}" - ProjectSection(SolutionItems) = preProject - .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}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.TemplateVerifier", "tools\Microsoft.TemplateEngine.Authoring.TemplateVerifier\Microsoft.TemplateEngine.Authoring.TemplateVerifier.csproj", "{12764D81-61A7-437A-90B6-9F245E43F457}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3", "tools\Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3\Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3.csproj", "{CC3780CC-83CF-415C-A759-E5D0D4A64768}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests", "test\Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests\Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj", "{B1DDA327-F55E-466A-AF3E-7F039B9B51A9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3", "test\Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3\Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3.csproj", "{3C9F1344-E773-42FF-B98D-BD7277608903}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests", "test\Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests\Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj", "{D478568D-CA20-4331-9019-F585B564425E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3", "test\Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3\Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3.csproj", "{33D7A35E-A457-42FB-B849-3E752A372D23}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.CLI.UnitTests", "test\Microsoft.TemplateEngine.Authoring.CLI.UnitTests\Microsoft.TemplateEngine.Authoring.CLI.UnitTests.csproj", "{E8B9226E-879F-495A-BDAD-2607844D048C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "eng", "eng", "{D190251C-5649-4DD6-A158-16D119116352}" - ProjectSection(SolutionItems) = preProject - eng\Versions.props = eng\Versions.props - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{43053BC4-32B4-4404-B62D-410F367CE0CE}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.TemplateEngine.CommandUtils", "Microsoft.TemplateEngine.CommandUtils", "{EE8CD472-D8C4-4CD0-BC84-6C305F5971AE}" - ProjectSection(SolutionItems) = preProject - tools\Shared\Microsoft.TemplateEngine.CommandUtils\ArgumentEscaper.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\ArgumentEscaper.cs - tools\Shared\Microsoft.TemplateEngine.CommandUtils\BasicCommand.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\BasicCommand.cs - tools\Shared\Microsoft.TemplateEngine.CommandUtils\Command.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\Command.cs - tools\Shared\Microsoft.TemplateEngine.CommandUtils\CommandResult.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\CommandResult.cs - tools\Shared\Microsoft.TemplateEngine.CommandUtils\CommandResultAssertions.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\CommandResultAssertions.cs - tools\Shared\Microsoft.TemplateEngine.CommandUtils\CommandResultExtensions.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\CommandResultExtensions.cs - tools\Shared\Microsoft.TemplateEngine.CommandUtils\DotnetCommand.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\DotnetCommand.cs - tools\Shared\Microsoft.TemplateEngine.CommandUtils\DotnetNewCommand.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\DotnetNewCommand.cs - tools\Shared\Microsoft.TemplateEngine.CommandUtils\NativeMethods.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\NativeMethods.cs - tools\Shared\Microsoft.TemplateEngine.CommandUtils\ProcessReaper.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\ProcessReaper.cs - tools\Shared\Microsoft.TemplateEngine.CommandUtils\SdkCommandSpec.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\SdkCommandSpec.cs - tools\Shared\Microsoft.TemplateEngine.CommandUtils\StreamForwarder.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\StreamForwarder.cs - tools\Shared\Microsoft.TemplateEngine.CommandUtils\TestCommand.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\TestCommand.cs - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.TemplateApiVerifier", "tools\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj", "{449B9DDA-F18C-411E-9A74-3930652BB78A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3", "tools\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3.csproj", "{3F3F695B-537E-44DD-93FE-A1D1B88F4589}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "template-samples", "template-samples", "{3A2D12C2-0455-4471-9EBB-91749BA3A60F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Samples", "dotnet-template-samples\Microsoft.TemplateEngine.Samples.csproj", "{DFB06A25-719F-4C8B-B84D-55D2D601BEF6}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "template-feed", "template-feed", "{FF433F83-22C2-46E0-99B3-4FFCA5190A94}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.Templates", "template_feed\Microsoft.TemplateEngine.Authoring.Templates\Microsoft.TemplateEngine.Authoring.Templates.csproj", "{1F74F8F5-99E4-47AE-8608-6D470325E81C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests", "test\Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests\Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests.csproj", "{8651DEEB-0291-4E49-92AA-3B097DAF9D37}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TemplateEngine.TestHelper.XunitV3", "test\Microsoft.TemplateEngine.TestHelper.XunitV3\Microsoft.TemplateEngine.TestHelper.XunitV3.csproj", "{AB8ED04A-5EBA-42AD-9AB9-8514617B27C8}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TemplateEngine.Mocks.XunitV3", "test\Microsoft.TemplateEngine.Mocks.XunitV3\Microsoft.TemplateEngine.Mocks.XunitV3.csproj", "{F7C1932C-49E3-4869-A123-8184534AD1E2}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF}.Debug|x64.ActiveCfg = Debug|Any CPU - {72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF}.Debug|x64.Build.0 = Debug|Any CPU - {72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF}.Debug|x86.ActiveCfg = Debug|Any CPU - {72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF}.Debug|x86.Build.0 = Debug|Any CPU - {72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF}.Release|Any CPU.Build.0 = Release|Any CPU - {72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF}.Release|x64.ActiveCfg = Release|Any CPU - {72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF}.Release|x64.Build.0 = Release|Any CPU - {72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF}.Release|x86.ActiveCfg = Release|Any CPU - {72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF}.Release|x86.Build.0 = Release|Any CPU - {0C92EDA7-492F-4CBA-9F36-61932CA5C1F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C92EDA7-492F-4CBA-9F36-61932CA5C1F4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C92EDA7-492F-4CBA-9F36-61932CA5C1F4}.Debug|x64.ActiveCfg = Debug|Any CPU - {0C92EDA7-492F-4CBA-9F36-61932CA5C1F4}.Debug|x64.Build.0 = Debug|Any CPU - {0C92EDA7-492F-4CBA-9F36-61932CA5C1F4}.Debug|x86.ActiveCfg = Debug|Any CPU - {0C92EDA7-492F-4CBA-9F36-61932CA5C1F4}.Debug|x86.Build.0 = Debug|Any CPU - {0C92EDA7-492F-4CBA-9F36-61932CA5C1F4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C92EDA7-492F-4CBA-9F36-61932CA5C1F4}.Release|Any CPU.Build.0 = Release|Any CPU - {0C92EDA7-492F-4CBA-9F36-61932CA5C1F4}.Release|x64.ActiveCfg = Release|Any CPU - {0C92EDA7-492F-4CBA-9F36-61932CA5C1F4}.Release|x64.Build.0 = Release|Any CPU - {0C92EDA7-492F-4CBA-9F36-61932CA5C1F4}.Release|x86.ActiveCfg = Release|Any CPU - {0C92EDA7-492F-4CBA-9F36-61932CA5C1F4}.Release|x86.Build.0 = Release|Any CPU - {578CE255-E412-4CC7-9A03-1EDCA522DA27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {578CE255-E412-4CC7-9A03-1EDCA522DA27}.Debug|Any CPU.Build.0 = Debug|Any CPU - {578CE255-E412-4CC7-9A03-1EDCA522DA27}.Debug|x64.ActiveCfg = Debug|Any CPU - {578CE255-E412-4CC7-9A03-1EDCA522DA27}.Debug|x64.Build.0 = Debug|Any CPU - {578CE255-E412-4CC7-9A03-1EDCA522DA27}.Debug|x86.ActiveCfg = Debug|Any CPU - {578CE255-E412-4CC7-9A03-1EDCA522DA27}.Debug|x86.Build.0 = Debug|Any CPU - {578CE255-E412-4CC7-9A03-1EDCA522DA27}.Release|Any CPU.ActiveCfg = Release|Any CPU - {578CE255-E412-4CC7-9A03-1EDCA522DA27}.Release|Any CPU.Build.0 = Release|Any CPU - {578CE255-E412-4CC7-9A03-1EDCA522DA27}.Release|x64.ActiveCfg = Release|Any CPU - {578CE255-E412-4CC7-9A03-1EDCA522DA27}.Release|x64.Build.0 = Release|Any CPU - {578CE255-E412-4CC7-9A03-1EDCA522DA27}.Release|x86.ActiveCfg = Release|Any CPU - {578CE255-E412-4CC7-9A03-1EDCA522DA27}.Release|x86.Build.0 = Release|Any CPU - {62BD1600-18A2-400E-94F5-C33BBD67CA97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {62BD1600-18A2-400E-94F5-C33BBD67CA97}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62BD1600-18A2-400E-94F5-C33BBD67CA97}.Debug|x64.ActiveCfg = Debug|Any CPU - {62BD1600-18A2-400E-94F5-C33BBD67CA97}.Debug|x64.Build.0 = Debug|Any CPU - {62BD1600-18A2-400E-94F5-C33BBD67CA97}.Debug|x86.ActiveCfg = Debug|Any CPU - {62BD1600-18A2-400E-94F5-C33BBD67CA97}.Debug|x86.Build.0 = Debug|Any CPU - {62BD1600-18A2-400E-94F5-C33BBD67CA97}.Release|Any CPU.ActiveCfg = Release|Any CPU - {62BD1600-18A2-400E-94F5-C33BBD67CA97}.Release|Any CPU.Build.0 = Release|Any CPU - {62BD1600-18A2-400E-94F5-C33BBD67CA97}.Release|x64.ActiveCfg = Release|Any CPU - {62BD1600-18A2-400E-94F5-C33BBD67CA97}.Release|x64.Build.0 = Release|Any CPU - {62BD1600-18A2-400E-94F5-C33BBD67CA97}.Release|x86.ActiveCfg = Release|Any CPU - {62BD1600-18A2-400E-94F5-C33BBD67CA97}.Release|x86.Build.0 = Release|Any CPU - {E22B59BD-A658-4E32-9407-C8D9570B9FDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E22B59BD-A658-4E32-9407-C8D9570B9FDF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E22B59BD-A658-4E32-9407-C8D9570B9FDF}.Debug|x64.ActiveCfg = Debug|Any CPU - {E22B59BD-A658-4E32-9407-C8D9570B9FDF}.Debug|x64.Build.0 = Debug|Any CPU - {E22B59BD-A658-4E32-9407-C8D9570B9FDF}.Debug|x86.ActiveCfg = Debug|Any CPU - {E22B59BD-A658-4E32-9407-C8D9570B9FDF}.Debug|x86.Build.0 = Debug|Any CPU - {E22B59BD-A658-4E32-9407-C8D9570B9FDF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E22B59BD-A658-4E32-9407-C8D9570B9FDF}.Release|Any CPU.Build.0 = Release|Any CPU - {E22B59BD-A658-4E32-9407-C8D9570B9FDF}.Release|x64.ActiveCfg = Release|Any CPU - {E22B59BD-A658-4E32-9407-C8D9570B9FDF}.Release|x64.Build.0 = Release|Any CPU - {E22B59BD-A658-4E32-9407-C8D9570B9FDF}.Release|x86.ActiveCfg = Release|Any CPU - {E22B59BD-A658-4E32-9407-C8D9570B9FDF}.Release|x86.Build.0 = Release|Any CPU - {A86924AE-4B77-47A8-A690-EDA395F075A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A86924AE-4B77-47A8-A690-EDA395F075A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A86924AE-4B77-47A8-A690-EDA395F075A9}.Debug|x64.ActiveCfg = Debug|Any CPU - {A86924AE-4B77-47A8-A690-EDA395F075A9}.Debug|x64.Build.0 = Debug|Any CPU - {A86924AE-4B77-47A8-A690-EDA395F075A9}.Debug|x86.ActiveCfg = Debug|Any CPU - {A86924AE-4B77-47A8-A690-EDA395F075A9}.Debug|x86.Build.0 = Debug|Any CPU - {A86924AE-4B77-47A8-A690-EDA395F075A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A86924AE-4B77-47A8-A690-EDA395F075A9}.Release|Any CPU.Build.0 = Release|Any CPU - {A86924AE-4B77-47A8-A690-EDA395F075A9}.Release|x64.ActiveCfg = Release|Any CPU - {A86924AE-4B77-47A8-A690-EDA395F075A9}.Release|x64.Build.0 = Release|Any CPU - {A86924AE-4B77-47A8-A690-EDA395F075A9}.Release|x86.ActiveCfg = Release|Any CPU - {A86924AE-4B77-47A8-A690-EDA395F075A9}.Release|x86.Build.0 = Release|Any CPU - {9FCFAD2A-061E-4FC0-848E-F0E8AA03676D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9FCFAD2A-061E-4FC0-848E-F0E8AA03676D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9FCFAD2A-061E-4FC0-848E-F0E8AA03676D}.Debug|x64.ActiveCfg = Debug|Any CPU - {9FCFAD2A-061E-4FC0-848E-F0E8AA03676D}.Debug|x64.Build.0 = Debug|Any CPU - {9FCFAD2A-061E-4FC0-848E-F0E8AA03676D}.Debug|x86.ActiveCfg = Debug|Any CPU - {9FCFAD2A-061E-4FC0-848E-F0E8AA03676D}.Debug|x86.Build.0 = Debug|Any CPU - {9FCFAD2A-061E-4FC0-848E-F0E8AA03676D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9FCFAD2A-061E-4FC0-848E-F0E8AA03676D}.Release|Any CPU.Build.0 = Release|Any CPU - {9FCFAD2A-061E-4FC0-848E-F0E8AA03676D}.Release|x64.ActiveCfg = Release|Any CPU - {9FCFAD2A-061E-4FC0-848E-F0E8AA03676D}.Release|x64.Build.0 = Release|Any CPU - {9FCFAD2A-061E-4FC0-848E-F0E8AA03676D}.Release|x86.ActiveCfg = Release|Any CPU - {9FCFAD2A-061E-4FC0-848E-F0E8AA03676D}.Release|x86.Build.0 = Release|Any CPU - {62BD1609-18A2-400E-94F5-C33BBD67CA97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {62BD1609-18A2-400E-94F5-C33BBD67CA97}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62BD1609-18A2-400E-94F5-C33BBD67CA97}.Debug|x64.ActiveCfg = Debug|Any CPU - {62BD1609-18A2-400E-94F5-C33BBD67CA97}.Debug|x64.Build.0 = Debug|Any CPU - {62BD1609-18A2-400E-94F5-C33BBD67CA97}.Debug|x86.ActiveCfg = Debug|Any CPU - {62BD1609-18A2-400E-94F5-C33BBD67CA97}.Debug|x86.Build.0 = Debug|Any CPU - {62BD1609-18A2-400E-94F5-C33BBD67CA97}.Release|Any CPU.ActiveCfg = Release|Any CPU - {62BD1609-18A2-400E-94F5-C33BBD67CA97}.Release|Any CPU.Build.0 = Release|Any CPU - {62BD1609-18A2-400E-94F5-C33BBD67CA97}.Release|x64.ActiveCfg = Release|Any CPU - {62BD1609-18A2-400E-94F5-C33BBD67CA97}.Release|x64.Build.0 = Release|Any CPU - {62BD1609-18A2-400E-94F5-C33BBD67CA97}.Release|x86.ActiveCfg = Release|Any CPU - {62BD1609-18A2-400E-94F5-C33BBD67CA97}.Release|x86.Build.0 = Release|Any CPU - {865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56}.Debug|Any CPU.Build.0 = Debug|Any CPU - {865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56}.Debug|x64.ActiveCfg = Debug|Any CPU - {865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56}.Debug|x64.Build.0 = Debug|Any CPU - {865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56}.Debug|x86.ActiveCfg = Debug|Any CPU - {865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56}.Debug|x86.Build.0 = Debug|Any CPU - {865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56}.Release|Any CPU.ActiveCfg = Release|Any CPU - {865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56}.Release|Any CPU.Build.0 = Release|Any CPU - {865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56}.Release|x64.ActiveCfg = Release|Any CPU - {865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56}.Release|x64.Build.0 = Release|Any CPU - {865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56}.Release|x86.ActiveCfg = Release|Any CPU - {865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56}.Release|x86.Build.0 = Release|Any CPU - {D9B16B88-4B85-4208-8F1C-39DFB248250C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9B16B88-4B85-4208-8F1C-39DFB248250C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9B16B88-4B85-4208-8F1C-39DFB248250C}.Debug|x64.ActiveCfg = Debug|Any CPU - {D9B16B88-4B85-4208-8F1C-39DFB248250C}.Debug|x64.Build.0 = Debug|Any CPU - {D9B16B88-4B85-4208-8F1C-39DFB248250C}.Debug|x86.ActiveCfg = Debug|Any CPU - {D9B16B88-4B85-4208-8F1C-39DFB248250C}.Debug|x86.Build.0 = Debug|Any CPU - {D9B16B88-4B85-4208-8F1C-39DFB248250C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9B16B88-4B85-4208-8F1C-39DFB248250C}.Release|Any CPU.Build.0 = Release|Any CPU - {D9B16B88-4B85-4208-8F1C-39DFB248250C}.Release|x64.ActiveCfg = Release|Any CPU - {D9B16B88-4B85-4208-8F1C-39DFB248250C}.Release|x64.Build.0 = Release|Any CPU - {D9B16B88-4B85-4208-8F1C-39DFB248250C}.Release|x86.ActiveCfg = Release|Any CPU - {D9B16B88-4B85-4208-8F1C-39DFB248250C}.Release|x86.Build.0 = Release|Any CPU - {FCB1B0F2-3067-4FE8-8A98-5EC80F38D534}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FCB1B0F2-3067-4FE8-8A98-5EC80F38D534}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FCB1B0F2-3067-4FE8-8A98-5EC80F38D534}.Debug|x64.ActiveCfg = Debug|Any CPU - {FCB1B0F2-3067-4FE8-8A98-5EC80F38D534}.Debug|x64.Build.0 = Debug|Any CPU - {FCB1B0F2-3067-4FE8-8A98-5EC80F38D534}.Debug|x86.ActiveCfg = Debug|Any CPU - {FCB1B0F2-3067-4FE8-8A98-5EC80F38D534}.Debug|x86.Build.0 = Debug|Any CPU - {FCB1B0F2-3067-4FE8-8A98-5EC80F38D534}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FCB1B0F2-3067-4FE8-8A98-5EC80F38D534}.Release|Any CPU.Build.0 = Release|Any CPU - {FCB1B0F2-3067-4FE8-8A98-5EC80F38D534}.Release|x64.ActiveCfg = Release|Any CPU - {FCB1B0F2-3067-4FE8-8A98-5EC80F38D534}.Release|x64.Build.0 = Release|Any CPU - {FCB1B0F2-3067-4FE8-8A98-5EC80F38D534}.Release|x86.ActiveCfg = Release|Any CPU - {FCB1B0F2-3067-4FE8-8A98-5EC80F38D534}.Release|x86.Build.0 = Release|Any CPU - {D26D7FC1-3DCD-434C-8261-63FCCEF27278}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D26D7FC1-3DCD-434C-8261-63FCCEF27278}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D26D7FC1-3DCD-434C-8261-63FCCEF27278}.Debug|x64.ActiveCfg = Debug|Any CPU - {D26D7FC1-3DCD-434C-8261-63FCCEF27278}.Debug|x64.Build.0 = Debug|Any CPU - {D26D7FC1-3DCD-434C-8261-63FCCEF27278}.Debug|x86.ActiveCfg = Debug|Any CPU - {D26D7FC1-3DCD-434C-8261-63FCCEF27278}.Debug|x86.Build.0 = Debug|Any CPU - {D26D7FC1-3DCD-434C-8261-63FCCEF27278}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D26D7FC1-3DCD-434C-8261-63FCCEF27278}.Release|Any CPU.Build.0 = Release|Any CPU - {D26D7FC1-3DCD-434C-8261-63FCCEF27278}.Release|x64.ActiveCfg = Release|Any CPU - {D26D7FC1-3DCD-434C-8261-63FCCEF27278}.Release|x64.Build.0 = Release|Any CPU - {D26D7FC1-3DCD-434C-8261-63FCCEF27278}.Release|x86.ActiveCfg = Release|Any CPU - {D26D7FC1-3DCD-434C-8261-63FCCEF27278}.Release|x86.Build.0 = Release|Any CPU - {C416006F-FAE9-4263-8290-81B2AA81E024}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C416006F-FAE9-4263-8290-81B2AA81E024}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C416006F-FAE9-4263-8290-81B2AA81E024}.Debug|x64.ActiveCfg = Debug|Any CPU - {C416006F-FAE9-4263-8290-81B2AA81E024}.Debug|x64.Build.0 = Debug|Any CPU - {C416006F-FAE9-4263-8290-81B2AA81E024}.Debug|x86.ActiveCfg = Debug|Any CPU - {C416006F-FAE9-4263-8290-81B2AA81E024}.Debug|x86.Build.0 = Debug|Any CPU - {C416006F-FAE9-4263-8290-81B2AA81E024}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C416006F-FAE9-4263-8290-81B2AA81E024}.Release|Any CPU.Build.0 = Release|Any CPU - {C416006F-FAE9-4263-8290-81B2AA81E024}.Release|x64.ActiveCfg = Release|Any CPU - {C416006F-FAE9-4263-8290-81B2AA81E024}.Release|x64.Build.0 = Release|Any CPU - {C416006F-FAE9-4263-8290-81B2AA81E024}.Release|x86.ActiveCfg = Release|Any CPU - {C416006F-FAE9-4263-8290-81B2AA81E024}.Release|x86.Build.0 = Release|Any CPU - {4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B}.Debug|x64.ActiveCfg = Debug|Any CPU - {4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B}.Debug|x64.Build.0 = Debug|Any CPU - {4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B}.Debug|x86.ActiveCfg = Debug|Any CPU - {4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B}.Debug|x86.Build.0 = Debug|Any CPU - {4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B}.Release|Any CPU.Build.0 = Release|Any CPU - {4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B}.Release|x64.ActiveCfg = Release|Any CPU - {4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B}.Release|x64.Build.0 = Release|Any CPU - {4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B}.Release|x86.ActiveCfg = Release|Any CPU - {4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B}.Release|x86.Build.0 = Release|Any CPU - {FBEBB725-F645-40DC-856C-D1BC7FB52CF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBEBB725-F645-40DC-856C-D1BC7FB52CF3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBEBB725-F645-40DC-856C-D1BC7FB52CF3}.Debug|x64.ActiveCfg = Debug|Any CPU - {FBEBB725-F645-40DC-856C-D1BC7FB52CF3}.Debug|x64.Build.0 = Debug|Any CPU - {FBEBB725-F645-40DC-856C-D1BC7FB52CF3}.Debug|x86.ActiveCfg = Debug|Any CPU - {FBEBB725-F645-40DC-856C-D1BC7FB52CF3}.Debug|x86.Build.0 = Debug|Any CPU - {FBEBB725-F645-40DC-856C-D1BC7FB52CF3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBEBB725-F645-40DC-856C-D1BC7FB52CF3}.Release|Any CPU.Build.0 = Release|Any CPU - {FBEBB725-F645-40DC-856C-D1BC7FB52CF3}.Release|x64.ActiveCfg = Release|Any CPU - {FBEBB725-F645-40DC-856C-D1BC7FB52CF3}.Release|x64.Build.0 = Release|Any CPU - {FBEBB725-F645-40DC-856C-D1BC7FB52CF3}.Release|x86.ActiveCfg = Release|Any CPU - {FBEBB725-F645-40DC-856C-D1BC7FB52CF3}.Release|x86.Build.0 = Release|Any CPU - {FC7516FB-7F44-4786-ADF2-589EF06C2EDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC7516FB-7F44-4786-ADF2-589EF06C2EDE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC7516FB-7F44-4786-ADF2-589EF06C2EDE}.Debug|x64.ActiveCfg = Debug|Any CPU - {FC7516FB-7F44-4786-ADF2-589EF06C2EDE}.Debug|x64.Build.0 = Debug|Any CPU - {FC7516FB-7F44-4786-ADF2-589EF06C2EDE}.Debug|x86.ActiveCfg = Debug|Any CPU - {FC7516FB-7F44-4786-ADF2-589EF06C2EDE}.Debug|x86.Build.0 = Debug|Any CPU - {FC7516FB-7F44-4786-ADF2-589EF06C2EDE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC7516FB-7F44-4786-ADF2-589EF06C2EDE}.Release|Any CPU.Build.0 = Release|Any CPU - {FC7516FB-7F44-4786-ADF2-589EF06C2EDE}.Release|x64.ActiveCfg = Release|Any CPU - {FC7516FB-7F44-4786-ADF2-589EF06C2EDE}.Release|x64.Build.0 = Release|Any CPU - {FC7516FB-7F44-4786-ADF2-589EF06C2EDE}.Release|x86.ActiveCfg = Release|Any CPU - {FC7516FB-7F44-4786-ADF2-589EF06C2EDE}.Release|x86.Build.0 = Release|Any CPU - {0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78}.Debug|x64.ActiveCfg = Debug|Any CPU - {0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78}.Debug|x64.Build.0 = Debug|Any CPU - {0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78}.Debug|x86.ActiveCfg = Debug|Any CPU - {0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78}.Debug|x86.Build.0 = Debug|Any CPU - {0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78}.Release|Any CPU.Build.0 = Release|Any CPU - {0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78}.Release|x64.ActiveCfg = Release|Any CPU - {0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78}.Release|x64.Build.0 = Release|Any CPU - {0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78}.Release|x86.ActiveCfg = Release|Any CPU - {0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78}.Release|x86.Build.0 = Release|Any CPU - {15304624-1774-4990-A0CC-7B9DA27A8FF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15304624-1774-4990-A0CC-7B9DA27A8FF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15304624-1774-4990-A0CC-7B9DA27A8FF6}.Debug|x64.ActiveCfg = Debug|Any CPU - {15304624-1774-4990-A0CC-7B9DA27A8FF6}.Debug|x64.Build.0 = Debug|Any CPU - {15304624-1774-4990-A0CC-7B9DA27A8FF6}.Debug|x86.ActiveCfg = Debug|Any CPU - {15304624-1774-4990-A0CC-7B9DA27A8FF6}.Debug|x86.Build.0 = Debug|Any CPU - {15304624-1774-4990-A0CC-7B9DA27A8FF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15304624-1774-4990-A0CC-7B9DA27A8FF6}.Release|Any CPU.Build.0 = Release|Any CPU - {15304624-1774-4990-A0CC-7B9DA27A8FF6}.Release|x64.ActiveCfg = Release|Any CPU - {15304624-1774-4990-A0CC-7B9DA27A8FF6}.Release|x64.Build.0 = Release|Any CPU - {15304624-1774-4990-A0CC-7B9DA27A8FF6}.Release|x86.ActiveCfg = Release|Any CPU - {15304624-1774-4990-A0CC-7B9DA27A8FF6}.Release|x86.Build.0 = Release|Any CPU - {F8C5BBAA-99E9-46BA-87C9-9FB7F388F403}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F8C5BBAA-99E9-46BA-87C9-9FB7F388F403}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F8C5BBAA-99E9-46BA-87C9-9FB7F388F403}.Debug|x64.ActiveCfg = Debug|Any CPU - {F8C5BBAA-99E9-46BA-87C9-9FB7F388F403}.Debug|x64.Build.0 = Debug|Any CPU - {F8C5BBAA-99E9-46BA-87C9-9FB7F388F403}.Debug|x86.ActiveCfg = Debug|Any CPU - {F8C5BBAA-99E9-46BA-87C9-9FB7F388F403}.Debug|x86.Build.0 = Debug|Any CPU - {F8C5BBAA-99E9-46BA-87C9-9FB7F388F403}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F8C5BBAA-99E9-46BA-87C9-9FB7F388F403}.Release|Any CPU.Build.0 = Release|Any CPU - {F8C5BBAA-99E9-46BA-87C9-9FB7F388F403}.Release|x64.ActiveCfg = Release|Any CPU - {F8C5BBAA-99E9-46BA-87C9-9FB7F388F403}.Release|x64.Build.0 = Release|Any CPU - {F8C5BBAA-99E9-46BA-87C9-9FB7F388F403}.Release|x86.ActiveCfg = Release|Any CPU - {F8C5BBAA-99E9-46BA-87C9-9FB7F388F403}.Release|x86.Build.0 = Release|Any CPU - {ED5D6873-220B-4F9D-A30B-B99E950F8E26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED5D6873-220B-4F9D-A30B-B99E950F8E26}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED5D6873-220B-4F9D-A30B-B99E950F8E26}.Debug|x64.ActiveCfg = Debug|Any CPU - {ED5D6873-220B-4F9D-A30B-B99E950F8E26}.Debug|x64.Build.0 = Debug|Any CPU - {ED5D6873-220B-4F9D-A30B-B99E950F8E26}.Debug|x86.ActiveCfg = Debug|Any CPU - {ED5D6873-220B-4F9D-A30B-B99E950F8E26}.Debug|x86.Build.0 = Debug|Any CPU - {ED5D6873-220B-4F9D-A30B-B99E950F8E26}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED5D6873-220B-4F9D-A30B-B99E950F8E26}.Release|Any CPU.Build.0 = Release|Any CPU - {ED5D6873-220B-4F9D-A30B-B99E950F8E26}.Release|x64.ActiveCfg = Release|Any CPU - {ED5D6873-220B-4F9D-A30B-B99E950F8E26}.Release|x64.Build.0 = Release|Any CPU - {ED5D6873-220B-4F9D-A30B-B99E950F8E26}.Release|x86.ActiveCfg = Release|Any CPU - {ED5D6873-220B-4F9D-A30B-B99E950F8E26}.Release|x86.Build.0 = Release|Any CPU - {858B2E28-1FF8-4ED2-A356-B576BD793B71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {858B2E28-1FF8-4ED2-A356-B576BD793B71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {858B2E28-1FF8-4ED2-A356-B576BD793B71}.Debug|x64.ActiveCfg = Debug|Any CPU - {858B2E28-1FF8-4ED2-A356-B576BD793B71}.Debug|x64.Build.0 = Debug|Any CPU - {858B2E28-1FF8-4ED2-A356-B576BD793B71}.Debug|x86.ActiveCfg = Debug|Any CPU - {858B2E28-1FF8-4ED2-A356-B576BD793B71}.Debug|x86.Build.0 = Debug|Any CPU - {858B2E28-1FF8-4ED2-A356-B576BD793B71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {858B2E28-1FF8-4ED2-A356-B576BD793B71}.Release|Any CPU.Build.0 = Release|Any CPU - {858B2E28-1FF8-4ED2-A356-B576BD793B71}.Release|x64.ActiveCfg = Release|Any CPU - {858B2E28-1FF8-4ED2-A356-B576BD793B71}.Release|x64.Build.0 = Release|Any CPU - {858B2E28-1FF8-4ED2-A356-B576BD793B71}.Release|x86.ActiveCfg = Release|Any CPU - {858B2E28-1FF8-4ED2-A356-B576BD793B71}.Release|x86.Build.0 = Release|Any CPU - {BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5}.Debug|x64.ActiveCfg = Debug|Any CPU - {BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5}.Debug|x64.Build.0 = Debug|Any CPU - {BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5}.Debug|x86.ActiveCfg = Debug|Any CPU - {BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5}.Debug|x86.Build.0 = Debug|Any CPU - {BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5}.Release|Any CPU.Build.0 = Release|Any CPU - {BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5}.Release|x64.ActiveCfg = Release|Any CPU - {BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5}.Release|x64.Build.0 = Release|Any CPU - {BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5}.Release|x86.ActiveCfg = Release|Any CPU - {BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5}.Release|x86.Build.0 = Release|Any CPU - {B0330A2C-3F10-4C46-97DF-13D187564F70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0330A2C-3F10-4C46-97DF-13D187564F70}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0330A2C-3F10-4C46-97DF-13D187564F70}.Debug|x64.ActiveCfg = Debug|Any CPU - {B0330A2C-3F10-4C46-97DF-13D187564F70}.Debug|x64.Build.0 = Debug|Any CPU - {B0330A2C-3F10-4C46-97DF-13D187564F70}.Debug|x86.ActiveCfg = Debug|Any CPU - {B0330A2C-3F10-4C46-97DF-13D187564F70}.Debug|x86.Build.0 = Debug|Any CPU - {B0330A2C-3F10-4C46-97DF-13D187564F70}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0330A2C-3F10-4C46-97DF-13D187564F70}.Release|Any CPU.Build.0 = Release|Any CPU - {B0330A2C-3F10-4C46-97DF-13D187564F70}.Release|x64.ActiveCfg = Release|Any CPU - {B0330A2C-3F10-4C46-97DF-13D187564F70}.Release|x64.Build.0 = Release|Any CPU - {B0330A2C-3F10-4C46-97DF-13D187564F70}.Release|x86.ActiveCfg = Release|Any CPU - {B0330A2C-3F10-4C46-97DF-13D187564F70}.Release|x86.Build.0 = Release|Any CPU - {BD758B10-A47F-4159-B9A1-997723AF7349}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD758B10-A47F-4159-B9A1-997723AF7349}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD758B10-A47F-4159-B9A1-997723AF7349}.Debug|x64.ActiveCfg = Debug|Any CPU - {BD758B10-A47F-4159-B9A1-997723AF7349}.Debug|x64.Build.0 = Debug|Any CPU - {BD758B10-A47F-4159-B9A1-997723AF7349}.Debug|x86.ActiveCfg = Debug|Any CPU - {BD758B10-A47F-4159-B9A1-997723AF7349}.Debug|x86.Build.0 = Debug|Any CPU - {BD758B10-A47F-4159-B9A1-997723AF7349}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD758B10-A47F-4159-B9A1-997723AF7349}.Release|Any CPU.Build.0 = Release|Any CPU - {BD758B10-A47F-4159-B9A1-997723AF7349}.Release|x64.ActiveCfg = Release|Any CPU - {BD758B10-A47F-4159-B9A1-997723AF7349}.Release|x64.Build.0 = Release|Any CPU - {BD758B10-A47F-4159-B9A1-997723AF7349}.Release|x86.ActiveCfg = Release|Any CPU - {BD758B10-A47F-4159-B9A1-997723AF7349}.Release|x86.Build.0 = Release|Any CPU - {2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE}.Debug|x64.ActiveCfg = Debug|Any CPU - {2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE}.Debug|x64.Build.0 = Debug|Any CPU - {2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE}.Debug|x86.ActiveCfg = Debug|Any CPU - {2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE}.Debug|x86.Build.0 = Debug|Any CPU - {2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE}.Release|Any CPU.Build.0 = Release|Any CPU - {2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE}.Release|x64.ActiveCfg = Release|Any CPU - {2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE}.Release|x64.Build.0 = Release|Any CPU - {2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE}.Release|x86.ActiveCfg = Release|Any CPU - {2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE}.Release|x86.Build.0 = Release|Any CPU - {12764D81-61A7-437A-90B6-9F245E43F457}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {12764D81-61A7-437A-90B6-9F245E43F457}.Debug|Any CPU.Build.0 = Debug|Any CPU - {12764D81-61A7-437A-90B6-9F245E43F457}.Debug|x64.ActiveCfg = Debug|Any CPU - {12764D81-61A7-437A-90B6-9F245E43F457}.Debug|x64.Build.0 = Debug|Any CPU - {12764D81-61A7-437A-90B6-9F245E43F457}.Debug|x86.ActiveCfg = Debug|Any CPU - {12764D81-61A7-437A-90B6-9F245E43F457}.Debug|x86.Build.0 = Debug|Any CPU - {12764D81-61A7-437A-90B6-9F245E43F457}.Release|Any CPU.ActiveCfg = Release|Any CPU - {12764D81-61A7-437A-90B6-9F245E43F457}.Release|Any CPU.Build.0 = Release|Any CPU - {12764D81-61A7-437A-90B6-9F245E43F457}.Release|x64.ActiveCfg = Release|Any CPU - {12764D81-61A7-437A-90B6-9F245E43F457}.Release|x64.Build.0 = Release|Any CPU - {12764D81-61A7-437A-90B6-9F245E43F457}.Release|x86.ActiveCfg = Release|Any CPU - {12764D81-61A7-437A-90B6-9F245E43F457}.Release|x86.Build.0 = Release|Any CPU - {B1DDA327-F55E-466A-AF3E-7F039B9B51A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1DDA327-F55E-466A-AF3E-7F039B9B51A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1DDA327-F55E-466A-AF3E-7F039B9B51A9}.Debug|x64.ActiveCfg = Debug|Any CPU - {B1DDA327-F55E-466A-AF3E-7F039B9B51A9}.Debug|x64.Build.0 = Debug|Any CPU - {B1DDA327-F55E-466A-AF3E-7F039B9B51A9}.Debug|x86.ActiveCfg = Debug|Any CPU - {B1DDA327-F55E-466A-AF3E-7F039B9B51A9}.Debug|x86.Build.0 = Debug|Any CPU - {B1DDA327-F55E-466A-AF3E-7F039B9B51A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1DDA327-F55E-466A-AF3E-7F039B9B51A9}.Release|Any CPU.Build.0 = Release|Any CPU - {B1DDA327-F55E-466A-AF3E-7F039B9B51A9}.Release|x64.ActiveCfg = Release|Any CPU - {B1DDA327-F55E-466A-AF3E-7F039B9B51A9}.Release|x64.Build.0 = Release|Any CPU - {B1DDA327-F55E-466A-AF3E-7F039B9B51A9}.Release|x86.ActiveCfg = Release|Any CPU - {B1DDA327-F55E-466A-AF3E-7F039B9B51A9}.Release|x86.Build.0 = Release|Any CPU - {D478568D-CA20-4331-9019-F585B564425E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D478568D-CA20-4331-9019-F585B564425E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D478568D-CA20-4331-9019-F585B564425E}.Debug|x64.ActiveCfg = Debug|Any CPU - {D478568D-CA20-4331-9019-F585B564425E}.Debug|x64.Build.0 = Debug|Any CPU - {D478568D-CA20-4331-9019-F585B564425E}.Debug|x86.ActiveCfg = Debug|Any CPU - {D478568D-CA20-4331-9019-F585B564425E}.Debug|x86.Build.0 = Debug|Any CPU - {D478568D-CA20-4331-9019-F585B564425E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D478568D-CA20-4331-9019-F585B564425E}.Release|Any CPU.Build.0 = Release|Any CPU - {D478568D-CA20-4331-9019-F585B564425E}.Release|x64.ActiveCfg = Release|Any CPU - {D478568D-CA20-4331-9019-F585B564425E}.Release|x64.Build.0 = Release|Any CPU - {D478568D-CA20-4331-9019-F585B564425E}.Release|x86.ActiveCfg = Release|Any CPU - {D478568D-CA20-4331-9019-F585B564425E}.Release|x86.Build.0 = Release|Any CPU - {E8B9226E-879F-495A-BDAD-2607844D048C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8B9226E-879F-495A-BDAD-2607844D048C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8B9226E-879F-495A-BDAD-2607844D048C}.Debug|x64.ActiveCfg = Debug|Any CPU - {E8B9226E-879F-495A-BDAD-2607844D048C}.Debug|x64.Build.0 = Debug|Any CPU - {E8B9226E-879F-495A-BDAD-2607844D048C}.Debug|x86.ActiveCfg = Debug|Any CPU - {E8B9226E-879F-495A-BDAD-2607844D048C}.Debug|x86.Build.0 = Debug|Any CPU - {E8B9226E-879F-495A-BDAD-2607844D048C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8B9226E-879F-495A-BDAD-2607844D048C}.Release|Any CPU.Build.0 = Release|Any CPU - {E8B9226E-879F-495A-BDAD-2607844D048C}.Release|x64.ActiveCfg = Release|Any CPU - {E8B9226E-879F-495A-BDAD-2607844D048C}.Release|x64.Build.0 = Release|Any CPU - {E8B9226E-879F-495A-BDAD-2607844D048C}.Release|x86.ActiveCfg = Release|Any CPU - {E8B9226E-879F-495A-BDAD-2607844D048C}.Release|x86.Build.0 = Release|Any CPU - {449B9DDA-F18C-411E-9A74-3930652BB78A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {449B9DDA-F18C-411E-9A74-3930652BB78A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {449B9DDA-F18C-411E-9A74-3930652BB78A}.Debug|x64.ActiveCfg = Debug|Any CPU - {449B9DDA-F18C-411E-9A74-3930652BB78A}.Debug|x64.Build.0 = Debug|Any CPU - {449B9DDA-F18C-411E-9A74-3930652BB78A}.Debug|x86.ActiveCfg = Debug|Any CPU - {449B9DDA-F18C-411E-9A74-3930652BB78A}.Debug|x86.Build.0 = Debug|Any CPU - {449B9DDA-F18C-411E-9A74-3930652BB78A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {449B9DDA-F18C-411E-9A74-3930652BB78A}.Release|Any CPU.Build.0 = Release|Any CPU - {449B9DDA-F18C-411E-9A74-3930652BB78A}.Release|x64.ActiveCfg = Release|Any CPU - {449B9DDA-F18C-411E-9A74-3930652BB78A}.Release|x64.Build.0 = Release|Any CPU - {449B9DDA-F18C-411E-9A74-3930652BB78A}.Release|x86.ActiveCfg = Release|Any CPU - {449B9DDA-F18C-411E-9A74-3930652BB78A}.Release|x86.Build.0 = Release|Any CPU - {DFB06A25-719F-4C8B-B84D-55D2D601BEF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DFB06A25-719F-4C8B-B84D-55D2D601BEF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DFB06A25-719F-4C8B-B84D-55D2D601BEF6}.Debug|x64.ActiveCfg = Debug|Any CPU - {DFB06A25-719F-4C8B-B84D-55D2D601BEF6}.Debug|x64.Build.0 = Debug|Any CPU - {DFB06A25-719F-4C8B-B84D-55D2D601BEF6}.Debug|x86.ActiveCfg = Debug|Any CPU - {DFB06A25-719F-4C8B-B84D-55D2D601BEF6}.Debug|x86.Build.0 = Debug|Any CPU - {DFB06A25-719F-4C8B-B84D-55D2D601BEF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DFB06A25-719F-4C8B-B84D-55D2D601BEF6}.Release|Any CPU.Build.0 = Release|Any CPU - {DFB06A25-719F-4C8B-B84D-55D2D601BEF6}.Release|x64.ActiveCfg = Release|Any CPU - {DFB06A25-719F-4C8B-B84D-55D2D601BEF6}.Release|x64.Build.0 = Release|Any CPU - {DFB06A25-719F-4C8B-B84D-55D2D601BEF6}.Release|x86.ActiveCfg = Release|Any CPU - {DFB06A25-719F-4C8B-B84D-55D2D601BEF6}.Release|x86.Build.0 = Release|Any CPU - {1F74F8F5-99E4-47AE-8608-6D470325E81C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F74F8F5-99E4-47AE-8608-6D470325E81C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F74F8F5-99E4-47AE-8608-6D470325E81C}.Debug|x64.ActiveCfg = Debug|Any CPU - {1F74F8F5-99E4-47AE-8608-6D470325E81C}.Debug|x64.Build.0 = Debug|Any CPU - {1F74F8F5-99E4-47AE-8608-6D470325E81C}.Debug|x86.ActiveCfg = Debug|Any CPU - {1F74F8F5-99E4-47AE-8608-6D470325E81C}.Debug|x86.Build.0 = Debug|Any CPU - {1F74F8F5-99E4-47AE-8608-6D470325E81C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F74F8F5-99E4-47AE-8608-6D470325E81C}.Release|Any CPU.Build.0 = Release|Any CPU - {1F74F8F5-99E4-47AE-8608-6D470325E81C}.Release|x64.ActiveCfg = Release|Any CPU - {1F74F8F5-99E4-47AE-8608-6D470325E81C}.Release|x64.Build.0 = Release|Any CPU - {1F74F8F5-99E4-47AE-8608-6D470325E81C}.Release|x86.ActiveCfg = Release|Any CPU - {1F74F8F5-99E4-47AE-8608-6D470325E81C}.Release|x86.Build.0 = Release|Any CPU - {8651DEEB-0291-4E49-92AA-3B097DAF9D37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8651DEEB-0291-4E49-92AA-3B097DAF9D37}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8651DEEB-0291-4E49-92AA-3B097DAF9D37}.Debug|x64.ActiveCfg = Debug|Any CPU - {8651DEEB-0291-4E49-92AA-3B097DAF9D37}.Debug|x64.Build.0 = Debug|Any CPU - {8651DEEB-0291-4E49-92AA-3B097DAF9D37}.Debug|x86.ActiveCfg = Debug|Any CPU - {8651DEEB-0291-4E49-92AA-3B097DAF9D37}.Debug|x86.Build.0 = Debug|Any CPU - {8651DEEB-0291-4E49-92AA-3B097DAF9D37}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8651DEEB-0291-4E49-92AA-3B097DAF9D37}.Release|Any CPU.Build.0 = Release|Any CPU - {8651DEEB-0291-4E49-92AA-3B097DAF9D37}.Release|x64.ActiveCfg = Release|Any CPU - {8651DEEB-0291-4E49-92AA-3B097DAF9D37}.Release|x64.Build.0 = Release|Any CPU - {8651DEEB-0291-4E49-92AA-3B097DAF9D37}.Release|x86.ActiveCfg = Release|Any CPU - {8651DEEB-0291-4E49-92AA-3B097DAF9D37}.Release|x86.Build.0 = Release|Any CPU - {AB8ED04A-5EBA-42AD-9AB9-8514617B27C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB8ED04A-5EBA-42AD-9AB9-8514617B27C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB8ED04A-5EBA-42AD-9AB9-8514617B27C8}.Debug|x64.ActiveCfg = Debug|Any CPU - {AB8ED04A-5EBA-42AD-9AB9-8514617B27C8}.Debug|x64.Build.0 = Debug|Any CPU - {AB8ED04A-5EBA-42AD-9AB9-8514617B27C8}.Debug|x86.ActiveCfg = Debug|Any CPU - {AB8ED04A-5EBA-42AD-9AB9-8514617B27C8}.Debug|x86.Build.0 = Debug|Any CPU - {AB8ED04A-5EBA-42AD-9AB9-8514617B27C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB8ED04A-5EBA-42AD-9AB9-8514617B27C8}.Release|Any CPU.Build.0 = Release|Any CPU - {AB8ED04A-5EBA-42AD-9AB9-8514617B27C8}.Release|x64.ActiveCfg = Release|Any CPU - {AB8ED04A-5EBA-42AD-9AB9-8514617B27C8}.Release|x64.Build.0 = Release|Any CPU - {AB8ED04A-5EBA-42AD-9AB9-8514617B27C8}.Release|x86.ActiveCfg = Release|Any CPU - {AB8ED04A-5EBA-42AD-9AB9-8514617B27C8}.Release|x86.Build.0 = Release|Any CPU - {F7C1932C-49E3-4869-A123-8184534AD1E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F7C1932C-49E3-4869-A123-8184534AD1E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F7C1932C-49E3-4869-A123-8184534AD1E2}.Debug|x64.ActiveCfg = Debug|Any CPU - {F7C1932C-49E3-4869-A123-8184534AD1E2}.Debug|x64.Build.0 = Debug|Any CPU - {F7C1932C-49E3-4869-A123-8184534AD1E2}.Debug|x86.ActiveCfg = Debug|Any CPU - {F7C1932C-49E3-4869-A123-8184534AD1E2}.Debug|x86.Build.0 = Debug|Any CPU - {F7C1932C-49E3-4869-A123-8184534AD1E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F7C1932C-49E3-4869-A123-8184534AD1E2}.Release|Any CPU.Build.0 = Release|Any CPU - {F7C1932C-49E3-4869-A123-8184534AD1E2}.Release|x64.ActiveCfg = Release|Any CPU - {F7C1932C-49E3-4869-A123-8184534AD1E2}.Release|x64.Build.0 = Release|Any CPU - {F7C1932C-49E3-4869-A123-8184534AD1E2}.Release|x86.ActiveCfg = Release|Any CPU - {F7C1932C-49E3-4869-A123-8184534AD1E2}.Release|x86.Build.0 = Release|Any CPU - {CC3780CC-83CF-415C-A759-E5D0D4A64768}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC3780CC-83CF-415C-A759-E5D0D4A64768}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC3780CC-83CF-415C-A759-E5D0D4A64768}.Debug|x64.ActiveCfg = Debug|Any CPU - {CC3780CC-83CF-415C-A759-E5D0D4A64768}.Debug|x64.Build.0 = Debug|Any CPU - {CC3780CC-83CF-415C-A759-E5D0D4A64768}.Debug|x86.ActiveCfg = Debug|Any CPU - {CC3780CC-83CF-415C-A759-E5D0D4A64768}.Debug|x86.Build.0 = Debug|Any CPU - {CC3780CC-83CF-415C-A759-E5D0D4A64768}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC3780CC-83CF-415C-A759-E5D0D4A64768}.Release|Any CPU.Build.0 = Release|Any CPU - {CC3780CC-83CF-415C-A759-E5D0D4A64768}.Release|x64.ActiveCfg = Release|Any CPU - {CC3780CC-83CF-415C-A759-E5D0D4A64768}.Release|x64.Build.0 = Release|Any CPU - {CC3780CC-83CF-415C-A759-E5D0D4A64768}.Release|x86.ActiveCfg = Release|Any CPU - {CC3780CC-83CF-415C-A759-E5D0D4A64768}.Release|x86.Build.0 = Release|Any CPU - {3F3F695B-537E-44DD-93FE-A1D1B88F4589}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3F3F695B-537E-44DD-93FE-A1D1B88F4589}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3F3F695B-537E-44DD-93FE-A1D1B88F4589}.Debug|x64.ActiveCfg = Debug|Any CPU - {3F3F695B-537E-44DD-93FE-A1D1B88F4589}.Debug|x64.Build.0 = Debug|Any CPU - {3F3F695B-537E-44DD-93FE-A1D1B88F4589}.Debug|x86.ActiveCfg = Debug|Any CPU - {3F3F695B-537E-44DD-93FE-A1D1B88F4589}.Debug|x86.Build.0 = Debug|Any CPU - {3F3F695B-537E-44DD-93FE-A1D1B88F4589}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3F3F695B-537E-44DD-93FE-A1D1B88F4589}.Release|Any CPU.Build.0 = Release|Any CPU - {3F3F695B-537E-44DD-93FE-A1D1B88F4589}.Release|x64.ActiveCfg = Release|Any CPU - {3F3F695B-537E-44DD-93FE-A1D1B88F4589}.Release|x64.Build.0 = Release|Any CPU - {3F3F695B-537E-44DD-93FE-A1D1B88F4589}.Release|x86.ActiveCfg = Release|Any CPU - {3F3F695B-537E-44DD-93FE-A1D1B88F4589}.Release|x86.Build.0 = Release|Any CPU - {33D7A35E-A457-42FB-B849-3E752A372D23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {33D7A35E-A457-42FB-B849-3E752A372D23}.Debug|Any CPU.Build.0 = Debug|Any CPU - {33D7A35E-A457-42FB-B849-3E752A372D23}.Debug|x64.ActiveCfg = Debug|Any CPU - {33D7A35E-A457-42FB-B849-3E752A372D23}.Debug|x64.Build.0 = Debug|Any CPU - {33D7A35E-A457-42FB-B849-3E752A372D23}.Debug|x86.ActiveCfg = Debug|Any CPU - {33D7A35E-A457-42FB-B849-3E752A372D23}.Debug|x86.Build.0 = Debug|Any CPU - {33D7A35E-A457-42FB-B849-3E752A372D23}.Release|Any CPU.ActiveCfg = Release|Any CPU - {33D7A35E-A457-42FB-B849-3E752A372D23}.Release|Any CPU.Build.0 = Release|Any CPU - {33D7A35E-A457-42FB-B849-3E752A372D23}.Release|x64.ActiveCfg = Release|Any CPU - {33D7A35E-A457-42FB-B849-3E752A372D23}.Release|x64.Build.0 = Release|Any CPU - {33D7A35E-A457-42FB-B849-3E752A372D23}.Release|x86.ActiveCfg = Release|Any CPU - {33D7A35E-A457-42FB-B849-3E752A372D23}.Release|x86.Build.0 = Release|Any CPU - {3C9F1344-E773-42FF-B98D-BD7277608903}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C9F1344-E773-42FF-B98D-BD7277608903}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C9F1344-E773-42FF-B98D-BD7277608903}.Debug|x64.ActiveCfg = Debug|Any CPU - {3C9F1344-E773-42FF-B98D-BD7277608903}.Debug|x64.Build.0 = Debug|Any CPU - {3C9F1344-E773-42FF-B98D-BD7277608903}.Debug|x86.ActiveCfg = Debug|Any CPU - {3C9F1344-E773-42FF-B98D-BD7277608903}.Debug|x86.Build.0 = Debug|Any CPU - {3C9F1344-E773-42FF-B98D-BD7277608903}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C9F1344-E773-42FF-B98D-BD7277608903}.Release|Any CPU.Build.0 = Release|Any CPU - {3C9F1344-E773-42FF-B98D-BD7277608903}.Release|x64.ActiveCfg = Release|Any CPU - {3C9F1344-E773-42FF-B98D-BD7277608903}.Release|x64.Build.0 = Release|Any CPU - {3C9F1344-E773-42FF-B98D-BD7277608903}.Release|x86.ActiveCfg = Release|Any CPU - {3C9F1344-E773-42FF-B98D-BD7277608903}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF} = {7DAC892E-ADAE-4CEB-8A0C-EDC452A5826A} - {0C92EDA7-492F-4CBA-9F36-61932CA5C1F4} = {7DAC892E-ADAE-4CEB-8A0C-EDC452A5826A} - {578CE255-E412-4CC7-9A03-1EDCA522DA27} = {7DAC892E-ADAE-4CEB-8A0C-EDC452A5826A} - {62BD1600-18A2-400E-94F5-C33BBD67CA97} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {E22B59BD-A658-4E32-9407-C8D9570B9FDF} = {7DAC892E-ADAE-4CEB-8A0C-EDC452A5826A} - {A86924AE-4B77-47A8-A690-EDA395F075A9} = {7DAC892E-ADAE-4CEB-8A0C-EDC452A5826A} - {9FCFAD2A-061E-4FC0-848E-F0E8AA03676D} = {7DAC892E-ADAE-4CEB-8A0C-EDC452A5826A} - {62BD1609-18A2-400E-94F5-C33BBD67CA97} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {D9B16B88-4B85-4208-8F1C-39DFB248250C} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {FCB1B0F2-3067-4FE8-8A98-5EC80F38D534} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {D26D7FC1-3DCD-434C-8261-63FCCEF27278} = {7DAC892E-ADAE-4CEB-8A0C-EDC452A5826A} - {C416006F-FAE9-4263-8290-81B2AA81E024} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B} = {7DAC892E-ADAE-4CEB-8A0C-EDC452A5826A} - {FBEBB725-F645-40DC-856C-D1BC7FB52CF3} = {B794BF86-4185-4DCE-AC86-C27D5D966B9B} - {FC7516FB-7F44-4786-ADF2-589EF06C2EDE} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {15304624-1774-4990-A0CC-7B9DA27A8FF6} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {F8C5BBAA-99E9-46BA-87C9-9FB7F388F403} = {B794BF86-4185-4DCE-AC86-C27D5D966B9B} - {ED5D6873-220B-4F9D-A30B-B99E950F8E26} = {B794BF86-4185-4DCE-AC86-C27D5D966B9B} - {858B2E28-1FF8-4ED2-A356-B576BD793B71} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {B0330A2C-3F10-4C46-97DF-13D187564F70} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {BD758B10-A47F-4159-B9A1-997723AF7349} = {B794BF86-4185-4DCE-AC86-C27D5D966B9B} - {2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {12764D81-61A7-437A-90B6-9F245E43F457} = {B794BF86-4185-4DCE-AC86-C27D5D966B9B} - {B1DDA327-F55E-466A-AF3E-7F039B9B51A9} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {D478568D-CA20-4331-9019-F585B564425E} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {E8B9226E-879F-495A-BDAD-2607844D048C} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {D190251C-5649-4DD6-A158-16D119116352} = {C5186341-2064-49AA-B398-CDF4302D2823} - {43053BC4-32B4-4404-B62D-410F367CE0CE} = {B794BF86-4185-4DCE-AC86-C27D5D966B9B} - {EE8CD472-D8C4-4CD0-BC84-6C305F5971AE} = {43053BC4-32B4-4404-B62D-410F367CE0CE} - {449B9DDA-F18C-411E-9A74-3930652BB78A} = {B794BF86-4185-4DCE-AC86-C27D5D966B9B} - {DFB06A25-719F-4C8B-B84D-55D2D601BEF6} = {3A2D12C2-0455-4471-9EBB-91749BA3A60F} - {1F74F8F5-99E4-47AE-8608-6D470325E81C} = {FF433F83-22C2-46E0-99B3-4FFCA5190A94} - {8651DEEB-0291-4E49-92AA-3B097DAF9D37} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {AB8ED04A-5EBA-42AD-9AB9-8514617B27C8} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {F7C1932C-49E3-4869-A123-8184534AD1E2} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {6EA1A508-6033-4538-BF98-7F71B4E297AD} - EndGlobalSection -EndGlobal diff --git a/test/TemplateEngine/Directory.Build.targets b/test/TemplateEngine/Directory.Build.targets index b3cc1c01ac6a..3a697a273712 100644 --- a/test/TemplateEngine/Directory.Build.targets +++ b/test/TemplateEngine/Directory.Build.targets @@ -2,7 +2,6 @@ - @@ -10,10 +9,6 @@ - - - - From 11c0452223ae5bdae10cb9763fdde278dcc81f2d Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 31 Mar 2026 17:35:19 +0000 Subject: [PATCH 09/48] Address additional review feedback (round 3) - Restore all original projects in TemplateEngine.slnf that were inadvertently removed (Win32.Msi, NativeWrapper, SdkResolver, TemplateLocator.Tests) - Add template_feed/Microsoft.TemplateEngine.Authoring.Templates to slnf - Add TODO comments for migrating NetFrameworkMinimum to NetFrameworkToolCurrent in both src and test Directory.Build.props --- TemplateEngine.slnf | 5 +++++ src/TemplateEngine/Directory.Build.props | 2 +- test/TemplateEngine/Directory.Build.props | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/TemplateEngine.slnf b/TemplateEngine.slnf index 6dd116c4b80e..1ac57a034c69 100644 --- a/TemplateEngine.slnf +++ b/TemplateEngine.slnf @@ -9,6 +9,9 @@ "src\\Cli\\Microsoft.TemplateEngine.Cli\\Microsoft.TemplateEngine.Cli.csproj", "src\\Cli\\dotnet\\dotnet.csproj", "src\\Microsoft.DotNet.TemplateLocator\\Microsoft.DotNet.TemplateLocator.csproj", + "src\\Microsoft.Win32.Msi\\Microsoft.Win32.Msi.csproj", + "src\\Resolvers\\Microsoft.DotNet.NativeWrapper\\Microsoft.DotNet.NativeWrapper.csproj", + "src\\Resolvers\\Microsoft.DotNet.SdkResolver\\Microsoft.DotNet.SdkResolver.csproj", "src\\TemplateEngine\\Microsoft.TemplateEngine.Abstractions\\Microsoft.TemplateEngine.Abstractions.csproj", "src\\TemplateEngine\\Microsoft.TemplateEngine.Core.Contracts\\Microsoft.TemplateEngine.Core.Contracts.csproj", "src\\TemplateEngine\\Microsoft.TemplateEngine.Core\\Microsoft.TemplateEngine.Core.csproj", @@ -27,6 +30,8 @@ "src\\TemplateEngine\\Tools\\Microsoft.TemplateSearch.TemplateDiscovery\\Microsoft.TemplateSearch.TemplateDiscovery.csproj", "template_feed\\Microsoft.DotNet.Common.ItemTemplates\\Microsoft.DotNet.Common.ItemTemplates.csproj", "template_feed\\Microsoft.DotNet.Common.ProjectTemplates.11.0\\Microsoft.DotNet.Common.ProjectTemplates.11.0.csproj", + "template_feed\\Microsoft.TemplateEngine.Authoring.Templates\\Microsoft.TemplateEngine.Authoring.Templates.csproj", + "test\\Microsoft.DotNet.TemplateLocator.Tests\\Microsoft.DotNet.TemplateLocator.Tests.csproj", "test\\Microsoft.NET.TestFramework\\Microsoft.NET.TestFramework.csproj", "test\\Microsoft.TemplateEngine.Cli.UnitTests\\Microsoft.TemplateEngine.Cli.UnitTests.csproj", "test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests\\Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj", diff --git a/src/TemplateEngine/Directory.Build.props b/src/TemplateEngine/Directory.Build.props index ab99a56dd0ab..c83fbb824d2e 100644 --- a/src/TemplateEngine/Directory.Build.props +++ b/src/TemplateEngine/Directory.Build.props @@ -10,7 +10,7 @@ $(NoWarn);NU5105;NU5128;NU5100;NU5118;0419;0649;RS0016;RS0041 - + net472 diff --git a/test/TemplateEngine/Directory.Build.props b/test/TemplateEngine/Directory.Build.props index 0d7dc3d448fd..671b0dd860b7 100644 --- a/test/TemplateEngine/Directory.Build.props +++ b/test/TemplateEngine/Directory.Build.props @@ -3,7 +3,7 @@ - + net472 From dba64a1ef4d74aad6d030c186b724a436b37d2e4 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 31 Mar 2026 17:39:15 +0000 Subject: [PATCH 10/48] Define TemplateEngineTestRoot property and update references Add TemplateEngineTestRoot property in Directory.Build.props pointing to test\TemplateEngine\. Replace all test/TemplateEngine/ references in csproj files with for consistency with the pattern used for source projects. --- Directory.Build.props | 1 + ...emplateEngine.Authoring.TemplateApiVerifier.XunitV3.csproj | 2 +- ...rosoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj | 2 +- .../Microsoft.TemplateSearch.TemplateDiscovery.csproj | 2 +- ...osoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj | 4 ++-- .../Microsoft.TemplateEngine.Authoring.CLI.UnitTests.csproj | 2 +- ...oft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj | 2 +- ...Authoring.TemplateVerifier.IntegrationTests.XunitV3.csproj | 4 ++-- ...eEngine.Authoring.TemplateVerifier.IntegrationTests.csproj | 4 ++-- ...Engine.Authoring.TemplateVerifier.UnitTests.XunitV3.csproj | 2 +- ...TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj | 2 +- ...TemplateEngine.Authoring.Templates.IntegrationTests.csproj | 2 +- .../Microsoft.TemplateEngine.Core.UnitTests.csproj | 4 ++-- .../Microsoft.TemplateEngine.Edge.UnitTests.csproj | 4 ++-- .../Microsoft.TemplateEngine.IDE.IntegrationTests.csproj | 4 ++-- ...plateEngine.Orchestrator.RunnableProjects.UnitTests.csproj | 4 ++-- ...oft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj | 2 +- .../Microsoft.TemplateEngine.Utils.UnitTests.csproj | 4 ++-- .../Microsoft.TemplateSearch.Common.UnitTests.csproj | 4 ++-- ...t.TemplateSearch.TemplateDiscovery.IntegrationTests.csproj | 2 +- 20 files changed, 29 insertions(+), 28 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index a1821cfccd39..19e721f42d3e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -48,6 +48,7 @@ $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src')) $(MSBuildThisFileDirectory)src\TemplateEngine\ + $(MSBuildThisFileDirectory)test\TemplateEngine\ $(MSBuildThisFileDirectory)template_feed\ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'redist', '$(Configuration)')) $([MSBuild]::NormalizeDirectory('$(TestHostFolder)', 'dotnet')) diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3.csproj b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3.csproj index cd09b8486bf9..b181151fe9b1 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3.csproj +++ b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj index 46d739053a71..e9d1a9982147 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj +++ b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj @@ -4,7 +4,7 @@ - + diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj b/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj index 7317141b0592..8748d04e00b1 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj +++ b/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj @@ -21,7 +21,7 @@ - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj index cf4cbbac468b..ab1ac1fec340 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.UnitTests/Microsoft.TemplateEngine.Authoring.CLI.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.UnitTests/Microsoft.TemplateEngine.Authoring.CLI.UnitTests.csproj index e78b9edeb57d..9fb621064ad0 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.UnitTests/Microsoft.TemplateEngine.Authoring.CLI.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.UnitTests/Microsoft.TemplateEngine.Authoring.CLI.UnitTests.csproj @@ -6,7 +6,7 @@ - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj index b80bfe2c5276..80ce682da337 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj @@ -17,7 +17,7 @@ - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3.csproj index 6ba0bdcbfd8c..7cc79041332c 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj index 9d1f6d8b4338..43f1e9255f61 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj @@ -4,8 +4,8 @@ - - + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3.csproj index ce2b49e879e1..460bf49a0449 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3.csproj @@ -13,7 +13,7 @@ - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj index 037eef1a3f20..783351f7aefb 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj @@ -4,7 +4,7 @@ - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests.csproj index bbf7cd56c752..1abf335de519 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests.csproj @@ -6,7 +6,7 @@ - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Core.UnitTests/Microsoft.TemplateEngine.Core.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Core.UnitTests/Microsoft.TemplateEngine.Core.UnitTests.csproj index ed179da9e10f..1c9cb7fde4a9 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Core.UnitTests/Microsoft.TemplateEngine.Core.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Core.UnitTests/Microsoft.TemplateEngine.Core.UnitTests.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Edge.UnitTests/Microsoft.TemplateEngine.Edge.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Edge.UnitTests/Microsoft.TemplateEngine.Edge.UnitTests.csproj index 78578526b7e1..9b183126e0fe 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Edge.UnitTests/Microsoft.TemplateEngine.Edge.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Edge.UnitTests/Microsoft.TemplateEngine.Edge.UnitTests.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/Microsoft.TemplateEngine.IDE.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/Microsoft.TemplateEngine.IDE.IntegrationTests.csproj index 7fb99c00f687..624700d018ae 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/Microsoft.TemplateEngine.IDE.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/Microsoft.TemplateEngine.IDE.IntegrationTests.csproj @@ -14,8 +14,8 @@ - - + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj index 0546d5ad377a..88caeca1cc5b 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj @@ -24,8 +24,8 @@ - - + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj index 6fe3f920996a..2ed5003578f9 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj @@ -6,7 +6,7 @@ - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/Microsoft.TemplateEngine.Utils.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/Microsoft.TemplateEngine.Utils.UnitTests.csproj index 001731dfe8f3..ba89aa0b01f4 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/Microsoft.TemplateEngine.Utils.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/Microsoft.TemplateEngine.Utils.UnitTests.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/test/TemplateEngine/Microsoft.TemplateSearch.Common.UnitTests/Microsoft.TemplateSearch.Common.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateSearch.Common.UnitTests/Microsoft.TemplateSearch.Common.UnitTests.csproj index 5e9f06b4fcdb..d512160c8b50 100644 --- a/test/TemplateEngine/Microsoft.TemplateSearch.Common.UnitTests/Microsoft.TemplateSearch.Common.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateSearch.Common.UnitTests/Microsoft.TemplateSearch.Common.UnitTests.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/test/TemplateEngine/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests.csproj index eb91a8acd171..99317ddbffd7 100644 --- a/test/TemplateEngine/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests.csproj @@ -6,7 +6,7 @@ - + From 16cf348759afa00606183b09bfc1bf57f852f34c Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 31 Mar 2026 17:48:08 +0000 Subject: [PATCH 11/48] Use TemplateEngineTestRoot in SDK test project references Replace relative paths (..\TemplateEngine\...) with in dotnet-new.IntegrationTests, dotnet.Tests, and Cli.UnitTests for consistency with TE-internal project references. --- .../Microsoft.TemplateEngine.Cli.UnitTests.csproj | 4 ++-- .../dotnet-new.IntegrationTests.csproj | 2 +- test/dotnet.Tests/dotnet.Tests.csproj | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj b/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj index e52bd95c98c1..9a88f0bb16d8 100644 --- a/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj +++ b/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj b/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj index 8a52e580284e..778525b000e3 100644 --- a/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj +++ b/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj @@ -15,7 +15,7 @@ - + diff --git a/test/dotnet.Tests/dotnet.Tests.csproj b/test/dotnet.Tests/dotnet.Tests.csproj index fca04c8e3fb6..8504953edcc8 100644 --- a/test/dotnet.Tests/dotnet.Tests.csproj +++ b/test/dotnet.Tests/dotnet.Tests.csproj @@ -89,8 +89,8 @@ - - + + From cb36c781601faa472d530ee6cd187a8e98368b25 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 31 Mar 2026 18:23:16 +0000 Subject: [PATCH 12/48] Fix Helix test infrastructure for TemplateEngine - Add Directory.Build.props/targets in test_templates/ to opt out of CPM (test templates are test assets with hardcoded PackageReference versions) - Fix TemplateEngineTestAssets paths in UnitTests.proj to include the TemplateEngine/ subdirectory prefix --- .../test_templates/Directory.Build.props | 5 +++++ .../test_templates/Directory.Build.targets | 1 + test/UnitTests.proj | 6 +++--- 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Directory.Build.props create mode 100644 test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Directory.Build.targets diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Directory.Build.props b/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Directory.Build.props new file mode 100644 index 000000000000..5f9708a97f38 --- /dev/null +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Directory.Build.props @@ -0,0 +1,5 @@ + + + false + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Directory.Build.targets b/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Directory.Build.targets new file mode 100644 index 000000000000..058246e40862 --- /dev/null +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Directory.Build.targets @@ -0,0 +1 @@ + diff --git a/test/UnitTests.proj b/test/UnitTests.proj index 6d6e8a8120df..a3167b5d7556 100644 --- a/test/UnitTests.proj +++ b/test/UnitTests.proj @@ -94,9 +94,9 @@ - - - + + + From f76ef2264cf31088e3d87549e9b211cd4a261788 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 2 Apr 2026 22:12:48 +0000 Subject: [PATCH 13/48] Misc cleanup --- Directory.Build.props | 1 - src/TemplateEngine/.editorconfig | 2 -- src/TemplateEngine/Directory.Build.props | 10 ++++++++-- test/TemplateEngine/Directory.Build.props | 5 ++++- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 19e721f42d3e..1a346baabf11 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -49,7 +49,6 @@ $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src')) $(MSBuildThisFileDirectory)src\TemplateEngine\ $(MSBuildThisFileDirectory)test\TemplateEngine\ - $(MSBuildThisFileDirectory)template_feed\ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'redist', '$(Configuration)')) $([MSBuild]::NormalizeDirectory('$(TestHostFolder)', 'dotnet')) $(TestHostDotNetRoot)$([System.IO.Path]::GetFileName('$(DotNetTool)')) diff --git a/src/TemplateEngine/.editorconfig b/src/TemplateEngine/.editorconfig index 8389f7ab6958..6302ad145f70 100644 --- a/src/TemplateEngine/.editorconfig +++ b/src/TemplateEngine/.editorconfig @@ -1,6 +1,4 @@ # EditorConfig for TemplateEngine projects -# Migrated from dotnet/templating repo root .editorconfig -# These StyleCop rules were disabled in the original repo [*.cs] # IDE0005: Unnecessary using - TE projects multi-target including net472 which diff --git a/src/TemplateEngine/Directory.Build.props b/src/TemplateEngine/Directory.Build.props index c83fbb824d2e..5ec44e845369 100644 --- a/src/TemplateEngine/Directory.Build.props +++ b/src/TemplateEngine/Directory.Build.props @@ -7,10 +7,16 @@ repo root Directory.Build.props. These apply only to projects under src/TemplateEngine/. --> - + $(NoWarn);NU5105;NU5128;NU5100;NU5118;0419;0649;RS0016;RS0041 - + net472 diff --git a/test/TemplateEngine/Directory.Build.props b/test/TemplateEngine/Directory.Build.props index 671b0dd860b7..81a6438d148b 100644 --- a/test/TemplateEngine/Directory.Build.props +++ b/test/TemplateEngine/Directory.Build.props @@ -3,7 +3,10 @@ - + net472 From e9cc525e1f21afb73946031b5697ba4454b651db Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 2 Apr 2026 22:18:11 +0000 Subject: [PATCH 14/48] Add TemplateEngine projects to source-build solution filter --- source-build.slnf | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/source-build.slnf b/source-build.slnf index f13e70211de0..3f94a5f208e9 100644 --- a/source-build.slnf +++ b/source-build.slnf @@ -43,13 +43,30 @@ "src\\Tasks\\sdk-tasks\\sdk-tasks.csproj", "src\\Tasks\\Microsoft.NET.Build.Extensions.Tasks\\Microsoft.NET.Build.Extensions.Tasks.csproj", "src\\Tasks\\Microsoft.NET.Build.Tasks\\Microsoft.NET.Build.Tasks.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.Abstractions\\Microsoft.TemplateEngine.Abstractions.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.Core\\Microsoft.TemplateEngine.Core.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.Core.Contracts\\Microsoft.TemplateEngine.Core.Contracts.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.Edge\\Microsoft.TemplateEngine.Edge.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.IDE\\Microsoft.TemplateEngine.IDE.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.Orchestrator.RunnableProjects\\Microsoft.TemplateEngine.Orchestrator.RunnableProjects.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.Utils\\Microsoft.TemplateEngine.Utils.csproj", + "src\\TemplateEngine\\Microsoft.TemplateSearch.Common\\Microsoft.TemplateSearch.Common.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.CLI\\Microsoft.TemplateEngine.Authoring.CLI.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.Tasks\\Microsoft.TemplateEngine.Authoring.Tasks.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier\\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3\\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.TemplateVerifier\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.TemplateLocalizer.Core\\Microsoft.TemplateEngine.TemplateLocalizer.Core.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateSearch.TemplateDiscovery\\Microsoft.TemplateSearch.TemplateDiscovery.csproj", "src\\WasmSdk\\Tasks\\Microsoft.NET.Sdk.WebAssembly.Tasks.csproj", "src\\WebSdk\\ProjectSystem\\Tasks\\Microsoft.NET.Sdk.Web.ProjectSystem.Tasks.csproj", "src\\WebSdk\\Publish\\Tasks\\Microsoft.NET.Sdk.Publish.Tasks.csproj", "src\\WebSdk\\Web\\Tasks\\Microsoft.NET.Sdk.Web.Tasks.csproj", "src\\WebSdk\\Worker\\Tasks\\Microsoft.NET.Sdk.Worker.Tasks.csproj", "template_feed\\Microsoft.DotNet.Common.ItemTemplates\\Microsoft.DotNet.Common.ItemTemplates.csproj", - "template_feed\\Microsoft.DotNet.Common.ProjectTemplates.11.0\\Microsoft.DotNet.Common.ProjectTemplates.11.0.csproj" + "template_feed\\Microsoft.DotNet.Common.ProjectTemplates.11.0\\Microsoft.DotNet.Common.ProjectTemplates.11.0.csproj", + "template_feed\\Microsoft.TemplateEngine.Authoring.Templates\\Microsoft.TemplateEngine.Authoring.Templates.csproj" ] } } From 06a92f8296f3f0f9af1ea84b431b2074c0cf7afb Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 3 Apr 2026 14:32:26 +0000 Subject: [PATCH 15/48] Fix TemplateEngine test and build integration issues - Add TemplateEnginePublicKey, DynamicProxyGenAssembly2PublicKey, and Deterministic properties to src/TemplateEngine/Directory.Build.props (brought forward from the templating repo) - Fix MockTemplateInfo obsolete interface properties to return empty collections instead of throwing NotImplementedException, which is incompatible with System.Text.Json serialization --- src/TemplateEngine/Directory.Build.props | 5 +++++ .../Microsoft.TemplateEngine.Mocks/MockTemplateInfo.cs | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/TemplateEngine/Directory.Build.props b/src/TemplateEngine/Directory.Build.props index 5ec44e845369..7f6650b70844 100644 --- a/src/TemplateEngine/Directory.Build.props +++ b/src/TemplateEngine/Directory.Build.props @@ -21,10 +21,15 @@ MicrosoftAspNetCore + 0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb + 0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7 true + + true + true false diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockTemplateInfo.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockTemplateInfo.cs index 073b2f25524a..1bc6265b2a69 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockTemplateInfo.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockTemplateInfo.cs @@ -92,10 +92,12 @@ public string ShortName public bool PreferDefaultName => _preferDefaultName; [Obsolete("Use ParameterDefinitionSet instead.")] - IReadOnlyDictionary ITemplateInfo.Tags => throw new NotImplementedException(); + [System.Text.Json.Serialization.JsonIgnore] + IReadOnlyDictionary ITemplateInfo.Tags => new Dictionary(); [Obsolete("Use ParameterDefinitionSet instead.")] - IReadOnlyDictionary ITemplateInfo.CacheParameters => throw new NotImplementedException(); + [System.Text.Json.Serialization.JsonIgnore] + IReadOnlyDictionary ITemplateInfo.CacheParameters => new Dictionary(); public IParameterDefinitionSet ParameterDefinitions { From 619e779d743044ad3767b30a6f2b83182d887dae Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 3 Apr 2026 14:43:33 +0000 Subject: [PATCH 16/48] Update verified snapshots for STJ error message changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Newtonsoft → System.Text.Json migration changed the error message format when parsing corrupted JSON settings files. Update the Verify snapshots to match the new STJ exception message. --- ...owError_WhenGlobalSettingsFileIsCorrupted.verified.txt | 2 +- ...owError_WhenGlobalSettingsFileIsCorrupted.verified.txt | 8 ++++---- ...owError_WhenGlobalSettingsFileIsCorrupted.verified.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanShowError_WhenGlobalSettingsFileIsCorrupted.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanShowError_WhenGlobalSettingsFileIsCorrupted.verified.txt index efb0d71614ce..8ba4791cd09a 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanShowError_WhenGlobalSettingsFileIsCorrupted.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanShowError_WhenGlobalSettingsFileIsCorrupted.verified.txt @@ -2,4 +2,4 @@ %TEMPLATE FOLDER% Error: Failed to retrieve template packages from provider 'Global Settings'. -Details: Failed to read installed template packages list at %GLOBAL SETTINGS FILE%. It might be due to the file is corrupted. Please review this file manually and fix the errors in JSON structure, or remove the file to clear up the list of list installed packages and reinstall them again. Details of the error: Error reading JObject from JsonReader. Path '', line 0, position 0.. \ No newline at end of file +Details: Failed to read installed template packages list at %GLOBAL SETTINGS FILE%. It might be due to the file is corrupted. Please review this file manually and fix the errors in JSON structure, or remove the file to clear up the list of list installed packages and reinstall them again. Details of the error: The input does not contain any JSON tokens. Expected the input to start with a valid JSON token, when isFinalBlock is true. LineNumber: 0 | BytePositionInLine: 0.. \ No newline at end of file diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewUninstallTests.CanShowError_WhenGlobalSettingsFileIsCorrupted.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewUninstallTests.CanShowError_WhenGlobalSettingsFileIsCorrupted.verified.txt index 95634a7b3d2d..0eadd49b9e40 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewUninstallTests.CanShowError_WhenGlobalSettingsFileIsCorrupted.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewUninstallTests.CanShowError_WhenGlobalSettingsFileIsCorrupted.verified.txt @@ -1,8 +1,8 @@ Error: Failed to retrieve template packages from provider 'Global Settings'. -Details: Failed to read installed template packages list at %GLOBAL SETTINGS FILE%. It might be due to the file is corrupted. Please review this file manually and fix the errors in JSON structure, or remove the file to clear up the list of list installed packages and reinstall them again. Details of the error: Error reading JObject from JsonReader. Path '', line 0, position 0.. +Details: Failed to read installed template packages list at %GLOBAL SETTINGS FILE%. It might be due to the file is corrupted. Please review this file manually and fix the errors in JSON structure, or remove the file to clear up the list of list installed packages and reinstall them again. Details of the error: The input does not contain any JSON tokens. Expected the input to start with a valid JSON token, when isFinalBlock is true. LineNumber: 0 | BytePositionInLine: 0.. Error: Failed to retrieve template packages from provider 'Global Settings'. -Details: Failed to read installed template packages list at %GLOBAL SETTINGS FILE%. It might be due to the file is corrupted. Please review this file manually and fix the errors in JSON structure, or remove the file to clear up the list of list installed packages and reinstall them again. Details of the error: Error reading JObject from JsonReader. Path '', line 0, position 0.. +Details: Failed to read installed template packages list at %GLOBAL SETTINGS FILE%. It might be due to the file is corrupted. Please review this file manually and fix the errors in JSON structure, or remove the file to clear up the list of list installed packages and reinstall them again. Details of the error: The input does not contain any JSON tokens. Expected the input to start with a valid JSON token, when isFinalBlock is true. LineNumber: 0 | BytePositionInLine: 0.. Error: Failed to retrieve template packages from provider 'Global Settings'. -Details: Failed to read installed template packages list at %GLOBAL SETTINGS FILE%. It might be due to the file is corrupted. Please review this file manually and fix the errors in JSON structure, or remove the file to clear up the list of list installed packages and reinstall them again. Details of the error: Error reading JObject from JsonReader. Path '', line 0, position 0.. +Details: Failed to read installed template packages list at %GLOBAL SETTINGS FILE%. It might be due to the file is corrupted. Please review this file manually and fix the errors in JSON structure, or remove the file to clear up the list of list installed packages and reinstall them again. Details of the error: The input does not contain any JSON tokens. Expected the input to start with a valid JSON token, when isFinalBlock is true. LineNumber: 0 | BytePositionInLine: 0.. Error: Failed to retrieve template packages from provider 'Global Settings'. -Details: Failed to read installed template packages list at %GLOBAL SETTINGS FILE%. It might be due to the file is corrupted. Please review this file manually and fix the errors in JSON structure, or remove the file to clear up the list of list installed packages and reinstall them again. Details of the error: Error reading JObject from JsonReader. Path '', line 0, position 0.. \ No newline at end of file +Details: Failed to read installed template packages list at %GLOBAL SETTINGS FILE%. It might be due to the file is corrupted. Please review this file manually and fix the errors in JSON structure, or remove the file to clear up the list of list installed packages and reinstall them again. Details of the error: The input does not contain any JSON tokens. Expected the input to start with a valid JSON token, when isFinalBlock is true. LineNumber: 0 | BytePositionInLine: 0.. \ No newline at end of file diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewUpdateTests.CanShowError_WhenGlobalSettingsFileIsCorrupted.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewUpdateTests.CanShowError_WhenGlobalSettingsFileIsCorrupted.verified.txt index ce8cca3ddbd8..1206d6c9757f 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewUpdateTests.CanShowError_WhenGlobalSettingsFileIsCorrupted.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewUpdateTests.CanShowError_WhenGlobalSettingsFileIsCorrupted.verified.txt @@ -1 +1 @@ -Error: Failed to retrieve template packages from provider 'Global Settings'.Details: Failed to read installed template packages list at %GLOBAL SETTINGS FILE%. It might be due to the file is corrupted. Please review this file manually and fix the errors in JSON structure, or remove the file to clear up the list of list installed packages and reinstall them again. Details of the error: Error reading JObject from JsonReader. Path '', line 0, position 0..Error: Failed to retrieve template packages from provider 'Global Settings'.Details: Failed to read installed template packages list at %GLOBAL SETTINGS FILE%. It might be due to the file is corrupted. Please review this file manually and fix the errors in JSON structure, or remove the file to clear up the list of list installed packages and reinstall them again. Details of the error: Error reading JObject from JsonReader. Path '', line 0, position 0.. \ No newline at end of file +Error: Failed to retrieve template packages from provider 'Global Settings'.Details: Failed to read installed template packages list at %GLOBAL SETTINGS FILE%. It might be due to the file is corrupted. Please review this file manually and fix the errors in JSON structure, or remove the file to clear up the list of list installed packages and reinstall them again. Details of the error: The input does not contain any JSON tokens. Expected the input to start with a valid JSON token, when isFinalBlock is true. LineNumber: 0 | BytePositionInLine: 0..Error: Failed to retrieve template packages from provider 'Global Settings'.Details: Failed to read installed template packages list at %GLOBAL SETTINGS FILE%. It might be due to the file is corrupted. Please review this file manually and fix the errors in JSON structure, or remove the file to clear up the list of list installed packages and reinstall them again. Details of the error: The input does not contain any JSON tokens. Expected the input to start with a valid JSON token, when isFinalBlock is true. LineNumber: 0 | BytePositionInLine: 0.. \ No newline at end of file From 4d7495bdc8aa8f854213b5e19de3bdd79dea88bd Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 3 Apr 2026 19:08:33 +0000 Subject: [PATCH 17/48] Deploy TemplateEngine test assets to separate Helix directory The Helix layout was copying TemplateEngine test templates into TestAssets/TestPackages/dotnet-new/, overwriting the SDK's standalone Microsoft.TemplateEngine.TestTemplates.csproj (which has net6.0 hardcoded) with the TemplateEngine version (which uses $(NetCurrent)). On Helix, $(NetCurrent) is undefined, causing dotnet pack to fail with NETSDK1013. Move TemplateEngine test assets to their own TestAssets/TestPackages/ TemplateEngine/ directory in the Helix payload to avoid clobbering the SDK's dotnet-new test assets. --- test/UnitTests.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/UnitTests.proj b/test/UnitTests.proj index a3167b5d7556..bb46c189e1ed 100644 --- a/test/UnitTests.proj +++ b/test/UnitTests.proj @@ -137,7 +137,7 @@ - + From 06d70f0125d78aceb6156033a652233f299e7d60 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 7 Apr 2026 00:14:57 +0000 Subject: [PATCH 18/48] Remove XunitV3 variant projects now that xunit v3 migration is complete The following projects were duplicated with XunitV3 suffixes to support xunit v3 testing while the main codebase was still on xunit v2. Now that the xunit v3 migration is complete, the originals are v3 and these variants are redundant: - Microsoft.TemplateEngine.Mocks.XunitV3 - Microsoft.TemplateEngine.TestHelper.XunitV3 - Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3 - Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3 - Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3 - Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3 Verified no other repos in the VMR reference the v2 variants. --- Directory.Packages.props | 3 - TemplateEngine.slnf | 4 - eng/Version.Details.props | 6 - sdk.slnx | 4 - source-build.slnf | 2 - ...thoring.TemplateApiVerifier.XunitV3.csproj | 30 ----- ....Authoring.TemplateVerifier.XunitV3.csproj | 31 ----- ...ne.Authoring.TemplateVerifier.Shared.props | 2 - ...teVerifier.IntegrationTests.XunitV3.csproj | 27 ----- ....TemplateVerifier.UnitTests.XunitV3.csproj | 25 ----- ...rosoft.TemplateEngine.Mocks.XunitV3.csproj | 17 --- ...t.TemplateEngine.TestHelper.XunitV3.csproj | 17 --- .../PublicAPI.Shipped.txt | 1 - .../PublicAPI.Unshipped.txt | 106 ------------------ test/UnitTests.proj | 4 +- 15 files changed, 2 insertions(+), 277 deletions(-) delete mode 100644 src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3.csproj delete mode 100644 src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3.csproj delete mode 100644 test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3.csproj delete mode 100644 test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3.csproj delete mode 100644 test/TemplateEngine/Microsoft.TemplateEngine.Mocks.XunitV3/Microsoft.TemplateEngine.Mocks.XunitV3.csproj delete mode 100644 test/TemplateEngine/Microsoft.TemplateEngine.TestHelper.XunitV3/Microsoft.TemplateEngine.TestHelper.XunitV3.csproj delete mode 100644 test/TemplateEngine/Microsoft.TemplateEngine.TestHelper.XunitV3/PublicAPI.Shipped.txt delete mode 100644 test/TemplateEngine/Microsoft.TemplateEngine.TestHelper.XunitV3/PublicAPI.Unshipped.txt diff --git a/Directory.Packages.props b/Directory.Packages.props index a750cf44c019..5e0bad16b144 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -77,11 +77,8 @@ - - - diff --git a/TemplateEngine.slnf b/TemplateEngine.slnf index 1ac57a034c69..689af3753dd1 100644 --- a/TemplateEngine.slnf +++ b/TemplateEngine.slnf @@ -22,9 +22,7 @@ "src\\TemplateEngine\\Microsoft.TemplateSearch.Common\\Microsoft.TemplateSearch.Common.csproj", "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.CLI\\Microsoft.TemplateEngine.Authoring.CLI.csproj", "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.Tasks\\Microsoft.TemplateEngine.Authoring.Tasks.csproj", - "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3\\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3.csproj", "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier\\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj", - "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3.csproj", "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.TemplateVerifier\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.csproj", "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.TemplateLocalizer.Core\\Microsoft.TemplateEngine.TemplateLocalizer.Core.csproj", "src\\TemplateEngine\\Tools\\Microsoft.TemplateSearch.TemplateDiscovery\\Microsoft.TemplateSearch.TemplateDiscovery.csproj", @@ -37,9 +35,7 @@ "test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests\\Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj", "test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.CLI.UnitTests\\Microsoft.TemplateEngine.Authoring.CLI.UnitTests.csproj", "test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests\\Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj", - "test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3.csproj", "test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj", - "test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3.csproj", "test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj", "test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests\\Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests.csproj", "test\\TemplateEngine\\Microsoft.TemplateEngine.Core.UnitTests\\Microsoft.TemplateEngine.Core.UnitTests.csproj", diff --git a/eng/Version.Details.props b/eng/Version.Details.props index ac7cea426718..f82b14a1448c 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -91,11 +91,8 @@ This file should be imported by eng/Versions.props 11.0.100-preview.4.26203.108 11.0.100-preview.4.26203.108 11.0.100-preview.4.26203.108 - 11.0.100-preview.4.26203.108 11.0.100-preview.4.26203.108 - 11.0.100-preview.4.26203.108 11.0.100-preview.4.26203.108 - 11.0.100-preview.4.26203.108 11.0.100-preview.4.26203.108 11.0.100-preview.4.26203.108 11.0.100-preview.4.26203.108 @@ -235,11 +232,8 @@ This file should be imported by eng/Versions.props $(MicrosoftSourceLinkGitHubPackageVersion) $(MicrosoftSourceLinkGitLabPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - $(MicrosoftTemplateEngineAuthoringTemplateVerifierXunitV3PackageVersion) $(MicrosoftTemplateEngineEdgePackageVersion) - $(MicrosoftTemplateEngineMocksXunitV3PackageVersion) $(MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion) - $(MicrosoftTemplateEngineTestHelperXunitV3PackageVersion) $(MicrosoftTemplateEngineUtilsPackageVersion) $(MicrosoftTemplateSearchCommonPackageVersion) $(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion) diff --git a/sdk.slnx b/sdk.slnx index 4e4fd36f1945..2226defcda03 100644 --- a/sdk.slnx +++ b/sdk.slnx @@ -326,9 +326,7 @@ - - @@ -387,9 +385,7 @@ - - diff --git a/source-build.slnf b/source-build.slnf index bd8d12726b87..9eff857ad022 100644 --- a/source-build.slnf +++ b/source-build.slnf @@ -54,9 +54,7 @@ "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.CLI\\Microsoft.TemplateEngine.Authoring.CLI.csproj", "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.Tasks\\Microsoft.TemplateEngine.Authoring.Tasks.csproj", "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier\\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj", - "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3\\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3.csproj", "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.TemplateVerifier\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.csproj", - "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3.csproj", "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.TemplateLocalizer.Core\\Microsoft.TemplateEngine.TemplateLocalizer.Core.csproj", "src\\TemplateEngine\\Tools\\Microsoft.TemplateSearch.TemplateDiscovery\\Microsoft.TemplateSearch.TemplateDiscovery.csproj", "src\\WasmSdk\\Tasks\\Microsoft.NET.Sdk.WebAssembly.Tasks.csproj", diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3.csproj b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3.csproj deleted file mode 100644 index b181151fe9b1..000000000000 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3.csproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - $(DefineConstants);XUNIT_V3 - Microsoft.TemplateEngine.Authoring.TemplateApiVerifier - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3.csproj b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3.csproj deleted file mode 100644 index 9acff6595a3f..000000000000 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3.csproj +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - $(DefineConstants);XUNIT_V3 - Microsoft.TemplateEngine.Authoring.TemplateVerifier - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.Shared.props b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.Shared.props index 98ac392a627f..a80d99807668 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.Shared.props +++ b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.Shared.props @@ -27,9 +27,7 @@ - - diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3.csproj deleted file mode 100644 index 7cc79041332c..000000000000 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3.csproj +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - $(DefineConstants);XUNIT_V3 - - - - - - - - - - - - - - - - - - - - diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3.csproj deleted file mode 100644 index 460bf49a0449..000000000000 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3.csproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - $(DefineConstants);XUNIT_V3 - - - - - - - - - - - - - - - - - - diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks.XunitV3/Microsoft.TemplateEngine.Mocks.XunitV3.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Mocks.XunitV3/Microsoft.TemplateEngine.Mocks.XunitV3.csproj deleted file mode 100644 index 568aa39c5231..000000000000 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks.XunitV3/Microsoft.TemplateEngine.Mocks.XunitV3.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - $(DefineConstants);XUNIT_V3 - - - - - - - - - - - diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper.XunitV3/Microsoft.TemplateEngine.TestHelper.XunitV3.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper.XunitV3/Microsoft.TemplateEngine.TestHelper.XunitV3.csproj deleted file mode 100644 index f5c135afa69a..000000000000 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper.XunitV3/Microsoft.TemplateEngine.TestHelper.XunitV3.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - $(DefineConstants);XUNIT_V3 - - - - - - - - - - - diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper.XunitV3/PublicAPI.Shipped.txt b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper.XunitV3/PublicAPI.Shipped.txt deleted file mode 100644 index 91b0e1a43b98..000000000000 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper.XunitV3/PublicAPI.Shipped.txt +++ /dev/null @@ -1 +0,0 @@ -#nullable enable \ No newline at end of file diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper.XunitV3/PublicAPI.Unshipped.txt b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper.XunitV3/PublicAPI.Unshipped.txt deleted file mode 100644 index 36c9270c3c4e..000000000000 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper.XunitV3/PublicAPI.Unshipped.txt +++ /dev/null @@ -1,106 +0,0 @@ -Microsoft.TemplateEngine.TestHelper.AssemblyComponentCatalog -Microsoft.TemplateEngine.TestHelper.AssemblyComponentCatalog.AssemblyComponentCatalog(System.Collections.Generic.IReadOnlyList! assemblies) -> void -Microsoft.TemplateEngine.TestHelper.AssemblyComponentCatalog.Count.get -> int -Microsoft.TemplateEngine.TestHelper.AssemblyComponentCatalog.GetEnumerator() -> System.Collections.Generic.IEnumerator<(System.Type!, Microsoft.TemplateEngine.Abstractions.IIdentifiedComponent!)>! -Microsoft.TemplateEngine.TestHelper.AssemblyComponentCatalog.this[int index].get -> (System.Type!, Microsoft.TemplateEngine.Abstractions.IIdentifiedComponent!) -Microsoft.TemplateEngine.TestHelper.BuiltInTemplatePackagesProviderFactory -Microsoft.TemplateEngine.TestHelper.BuiltInTemplatePackagesProviderFactory.BuiltInTemplatePackagesProviderFactory(params string![]! pathsToProbe) -> void -Microsoft.TemplateEngine.TestHelper.BuiltInTemplatePackagesProviderFactory.CreateProvider(Microsoft.TemplateEngine.Abstractions.IEngineEnvironmentSettings! settings) -> Microsoft.TemplateEngine.Abstractions.TemplatePackage.ITemplatePackageProvider! -Microsoft.TemplateEngine.TestHelper.BuiltInTemplatePackagesProviderFactory.DisplayName.get -> string! -Microsoft.TemplateEngine.TestHelper.BuiltInTemplatePackagesProviderFactory.Id.get -> System.Guid -Microsoft.TemplateEngine.TestHelper.EnvironmentSettingsHelper -Microsoft.TemplateEngine.TestHelper.EnvironmentSettingsHelper.CreateEnvironment(string? locale = null, bool virtualize = false, string! hostIdentifier = "", bool loadDefaultGenerator = true, Microsoft.TemplateEngine.Abstractions.IEnvironment? environment = null, System.Collections.Generic.IReadOnlyList<(System.Type!, Microsoft.TemplateEngine.Abstractions.IIdentifiedComponent!)>? additionalComponents = null, System.Collections.Generic.IEnumerable? addLoggerProviders = null) -> Microsoft.TemplateEngine.Abstractions.IEngineEnvironmentSettings! -Microsoft.TemplateEngine.TestHelper.EnvironmentSettingsHelper.CreateTemporaryFolder(string! name = "") -> string! -Microsoft.TemplateEngine.TestHelper.EnvironmentSettingsHelper.Dispose() -> void -Microsoft.TemplateEngine.TestHelper.EnvironmentSettingsHelper.EnvironmentSettingsHelper(Xunit.Sdk.IMessageSink! messageSink) -> void -Microsoft.TemplateEngine.TestHelper.InMemoryLoggerProvider -Microsoft.TemplateEngine.TestHelper.InMemoryLoggerProvider.CreateLogger(string! categoryName) -> Microsoft.Extensions.Logging.ILogger! -Microsoft.TemplateEngine.TestHelper.InMemoryLoggerProvider.Dispose() -> void -Microsoft.TemplateEngine.TestHelper.InMemoryLoggerProvider.InMemoryLoggerProvider(System.Collections.Generic.List<(Microsoft.Extensions.Logging.LogLevel, string!)>! messagesCollection) -> void -Microsoft.TemplateEngine.TestHelper.LongRunningConstraintFactory -Microsoft.TemplateEngine.TestHelper.LongRunningConstraintFactory.CreateTemplateConstraintAsync(Microsoft.TemplateEngine.Abstractions.IEngineEnvironmentSettings! environmentSettings, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task! -Microsoft.TemplateEngine.TestHelper.LongRunningConstraintFactory.Id.get -> System.Guid -Microsoft.TemplateEngine.TestHelper.LongRunningConstraintFactory.LongRunningConstraintFactory(string! type, int msDelay) -> void -Microsoft.TemplateEngine.TestHelper.LongRunningConstraintFactory.Type.get -> string! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.CreateDirectory(string! path) -> void -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.CreateFile(string! path) -> System.IO.Stream! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.DirectoriesScanned.get -> System.Collections.Generic.IReadOnlyList! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.DirectoryDelete(string! path, bool recursive) -> void -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.DirectoryExists(string! directory) -> bool -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.DirectoryScanParameters -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.DirectoryScanParameters.DirectoryName.get -> string! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.DirectoryScanParameters.DirectoryScanParameters(string! directoryName, string! pattern, System.IO.SearchOption searchOption) -> void -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.DirectoryScanParameters.Pattern.get -> string! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.DirectoryScanParameters.SearchOption.get -> System.IO.SearchOption -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.EnumerateDirectories(string! path, string! pattern, System.IO.SearchOption searchOption) -> System.Collections.Generic.IEnumerable! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.EnumerateFiles(string! path, string! pattern, System.IO.SearchOption searchOption) -> System.Collections.Generic.IEnumerable! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.EnumerateFileSystemEntries(string! directoryName, string! pattern, System.IO.SearchOption searchOption) -> System.Collections.Generic.IEnumerable! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.FileCopy(string! sourcePath, string! targetPath, bool overwrite) -> void -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.FileDelete(string! path) -> void -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.FileExists(string! file) -> bool -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.FilesOpened.get -> System.Collections.Generic.IEnumerable! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.FilesWatched.get -> System.Collections.Generic.IEnumerable! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.GetCurrentDirectory() -> string! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.GetFileAttributes(string! file) -> System.IO.FileAttributes -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.GetLastWriteTimeUtc(string! file) -> System.DateTime -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.MonitoredFileSystem(Microsoft.TemplateEngine.Abstractions.PhysicalFileSystem.IPhysicalFileSystem! baseFileSystem) -> void -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.OpenRead(string! path) -> System.IO.Stream! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.PathRelativeTo(string! target, string! relativeTo) -> string! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.ReadAllBytes(string! path) -> byte[]! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.ReadAllText(string! path) -> string! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.Reset() -> void -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.SetFileAttributes(string! file, System.IO.FileAttributes attributes) -> void -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.SetLastWriteTimeUtc(string! file, System.DateTime lastWriteTimeUtc) -> void -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.WatchFileChanges(string! filepath, System.IO.FileSystemEventHandler! fileChanged) -> System.IDisposable! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.WriteAllText(string! path, string! value) -> void -Microsoft.TemplateEngine.TestHelper.PackageManager -Microsoft.TemplateEngine.TestHelper.PackageManager.Dispose() -> void -Microsoft.TemplateEngine.TestHelper.PackageManager.GetNuGetPackage(string! templatePackName, string? version = null, NuGet.Versioning.NuGetVersion? minimumVersion = null, NuGet.Common.ILogger? logger = null, string? downloadDirectory = null) -> System.Threading.Tasks.Task! -Microsoft.TemplateEngine.TestHelper.PackageManager.PackageManager() -> void -Microsoft.TemplateEngine.TestHelper.PackageManager.PackNuGetPackage(string! projectPath, NuGet.Common.ILogger? logger = null) -> string! -Microsoft.TemplateEngine.TestHelper.SharedTestOutputHelper -Microsoft.TemplateEngine.TestHelper.SharedTestOutputHelper.Output.get -> string! -Microsoft.TemplateEngine.TestHelper.SharedTestOutputHelper.SharedTestOutputHelper(Xunit.Sdk.IMessageSink! sink) -> void -Microsoft.TemplateEngine.TestHelper.SharedTestOutputHelper.Write(string! format, params object![]! args) -> void -Microsoft.TemplateEngine.TestHelper.SharedTestOutputHelper.Write(string! message) -> void -Microsoft.TemplateEngine.TestHelper.SharedTestOutputHelper.WriteLine(string! format, params object![]! args) -> void -Microsoft.TemplateEngine.TestHelper.SharedTestOutputHelper.WriteLine(string! message) -> void -Microsoft.TemplateEngine.TestHelper.StringExtensions -Microsoft.TemplateEngine.TestHelper.TestConstraintFactory -Microsoft.TemplateEngine.TestHelper.TestConstraintFactory.CreateTemplateConstraintAsync(Microsoft.TemplateEngine.Abstractions.IEngineEnvironmentSettings! environmentSettings, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task! -Microsoft.TemplateEngine.TestHelper.TestConstraintFactory.Id.get -> System.Guid -Microsoft.TemplateEngine.TestHelper.TestConstraintFactory.TestConstraintFactory(string! type) -> void -Microsoft.TemplateEngine.TestHelper.TestConstraintFactory.Type.get -> string! -Microsoft.TemplateEngine.TestHelper.TestFileSystemUtils -Microsoft.TemplateEngine.TestHelper.TestHost -Microsoft.TemplateEngine.TestHelper.TestHost.Dispose() -> void -Microsoft.TemplateEngine.TestHelper.TestHost.HostParamDefaults.get -> System.Collections.Generic.Dictionary! -Microsoft.TemplateEngine.TestHelper.TestHost.HostParamDefaults.set -> void -Microsoft.TemplateEngine.TestHelper.TestLoggerFactory -Microsoft.TemplateEngine.TestHelper.TestLoggerFactory.AddProvider(Microsoft.Extensions.Logging.ILoggerProvider! provider) -> void -Microsoft.TemplateEngine.TestHelper.TestLoggerFactory.CreateLogger() -> Microsoft.Extensions.Logging.ILogger! -Microsoft.TemplateEngine.TestHelper.TestLoggerFactory.CreateLogger(string! categoryName) -> Microsoft.Extensions.Logging.ILogger! -Microsoft.TemplateEngine.TestHelper.TestLoggerFactory.Dispose() -> void -Microsoft.TemplateEngine.TestHelper.TestLoggerFactory.TestLoggerFactory(Xunit.Sdk.IMessageSink? messageSink = null) -> void -Microsoft.TemplateEngine.TestHelper.TestUtils -Microsoft.TemplateEngine.TestHelper.XunitLoggerProvider -Microsoft.TemplateEngine.TestHelper.XunitLoggerProvider.CreateLogger(string! categoryName) -> Microsoft.Extensions.Logging.ILogger! -Microsoft.TemplateEngine.TestHelper.XunitLoggerProvider.Dispose() -> void -Microsoft.TemplateEngine.TestHelper.XunitLoggerProvider.XunitLoggerProvider(Xunit.ITestOutputHelper! output) -> void -Microsoft.TemplateEngine.TestHelper.XunitLoggerProvider.XunitLoggerProvider(Xunit.ITestOutputHelper! output, Microsoft.Extensions.Logging.LogLevel minLevel) -> void -Microsoft.TemplateEngine.TestHelper.XunitLoggerProvider.XunitLoggerProvider(Xunit.ITestOutputHelper! output, Microsoft.Extensions.Logging.LogLevel minLevel, System.DateTimeOffset? logStart) -> void -static Microsoft.TemplateEngine.TestHelper.BuiltInTemplatePackagesProviderFactory.GetComponents(params string![]! pathsToProbe) -> System.Collections.Generic.List<(System.Type!, Microsoft.TemplateEngine.Abstractions.IIdentifiedComponent!)>! -static Microsoft.TemplateEngine.TestHelper.StringExtensions.UnixifyLineBreaks(this string! input) -> string! -static Microsoft.TemplateEngine.TestHelper.TestFileSystemUtils.GetTempVirtualizedPath(this Microsoft.TemplateEngine.Abstractions.IEngineEnvironmentSettings! environmentSettings) -> string! -static Microsoft.TemplateEngine.TestHelper.TestFileSystemUtils.MountPath(this Microsoft.TemplateEngine.Abstractions.IEngineEnvironmentSettings! environmentSettings, string! sourceBasePath) -> Microsoft.TemplateEngine.Abstractions.Mount.IMountPoint! -static Microsoft.TemplateEngine.TestHelper.TestFileSystemUtils.WriteFile(this Microsoft.TemplateEngine.Abstractions.IEngineEnvironmentSettings! environmentSettings, string! filePath, string? fileContent) -> void -static Microsoft.TemplateEngine.TestHelper.TestFileSystemUtils.WriteTemplateSource(this Microsoft.TemplateEngine.Abstractions.IEngineEnvironmentSettings! environmentSettings, string! sourceBasePath, System.Collections.Generic.IDictionary! templateSourceFileNamesWithContent) -> void -static Microsoft.TemplateEngine.TestHelper.TestHost.GetVirtualHost(string! hostIdentifier = "", Microsoft.TemplateEngine.Abstractions.IEnvironment? environment = null, System.Collections.Generic.IReadOnlyList<(System.Type!, Microsoft.TemplateEngine.Abstractions.IIdentifiedComponent!)>? additionalComponents = null, System.Collections.Generic.IReadOnlyDictionary? defaultParameters = null) -> Microsoft.TemplateEngine.Abstractions.ITemplateEngineHost! -static Microsoft.TemplateEngine.TestHelper.TestUtils.AttemptSearch(int count, System.TimeSpan interval, System.Func!>! execute) -> System.Threading.Tasks.Task! -static Microsoft.TemplateEngine.TestHelper.TestUtils.CompareFiles(string! file1, string! file2) -> bool -static Microsoft.TemplateEngine.TestHelper.TestUtils.CreateTemporaryFolder(string! name = "") -> string! -static Microsoft.TemplateEngine.TestHelper.TestUtils.DirectoryCopy(string! sourceDirName, string! destDirName, bool copySubDirs) -> void -static Microsoft.TemplateEngine.TestHelper.TestUtils.SetupNuGetConfigForPackagesLocation(string! projectDirectory, string! packagesLocation) -> void -static readonly Microsoft.TemplateEngine.TestHelper.BuiltInTemplatePackagesProviderFactory.FactoryId -> System.Guid -static readonly Microsoft.TemplateEngine.TestHelper.TestFileSystemUtils.DefaultConfigRelativePath -> string! \ No newline at end of file diff --git a/test/UnitTests.proj b/test/UnitTests.proj index c0e881405d62..9dfacdfe2a15 100644 --- a/test/UnitTests.proj +++ b/test/UnitTests.proj @@ -19,11 +19,11 @@ - + - + From f601115523cbab65e9aa6a2de8aa0d3bec1f412e Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 7 Apr 2026 00:42:26 +0000 Subject: [PATCH 19/48] Migrate templating engine projects from xunit v2 to v3 Now that the SDK repo has completed the xunit v3 migration, update the original templating engine projects to use xunit v3 directly: keeping only the v3 code paths - Replace xunit v2 package references with v3 equivalents: - xunit.abstractions -> xunit.v3.extensibility.core - xunit.extensibility.execution -> xunit.v3.extensibility.core - Xunit -> xunit.v3.assert + xunit.v3.extensibility.core - Verify.Xunit / Verify.XUnit -> Verify.XunitV3 - Update using Xunit.Abstractions -> using Xunit / using Xunit.Sdk - Implement additional ITestOutputHelper members (Write, Output) required by xunit v3 in TestOutputLogger - Remove dead DummyMethod from VerificationEngine.cs - Update Verify.XunitV3 version to 28.12.0 in dependabot/Packages.props --- Directory.Packages.props | 1 - eng/dependabot/Packages.props | 2 +- ...rosoft.TemplateEngine.Authoring.CLI.csproj | 2 +- ...teEngine.Authoring.TemplateVerifier.csproj | 5 +-- .../VerificationEngine.cs | 16 --------- ...ft.TemplateSearch.TemplateDiscovery.csproj | 5 +-- .../Test/TestLogger.cs | 33 +++++++++++++++++-- .../BasicCommand.cs | 3 -- .../DotnetCommand.cs | 3 -- .../DotnetNewCommand.cs | 3 -- .../TestCommand.cs | 3 -- .../ExportCommandFailureTests.cs | 2 +- .../ValidateCommandTests.cs | 2 +- .../VerifyCommandTests.cs | 2 +- .../LocalizeTemplateTests.cs | 2 +- ...ne.Authoring.Tasks.IntegrationTests.csproj | 3 +- .../ValidateTemplatesTests.cs | 2 +- .../ExampleTemplateTest.cs | 3 -- .../TemplateEngineSamplesTest.cs | 3 -- .../VerificationEngineTests.cs | 3 -- .../VerificationEngineTests.cs | 3 -- .../AuthoringTemplatesTests.cs | 2 +- ...TemplateEngine.IDE.IntegrationTests.csproj | 2 +- .../SnapshotTests.cs | 2 +- .../Microsoft.TemplateEngine.Mocks.csproj | 2 +- .../MockCreationEffects.cs | 10 ------ .../MockFileChange.cs | 4 --- .../MockTemplateInfo.cs | 17 ---------- ...estrator.RunnableProjects.UnitTests.csproj | 2 +- .../SnapshotTests.cs | 2 +- .../EnvironmentSettingsHelper.cs | 4 --- ...Microsoft.TemplateEngine.TestHelper.csproj | 3 +- .../SharedTestOutputHelper.cs | 19 ----------- .../TestLoggerFactory.cs | 4 --- .../XunitLoggerProvider.cs | 4 --- ...soft.TemplateEngine.Utils.UnitTests.csproj | 2 +- .../TemplateDiscoveryTests.cs | 2 +- 37 files changed, 53 insertions(+), 129 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 5e0bad16b144..2b7eb9ad89e5 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -144,7 +144,6 @@ - diff --git a/eng/dependabot/Packages.props b/eng/dependabot/Packages.props index 6128e5be0b3d..99559afd12aa 100644 --- a/eng/dependabot/Packages.props +++ b/eng/dependabot/Packages.props @@ -7,7 +7,7 @@ - + diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.CLI/Microsoft.TemplateEngine.Authoring.CLI.csproj b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.CLI/Microsoft.TemplateEngine.Authoring.CLI.csproj index e12b67f7950e..f59e563c154a 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.CLI/Microsoft.TemplateEngine.Authoring.CLI.csproj +++ b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.CLI/Microsoft.TemplateEngine.Authoring.CLI.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.csproj b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.csproj index e0b1be99203c..41dd844e8645 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.csproj +++ b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.csproj @@ -3,8 +3,9 @@ - - + + + diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/VerificationEngine.cs b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/VerificationEngine.cs index 037e151ac645..267d618419e5 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/VerificationEngine.cs +++ b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/VerificationEngine.cs @@ -1,9 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -#if !XUNIT_V3 -using System.Reflection; -#endif using System.Runtime.CompilerServices; using System.Text; using System.Text.RegularExpressions; @@ -371,9 +368,6 @@ private static IInstantiationResult RunDotnetNewCommand(TemplateVerifierOptions return result; } - private static void DummyMethod() - { } - private static async IAsyncEnumerable<(string FilePath, string ScrubbedContent)> GetVerificationContent( string contentDir, List includeMatchers, @@ -437,16 +431,6 @@ private static void DummyMethod() private async Task VerifyResult(TemplateVerifierOptions args, IInstantiationResult commandResultData, CallerInfo callerInfo) { -#if !XUNIT_V3 - UseVerifyAttribute a = new UseVerifyAttribute(); - - // https://github.com/VerifyTests/Verify/blob/d8cbe38f527d6788ecadd6205c82803bec3cdfa6/src/Verify.Xunit/Verifier.cs#L10 - // need to simulate execution from tests - var v = DummyMethod; - MethodInfo mi = v.Method; - a.Before(mi); -#endif - if (args.VerifyCommandOutput) { if (_fileSystem.DirectoryExists(Path.Combine(commandResultData.InstantiatedContentDirectory, SpecialFiles.StandardStreamsDir))) diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj b/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj index 8748d04e00b1..680afd8d96da 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj +++ b/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj @@ -10,8 +10,9 @@ - - + + + diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Test/TestLogger.cs b/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Test/TestLogger.cs index 3b20d743cd08..d4ad908e12f3 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Test/TestLogger.cs +++ b/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Test/TestLogger.cs @@ -1,7 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Xunit.Abstractions; +using System.Text; +using Xunit; namespace Microsoft.TemplateSearch.TemplateDiscovery.Test { @@ -9,8 +10,34 @@ internal class TestOutputLogger : ITestOutputHelper { public static readonly TestOutputLogger Instance = new TestOutputLogger(); - public void WriteLine(string message) => Console.WriteLine(message); + private readonly StringBuilder _output = new(); - public void WriteLine(string format, params object[] args) => Console.WriteLine(format, args); + public string Output => _output.ToString(); + + public void Write(string message) + { + _output.Append(message); + Console.Write(message); + } + + public void Write(string format, params object[] args) + { + string message = string.Format(format, args); + _output.Append(message); + Console.Write(message); + } + + public void WriteLine(string message) + { + _output.AppendLine(message); + Console.WriteLine(message); + } + + public void WriteLine(string format, params object[] args) + { + string message = string.Format(format, args); + _output.AppendLine(message); + Console.WriteLine(message); + } } } diff --git a/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/BasicCommand.cs b/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/BasicCommand.cs index 5b0179e8cdd2..5061864e224b 100644 --- a/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/BasicCommand.cs +++ b/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/BasicCommand.cs @@ -2,9 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Extensions.Logging; -#if !XUNIT_V3 -using Xunit.Abstractions; -#endif namespace Microsoft.TemplateEngine.CommandUtils { diff --git a/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/DotnetCommand.cs b/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/DotnetCommand.cs index 1f9984a0fae5..16f779943171 100644 --- a/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/DotnetCommand.cs +++ b/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/DotnetCommand.cs @@ -2,9 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Extensions.Logging; -#if !XUNIT_V3 -using Xunit.Abstractions; -#endif namespace Microsoft.TemplateEngine.CommandUtils { diff --git a/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/DotnetNewCommand.cs b/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/DotnetNewCommand.cs index ae71ad46be61..86195816545e 100644 --- a/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/DotnetNewCommand.cs +++ b/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/DotnetNewCommand.cs @@ -2,9 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Extensions.Logging; -#if !XUNIT_V3 -using Xunit.Abstractions; -#endif namespace Microsoft.TemplateEngine.CommandUtils { diff --git a/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/TestCommand.cs b/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/TestCommand.cs index 14682c46cfcd..905221e07d40 100644 --- a/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/TestCommand.cs +++ b/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/TestCommand.cs @@ -4,9 +4,6 @@ using System.Diagnostics; using Microsoft.Extensions.Logging; using Microsoft.TemplateEngine.Utils; -#if !XUNIT_V3 -using Xunit.Abstractions; -#endif namespace Microsoft.TemplateEngine.CommandUtils { diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ExportCommandFailureTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ExportCommandFailureTests.cs index e2a94b9a7637..9a0ecf056a3c 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ExportCommandFailureTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ExportCommandFailureTests.cs @@ -3,7 +3,7 @@ using System.Globalization; using Microsoft.TemplateEngine.CommandUtils; -using Xunit.Abstractions; +using Xunit; namespace Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests { diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ValidateCommandTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ValidateCommandTests.cs index 33309dd69823..9228a6bdb38f 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ValidateCommandTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ValidateCommandTests.cs @@ -5,7 +5,7 @@ using System.Text.RegularExpressions; using Microsoft.TemplateEngine.CommandUtils; using Microsoft.TemplateEngine.Tests; -using Xunit.Abstractions; +using Xunit; namespace Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests { diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/VerifyCommandTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/VerifyCommandTests.cs index 644cf2cddc2a..6eab42d9ebfd 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/VerifyCommandTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/VerifyCommandTests.cs @@ -6,7 +6,7 @@ using Microsoft.TemplateEngine.CommandUtils; using Microsoft.TemplateEngine.TestHelper; using Microsoft.TemplateEngine.Tests; -using Xunit.Abstractions; +using Xunit; namespace Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests { diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/LocalizeTemplateTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/LocalizeTemplateTests.cs index 8d35ddab4964..816d6bd40911 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/LocalizeTemplateTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/LocalizeTemplateTests.cs @@ -4,7 +4,7 @@ using Microsoft.TemplateEngine.CommandUtils; using Microsoft.TemplateEngine.TestHelper; using Microsoft.TemplateEngine.Tests; -using Xunit.Abstractions; +using Xunit; namespace Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests { diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj index 80ce682da337..7b61e7e7e0ed 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj @@ -10,9 +10,8 @@ - + - diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/ValidateTemplatesTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/ValidateTemplatesTests.cs index 5d76acf455c1..7239b104cc87 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/ValidateTemplatesTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/ValidateTemplatesTests.cs @@ -4,7 +4,7 @@ using Microsoft.TemplateEngine.CommandUtils; using Microsoft.TemplateEngine.TestHelper; using Microsoft.TemplateEngine.Tests; -using Xunit.Abstractions; +using Xunit; namespace Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests { diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/ExampleTemplateTest.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/ExampleTemplateTest.cs index 118d215a55f7..43bc71c15214 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/ExampleTemplateTest.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/ExampleTemplateTest.cs @@ -5,9 +5,6 @@ using Microsoft.TemplateEngine.Authoring.TemplateApiVerifier; using Microsoft.TemplateEngine.TestHelper; using Microsoft.TemplateEngine.Tests; -#if !XUNIT_V3 -using Xunit.Abstractions; -#endif namespace Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests { diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/TemplateEngineSamplesTest.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/TemplateEngineSamplesTest.cs index ff3d458cae85..8139b7cb918e 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/TemplateEngineSamplesTest.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/TemplateEngineSamplesTest.cs @@ -6,9 +6,6 @@ using Microsoft.TemplateEngine.Authoring.TemplateApiVerifier; using Microsoft.TemplateEngine.TestHelper; using Microsoft.TemplateEngine.Tests; -#if !XUNIT_V3 -using Xunit.Abstractions; -#endif namespace Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests { diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/VerificationEngineTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/VerificationEngineTests.cs index 8bc7929e8623..53e097671cc6 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/VerificationEngineTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/VerificationEngineTests.cs @@ -4,9 +4,6 @@ using FluentAssertions; using Microsoft.Extensions.Logging; using Microsoft.TemplateEngine.TestHelper; -#if !XUNIT_V3 -using Xunit.Abstractions; -#endif namespace Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests { diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/VerificationEngineTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/VerificationEngineTests.cs index 876ad080ff0e..d1ab0d7d8de3 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/VerificationEngineTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/VerificationEngineTests.cs @@ -7,9 +7,6 @@ using Microsoft.TemplateEngine.Authoring.TemplateVerifier.Commands; using Microsoft.TemplateEngine.CommandUtils; using Microsoft.TemplateEngine.TestHelper; -#if !XUNIT_V3 -using Xunit.Abstractions; -#endif namespace Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests { diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/AuthoringTemplatesTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/AuthoringTemplatesTests.cs index f87a29467580..7b14480cfe5e 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/AuthoringTemplatesTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/AuthoringTemplatesTests.cs @@ -6,7 +6,7 @@ using Microsoft.TemplateEngine.Authoring.TemplateVerifier; using Microsoft.TemplateEngine.TestHelper; using Microsoft.TemplateEngine.Tests; -using Xunit.Abstractions; +using Xunit; namespace Microsoft.TemplateEngine.Authoring.Templates.Tests { diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/Microsoft.TemplateEngine.IDE.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/Microsoft.TemplateEngine.IDE.IntegrationTests.csproj index 624700d018ae..9bf6caa2645d 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/Microsoft.TemplateEngine.IDE.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/Microsoft.TemplateEngine.IDE.IntegrationTests.csproj @@ -6,7 +6,7 @@ - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/SnapshotTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/SnapshotTests.cs index f6fcb86504f7..0d0d8d975466 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/SnapshotTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/SnapshotTests.cs @@ -7,7 +7,7 @@ using Microsoft.TemplateEngine.Authoring.TemplateVerifier; using Microsoft.TemplateEngine.TestHelper; using Microsoft.TemplateEngine.Tests; -using Xunit.Abstractions; +using Xunit; namespace Microsoft.TemplateEngine.IDE.IntegrationTests { diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/Microsoft.TemplateEngine.Mocks.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/Microsoft.TemplateEngine.Mocks.csproj index 80e835c4109f..4be42e62e119 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/Microsoft.TemplateEngine.Mocks.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/Microsoft.TemplateEngine.Mocks.csproj @@ -3,7 +3,7 @@ - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockCreationEffects.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockCreationEffects.cs index 0e96d4e7e4f9..0db0211f3dfc 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockCreationEffects.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockCreationEffects.cs @@ -3,11 +3,7 @@ using System.Text; using Microsoft.TemplateEngine.Abstractions; -#if XUNIT_V3 using Xunit.Sdk; -#else -using Xunit.Abstractions; -#endif namespace Microsoft.TemplateEngine.Mocks { @@ -53,15 +49,9 @@ public MockCreationEffects Without(params string[] files) public void Deserialize(IXunitSerializationInfo info) { -#if XUNIT_V3 _primaryOutputs = info.GetValue("primaryOutputs")!; _mockFileChanges = info.GetValue("fileChanges")!; _absentFiles = info.GetValue("absentFiles")!; -#else - _primaryOutputs = info.GetValue("primaryOutputs"); - _mockFileChanges = info.GetValue("fileChanges"); - _absentFiles = info.GetValue("absentFiles"); -#endif } public void Serialize(IXunitSerializationInfo info) diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockFileChange.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockFileChange.cs index d6f3550460f5..3edb428a9feb 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockFileChange.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockFileChange.cs @@ -2,11 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.TemplateEngine.Abstractions; -#if XUNIT_V3 using Xunit.Sdk; -#else -using Xunit.Abstractions; -#endif namespace Microsoft.TemplateEngine.Mocks { diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockTemplateInfo.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockTemplateInfo.cs index 1bc6265b2a69..e1100fe07248 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockTemplateInfo.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockTemplateInfo.cs @@ -7,11 +7,7 @@ using Microsoft.TemplateEngine.Abstractions.Constraints; using Microsoft.TemplateEngine.Abstractions.Parameters; using Microsoft.TemplateEngine.Utils; -#if XUNIT_V3 using Xunit.Sdk; -#else -using Xunit.Abstractions; -#endif namespace Microsoft.TemplateEngine.Mocks { @@ -247,7 +243,6 @@ public void Deserialize(IXunitSerializationInfo info) GroupIdentity = info.GetValue("template_group"); Description = info.GetValue("template_description"); Author = info.GetValue("template_author"); -#if XUNIT_V3 _tags = JsonSerializer.Deserialize>(info.GetValue("template_tags")!) ?? throw new Exception("Deserialiation failed"); _parameters = JsonSerializer.Deserialize>(info.GetValue("template_params")!) @@ -258,18 +253,6 @@ public void Deserialize(IXunitSerializationInfo info) ?? throw new Exception("Deserialiation failed"); _shortNameList = JsonSerializer.Deserialize(info.GetValue("template_shortname")!) ?? throw new Exception("Deserialiation failed"); -#else - _tags = JsonSerializer.Deserialize>(info.GetValue("template_tags")) - ?? throw new Exception("Deserialiation failed"); - _parameters = JsonSerializer.Deserialize>(info.GetValue("template_params")) - ?? throw new Exception("Deserialiation failed"); - _baselineInfo = JsonSerializer.Deserialize(info.GetValue("template_baseline")) - ?? throw new Exception("Deserialiation failed"); - _classifications = JsonSerializer.Deserialize(info.GetValue("template_classifications")) - ?? throw new Exception("Deserialiation failed"); - _shortNameList = JsonSerializer.Deserialize(info.GetValue("template_shortname")) - ?? throw new Exception("Deserialiation failed"); -#endif } public void Serialize(IXunitSerializationInfo info) diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj index 88caeca1cc5b..93ffa0787dba 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj @@ -11,7 +11,7 @@ - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/SnapshotTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/SnapshotTests.cs index 002150d8ab5a..4696a107c60d 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/SnapshotTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/SnapshotTests.cs @@ -8,7 +8,7 @@ using Microsoft.TemplateEngine.Authoring.TemplateVerifier; using Microsoft.TemplateEngine.TestHelper; using Microsoft.TemplateEngine.Tests; -using Xunit.Abstractions; +using Xunit; namespace Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests { diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/EnvironmentSettingsHelper.cs b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/EnvironmentSettingsHelper.cs index 49a1270957d4..0374ca18a8f6 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/EnvironmentSettingsHelper.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/EnvironmentSettingsHelper.cs @@ -7,11 +7,7 @@ using Microsoft.TemplateEngine.Abstractions; using Microsoft.TemplateEngine.Edge; using Microsoft.TemplateEngine.Utils; -#if XUNIT_V3 using Xunit.Sdk; -#else -using Xunit.Abstractions; -#endif namespace Microsoft.TemplateEngine.TestHelper { diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/Microsoft.TemplateEngine.TestHelper.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/Microsoft.TemplateEngine.TestHelper.csproj index ee0310b7d8b4..83b05eba351f 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/Microsoft.TemplateEngine.TestHelper.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/Microsoft.TemplateEngine.TestHelper.csproj @@ -3,8 +3,7 @@ - - + \ No newline at end of file diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/SharedTestOutputHelper.cs b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/SharedTestOutputHelper.cs index 52347e1d906e..7e48984fea72 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/SharedTestOutputHelper.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/SharedTestOutputHelper.cs @@ -1,15 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -#if XUNIT_V3 using System.Text; using Xunit; using Xunit.Sdk; using Xunit.v3; -#else -using Xunit.Abstractions; -using Xunit.Sdk; -#endif namespace Microsoft.TemplateEngine.TestHelper { @@ -20,16 +15,13 @@ namespace Microsoft.TemplateEngine.TestHelper public class SharedTestOutputHelper : ITestOutputHelper { private readonly IMessageSink _sink; -#if XUNIT_V3 private readonly StringBuilder _output = new(); -#endif public SharedTestOutputHelper(IMessageSink sink) { this._sink = sink; } -#if XUNIT_V3 public string Output => _output.ToString(); public void Write(string message) @@ -57,16 +49,5 @@ public void WriteLine(string format, params object[] args) _output.AppendLine(message); _sink.OnMessage(new DiagnosticMessage(message)); } -#else - public void WriteLine(string message) - { - _sink.OnMessage(new DiagnosticMessage(message)); - } - - public void WriteLine(string format, params object[] args) - { - _sink.OnMessage(new DiagnosticMessage(format, args)); - } -#endif } } diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/TestLoggerFactory.cs b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/TestLoggerFactory.cs index c344f39eebc1..ac3260424343 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/TestLoggerFactory.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/TestLoggerFactory.cs @@ -2,11 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Extensions.Logging; -#if XUNIT_V3 using Xunit.Sdk; -#else -using Xunit.Abstractions; -#endif namespace Microsoft.TemplateEngine.TestHelper { diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/XunitLoggerProvider.cs b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/XunitLoggerProvider.cs index 9f1130d0360a..527773c383d9 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/XunitLoggerProvider.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/XunitLoggerProvider.cs @@ -3,11 +3,7 @@ using System.Text; using Microsoft.Extensions.Logging; -#if XUNIT_V3 using Xunit; -#else -using Xunit.Abstractions; -#endif namespace Microsoft.TemplateEngine.TestHelper { diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/Microsoft.TemplateEngine.Utils.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/Microsoft.TemplateEngine.Utils.UnitTests.csproj index ba89aa0b01f4..a0e65fd7b4f4 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/Microsoft.TemplateEngine.Utils.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/Microsoft.TemplateEngine.Utils.UnitTests.csproj @@ -11,7 +11,7 @@ - + diff --git a/test/TemplateEngine/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/TemplateDiscoveryTests.cs b/test/TemplateEngine/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/TemplateDiscoveryTests.cs index f31041934d24..c73eb1342c9b 100644 --- a/test/TemplateEngine/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/TemplateDiscoveryTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/TemplateDiscoveryTests.cs @@ -5,7 +5,7 @@ using Microsoft.TemplateEngine.CommandUtils; using Microsoft.TemplateEngine.TestHelper; using Microsoft.TemplateEngine.Tests; -using Xunit.Abstractions; +using Xunit; namespace Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests { From 8e2173836ce97da9a1048b84c161ecc2d8f9266b Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 7 Apr 2026 00:51:55 +0000 Subject: [PATCH 20/48] Remove template engine version properties for packages now built from source Remove the PackageVersion and Version property pairs from eng/Version.Details.props and the corresponding PackageVersion entries from Directory.Packages.props for template engine packages that no longer have entries in eng/Version.Details.xml (they are built from source via ProjectReference, not consumed as NuGet packages): - Microsoft.TemplateEngine.Abstractions - Microsoft.TemplateEngine.Edge - Microsoft.TemplateEngine.Orchestrator.RunnableProjects - Microsoft.TemplateEngine.Utils - Microsoft.TemplateSearch.Common - Microsoft.TemplateSearch.TemplateDiscovery --- Directory.Packages.props | 3 --- eng/Version.Details.props | 12 ------------ .../dotnet-new.IntegrationTests.csproj | 2 +- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 2b7eb9ad89e5..b142613022ce 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -77,9 +77,6 @@ - - - diff --git a/eng/Version.Details.props b/eng/Version.Details.props index f82b14a1448c..5cd84906205a 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -90,12 +90,6 @@ This file should be imported by eng/Versions.props 11.0.100-preview.4.26203.108 11.0.100-preview.4.26203.108 11.0.100-preview.4.26203.108 - 11.0.100-preview.4.26203.108 - 11.0.100-preview.4.26203.108 - 11.0.100-preview.4.26203.108 - 11.0.100-preview.4.26203.108 - 11.0.100-preview.4.26203.108 - 11.0.100-preview.4.26203.108 18.5.0-preview-26203-108 18.5.0-preview-26203-108 3.3.0-preview.4.26203.108 @@ -231,12 +225,6 @@ This file should be imported by eng/Versions.props $(MicrosoftSourceLinkCommonPackageVersion) $(MicrosoftSourceLinkGitHubPackageVersion) $(MicrosoftSourceLinkGitLabPackageVersion) - $(MicrosoftTemplateEngineAbstractionsPackageVersion) - $(MicrosoftTemplateEngineEdgePackageVersion) - $(MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion) - $(MicrosoftTemplateEngineUtilsPackageVersion) - $(MicrosoftTemplateSearchCommonPackageVersion) - $(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion) $(MicrosoftTestPlatformBuildPackageVersion) $(MicrosoftTestPlatformCLIPackageVersion) $(MicrosoftWebXdtPackageVersion) diff --git a/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj b/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj index 674384f38fee..364830086407 100644 --- a/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj +++ b/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj @@ -66,7 +66,7 @@ namespace Microsoft.DotNet.Cli.New.IntegrationTests internal class TemplatePackageVersion { - public const string MicrosoftTemplateSearchTemplateDiscoveryPackageVersion = "$(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion)"%3B + public const string MicrosoftTemplateSearchTemplateDiscoveryPackageVersion = "$(Version)"%3B } } ]]> From c97492ef1347e717b8242bbc171f2e7b60dd7154 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 7 Apr 2026 14:02:21 +0000 Subject: [PATCH 21/48] Suppress EOL target framework check for test template content Add CheckEolTargetFramework=false to the test_templates Directory.Build.props to prevent NETSDK1138 errors from template content that targets older frameworks like net7.0. These .csproj files are template content, not build targets. --- .../test_templates/Directory.Build.props | 1 + 1 file changed, 1 insertion(+) diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Directory.Build.props b/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Directory.Build.props index 5f9708a97f38..652e958e48e5 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Directory.Build.props +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Directory.Build.props @@ -1,5 +1,6 @@ false + false From 2c43c0164e2bd6d74442a439a531d4787749b4a0 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 7 Apr 2026 18:02:26 +0000 Subject: [PATCH 22/48] Move TestTemplates to TestAssets/TestPackages/TemplateEngine Move test template content from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/ to test/TestAssets/TestPackages/TemplateEngine/ so that: - Nested .csproj files in template content are excluded from the CI TestBuild glob (TestAssets is already excluded from **/*.Tests.csproj) - TestAssets Directory.Build.props/targets already provide the needed isolation (ManagePackageVersionsCentrally=false, CheckEolTargetFramework=false) - Helix payload picks up template content via the existing AssetFiles glob, eliminating the separate TemplateEngineTestAssets copy step - The csproj targets netstandard2.0 instead of $(NetCurrent) since it is a content-only template package with no build output Add TemplateEngineTestAssetsRoot property to Directory.Build.props for consistency with TemplateEngineRoot and TemplateEngineTestRoot. --- Directory.Build.props | 1 + TemplateEngine.slnf | 1 + sdk.slnx | 3 +++ ...lateEngine.Authoring.CLI.IntegrationTests.csproj | 2 +- ...thoring.TemplateVerifier.IntegrationTests.csproj | 2 +- ...teEngine.TemplateLocalizer.Core.UnitTests.csproj | 2 +- .../test_templates/Directory.Build.props | 6 ------ .../test_templates/Directory.Build.targets | 1 - test/TemplateEngine/Shared/TestBase.cs | 10 +++++----- .../Microsoft.TemplateEngine.TestTemplates.csproj | 4 ++-- .../TestNupkgInstallTemplate.0.0.1.nupkg | Bin .../TestNupkgInstallTemplateV2.0.0.2.nupkg | Bin .../.template.config/template.json | 0 .../Company.ClassLibrary1.csproj | 0 .../ConfigurationKitchenSink/RenameBattery/A.txt | 0 .../ConfigurationKitchenSink/RenameBattery/C.txt | 0 .../test_templates/ConfigurationKitchenSink/Test.cs | 0 .../ConfigurationKitchenSink/Test.css | 0 .../ConfigurationKitchenSink/Test.json | 0 .../.template.config/template.json | 0 .../Constraints/RestrictedTemplate/bar.cs | 0 .../.template.config/template.json | 0 .../DefaultIfOptionWithoutValue/ChoiceOtherFile.cs | 0 .../DefaultIfOptionWithoutValue/Program.cs | 0 .../DefaultIfOptionWithoutValue/StringOtherFile.cs | 0 .../.template.config/dotnetcli.host.json | 0 .../InvalidHostData/.template.config/template.json | 0 .../Invalid/InvalidHostData/global.json | 0 .../localize/templatestrings.de-DE.json | 0 .../InvalidFormat/.template.config/template.json | 0 .../Invalid/Localization/InvalidFormat/bar.cs | 0 .../localize/templatestrings.de-DE.json | 0 .../localize/templatestrings.tr.json | 0 .../.template.config/template.json | 0 .../Invalid/Localization/ValidationFailure/bar.cs | 0 .../MissingIdentity/.template.config/template.json | 0 .../.template.config/template.json | 0 .../TemplateA/.template.config/template.json | 0 .../Invalid/SameShortName/TemplateA/bar.cs | 0 .../TemplateB/.template.config/template.json | 0 .../Invalid/SameShortName/TemplateB/bar.cs | 0 .../Basic/.template.config/template.json | 0 .../AddPackageReference/Basic/Basic.csproj | 0 .../AddPackageReference/Basic/Program.cs | 0 .../BasicWithFiles/.template.config/template.json | 0 .../AddPackageReference/BasicWithFiles/Basic.csproj | 0 .../AddPackageReference/BasicWithFiles/Program.cs | 0 .../Basic/.template.config/template.json | 0 .../AddProjectReference/Basic/Project1/Program.cs | 0 .../Basic/Project1/Project1.csproj | 0 .../AddProjectReference/Basic/Project2/MyClass.cs | 0 .../Basic/Project2/Project2.csproj | 0 .../Basic/.template.config/template.json | 0 .../AddProjectToSolution/Basic/Basic.csproj | 0 .../AddProjectToSolution/Basic/Program.cs | 0 .../BasicWithFiles/.template.config/template.json | 0 .../BasicWithFiles/Basic.csproj | 0 .../AddProjectToSolution/BasicWithFiles/Program.cs | 0 .../BasicWithIndexes/.template.config/template.json | 0 .../BasicWithIndexes/Client/Client.csproj | 0 .../BasicWithIndexes/Client/Program.cs | 0 .../BasicWithIndexes/Server/Program.cs | 0 .../BasicWithIndexes/Server/Server.csproj | 0 .../Basic/.template.config/template.json | 0 .../PostActions/Instructions/Basic/Class1.cs | 0 .../Basic/.template.config/template.json | 0 .../PostActions/RestoreNuGet/Basic/Basic.csproj | 0 .../PostActions/RestoreNuGet/Basic/Program.cs | 0 .../BasicWithFiles/.template.config/template.json | 0 .../RestoreNuGet/BasicWithFiles/Basic.csproj | 0 .../RestoreNuGet/BasicWithFiles/Program.cs | 0 .../CustomSourcePath/.template.config/template.json | 0 .../CustomSourcePath/Custom/Path/Basic.csproj | 0 .../CustomSourcePath/Custom/Path/Program.cs | 0 .../.template.config/template.json | 0 .../CustomSourcePathFiles/Custom/Path/Basic.csproj | 0 .../CustomSourcePathFiles/Custom/Path/Program.cs | 0 .../.template.config/template.json | 0 .../Src/Custom/Path/Basic.csproj | 0 .../Src/Custom/Path/Program.cs | 0 .../.template.config/template.json | 0 .../Src/Custom/Path/Basic.csproj | 0 .../Src/Custom/Path/Program.cs | 0 .../CustomTargetPath/.template.config/template.json | 0 .../RestoreNuGet/CustomTargetPath/Basic.csproj | 0 .../RestoreNuGet/CustomTargetPath/Program.cs | 0 .../.template.config/template.json | 0 .../RestoreNuGet/CustomTargetPathFiles/Basic.csproj | 0 .../RestoreNuGet/CustomTargetPathFiles/Program.cs | 0 .../Invalid/.template.config/template.json | 0 .../PostActions/RestoreNuGet/Invalid/Invalid.csproj | 0 .../PostActions/RestoreNuGet/Invalid/Program.cs | 0 .../.template.config/template.json | 0 .../Invalid_ContinueOnError/Invalid.csproj | 0 .../RestoreNuGet/Invalid_ContinueOnError/Program.cs | 0 .../SourceRename/.template.config/template.json | 0 .../RestoreNuGet/SourceRename/Basic.csproj | 0 .../RestoreNuGet/SourceRename/Program.cs | 0 .../.template.config/template.json | 0 .../RestoreNuGet/SourceRenameFiles/Basic.csproj | 0 .../RestoreNuGet/SourceRenameFiles/Program.cs | 0 .../TwoProjectsFiles/.template.config/template.json | 0 .../MyTestProject.Tests/MyTestProject.Tests.csproj | 0 .../Custom/MyTestProject.Tests/Program.cs | 0 .../Custom/MyTestProject/MyTestProject.csproj | 0 .../Custom/MyTestProject/Program.cs | 0 .../.template.config/template.json | 0 .../MyTestProject.Tests/MyTestProject.Tests.csproj | 0 .../Custom/MyTestProject.Tests/Program.cs | 0 .../Custom/MyTestProject/MyTestProject.csproj | 0 .../Custom/MyTestProject/Program.cs | 0 .../.template.config/template.json | 0 .../TemplateProject1/Program.cs | 0 .../TemplateProject1/TemplateProject1.csproj | 0 .../TemplateProject2/Program.cs | 0 .../TemplateProject2/TemplateProject2.csproj | 0 .../.template.config/template.json | 0 .../TemplateProject1/Program.cs | 0 .../TemplateProject1/TemplateProject1.csproj | 0 .../TemplateProject2/Program.cs | 0 .../TemplateProject2/TemplateProject2.csproj | 0 .../RunScript/Basic/.template.config/template.json | 0 .../PostActions/RunScript/Basic/setup.cmd | 0 .../PostActions/RunScript/Basic/setup.sh | 0 .../DoNotRedirect/.template.config/template.json | 0 .../PostActions/RunScript/DoNotRedirect/setup.cmd | 0 .../PostActions/RunScript/DoNotRedirect/setup.sh | 0 .../Redirect/.template.config/template.json | 0 .../PostActions/RunScript/Redirect/setup.cmd | 0 .../PostActions/RunScript/Redirect/setup.sh | 0 .../RedirectOnError/.template.config/template.json | 0 .../PostActions/RunScript/RedirectOnError/setup.cmd | 0 .../PostActions/RunScript/RedirectOnError/setup.sh | 0 .../.template.config/template.json | 0 .../PostActions/UnknownPostAction/Program.cs | 0 .../UnknownPostAction/UnknownPostAction.csproj | 0 .../WithFileRename/.template.config/template.json | 0 .../PostActions/WithFileRename/MyTestProject.csproj | 0 .../PostActions/WithFileRename/testfile.json | 0 .../SourceNameForms/.template.config/template.json | 0 .../SourceNameForms/Good.Source.Name.1.cs | 0 .../SourceNameForms/fileRename-name-lc2.cs | 0 .../With/.template.config/template.json | 0 .../SourceWithExcludeAndWithout/With/bar.cs | 0 .../SourceWithExcludeAndWithout/With/foo.cs | 0 .../With/packages.lock.json | 0 .../Without/.template.config/template.json | 0 .../SourceWithExcludeAndWithout/Without/bar.cs | 0 .../SourceWithExcludeAndWithout/Without/foo.cs | 0 .../Without/packages.lock.json | 0 .../.template.config/template.json | 0 .../TemplateConditionalProcessing/Test.cmd | 0 .../TemplateConditionalProcessing/Test.cpp | 0 .../TemplateConditionalProcessing/Test.cs | 0 .../TemplateConditionalProcessing/Test.cshtml | 0 .../TemplateConditionalProcessing/Test.csproj | 0 .../TemplateConditionalProcessing/Test.css | 0 .../TemplateConditionalProcessing/Test.fs | 0 .../TemplateConditionalProcessing/Test.haml | 0 .../TemplateConditionalProcessing/Test.js | 0 .../TemplateConditionalProcessing/Test.json | 0 .../TemplateConditionalProcessing/Test.jsx | 0 .../TemplateConditionalProcessing/Test.othertype | 0 .../TemplateConditionalProcessing/Test.ts | 0 .../TemplateConditionalProcessing/Test.vb | 0 .../TemplateConditionalProcessing/Test.xml | 0 .../TemplateConditionalProcessing/Test.yml | 0 .../.template.config/template.json | 0 .../.template.config/template.json | 0 .../.template.config/template.json | 0 .../.template.config/template.json | 0 .../BasicFSharp/.template.config/template.json | 0 .../DifferentLanguagesGroup/BasicFSharp/bar.fs | 0 .../BasicVB/.template.config/template.json | 0 .../DifferentLanguagesGroup/BasicVB/bar.vb | 0 .../BasicTemplate1/.template.config/template.json | 0 .../SamePrecedenceGroup/BasicTemplate1/bar.cs | 0 .../BasicTemplate2/.template.config/template.json | 0 .../SamePrecedenceGroup/BasicTemplate2/bar.cs | 0 .../BasicFSharp/.template.config/template.json | 0 .../SameShortName/BasicFSharp/bar.fs | 0 .../BasicVB/.template.config/template.json | 0 .../TemplateResolution/SameShortName/BasicVB/bar.vb | 0 .../.template.config/template.json | 0 .../test_templates/TemplateWithBinaryFile/image.png | Bin .../.template.config/template.json | 0 .../TemplateWithBooleanParameters/bar-computed.cs | 0 .../TemplateWithBooleanParameters/bar.cs | 0 .../TemplateWithBooleanParameters/bar.props | 0 .../TemplateWithBooleanParameters/bar.vb | 0 .../.template.config/template.json | 0 .../MyProject.Helper.csproj | 0 .../Program.cs | 0 .../.template.config/template.json | 0 .../Norenamepart/FileNorenamepart.txt | 0 .../Norenamepart/FileYesRenamePart.txt | 0 .../YesRenamePart/FileNorenamepart.txt | 0 .../YesRenamePart/FileYesRenamePart.txt | 0 .../.template.config/template.json | 0 .../MyProject.Helper.csproj | 0 .../TemplateWithCircleDependencyInMacros/Program.cs | 0 .../.template.config/dotnetcli.host.json | 0 .../.template.config/template.json | 0 .../test_templates/TemplateWithCliHostFile/bar.cs | 0 .../.template.config/template.json | 0 .../MyProject.Helper.csproj | 0 .../Program.cs | 0 .../.template.config/template.json | 0 .../MyProject.Helper.csproj | 0 .../TemplateWithComputedInGenerated/Program.cs | 0 .../.template.config/template.json | 0 .../TemplateWithConditionalParameters/Test.cs | 0 .../TemplateWithConditions/.dockerignore | 0 .../TemplateWithConditions/.editorconfig | 0 .../TemplateWithConditions/.gitattributes | 0 .../TemplateWithConditions/.gitignore | 0 .../.template.config/template.json | 0 .../TemplateWithConditions/Dockerfile | 0 .../TemplateWithConditions/Package.appxmanifest | 0 .../TemplateWithConditions/nuget.config | 0 .../TemplateWithConditions/test.axaml | 0 .../test_templates/TemplateWithConditions/test.cake | 0 .../test_templates/TemplateWithConditions/test.md | 0 .../test_templates/TemplateWithConditions/test.ps1 | 0 .../test_templates/TemplateWithConditions/test.sln | 0 .../test_templates/TemplateWithConditions/test.slnx | 0 .../test_templates/TemplateWithConditions/test.yaml | 0 .../.template.config/template.json | 0 .../Application1.cs | 0 .../.template.config/template.json | 0 .../ContentTest.txt | 0 .../SomeApp1.cs | 0 .../.template.config/template.json | 0 .../TemplateWithFileRenameDate/date_name.cs | 0 .../.template.config/template.json | 0 .../MyProject.Helper.csproj | 0 .../Tool.cs | 0 .../ToolExtension.cs | 0 .../.template.config/template.json | 0 .../MyProject.Helper.csproj | 0 .../TemplateWithGeneratedInComputed/Program.cs | 0 .../.template.config/template.json | 0 .../MyProject.Helper.csproj | 0 .../Program.cs | 0 .../.template.config/template.json | 0 .../MyProject.Helper.csproj | 0 .../Tool.cs | 0 .../ToolExtension.cs | 0 .../.template.config/template.json | 0 .../TemplateWithJoinAndFolderRename/Api/bar.cs | 0 .../localize/templatestrings.de-DE.json | 0 .../localize/templatestrings.tr.json | 0 .../.template.config/template.json | 0 .../test_templates/TemplateWithLocalization/bar.cs | 0 .../.template.config/template.json | 0 .../TemplateWithMultiValueChoice/Test.cs | 0 .../.template.config/template.json | 0 .../Program.cs | 0 .../.template.config/template.json | 0 .../Program.cs | 0 .../.template.config/template.json | 0 .../barandfoo.txt | 0 .../foobar.txt | 0 .../.template.config/template.json | 0 .../foo.txt | 0 .../.template.config/template.json | 0 .../foob.txt | 0 .../.template.config/template.json | 0 .../TemplateWithOnlyIfForLocalhost/test.json | 0 .../.template.config/template.json | 0 .../TemplateWithOnlyIfStatement/test.json | 0 .../.template.config/template.json | 0 .../TemplateWithPlaceholderFiles/Src/Path/bar/_._ | 0 .../TemplateWithPlaceholderFiles/Src/Path/foo/_._ | 0 .../.template.config/template.json | 0 .../TemplateWithPortsAndCoalesce/bar.cs | 0 .../.template.config/template.json | 0 .../TemplateWithPreferDefaultName/toChange.cs | 0 .../.template.config/template.json | 0 .../toChange.cs | 0 .../.template.config/template.json | 0 .../TemplateWithRegexMatchMacro/bar.2.cs | 0 .../TemplateWithRegexMatchMacro/bar.cs | 0 .../.template.config/template.json | 0 .../TemplateWithRenames/MYPROJECT3.cs | 0 .../TemplateWithRenames/MyProject1.cs | 0 .../test_templates/TemplateWithRenames/bar.cs | 0 .../test_templates/TemplateWithRenames/bar/bar.cs | 0 .../TemplateWithRenames/myproject2.cs | 0 .../test_templates/TemplateWithRenames/uc/bar_uc.cs | 0 .../.template.config/template.json | 0 .../TemplateWithSourceBasedRenames/foo.cs | 0 .../.template.config/template.json | 0 .../test_templates/TemplateWithSourceName/bar.cs | 0 .../TemplateWithSourceName/bar/bar.cs | 0 .../.template.config/template.json | 0 .../Src/Custom/Path/foo.name.txt | 0 .../Src/Custom/Path/foo/foo.cs | 0 .../.template.config/template.json | 0 .../Custom/Path/foo.name.txt | 0 .../Custom/Path/foo/foo.cs | 0 .../.template.config/template.json | 0 .../foo.name.txt | 0 .../foo/foo.cs | 0 .../.template.config/template.json | 0 .../foo.cs | 0 .../foo/bar/.template.config/template.json | 0 .../MountPointRoot/foo/bar/bar.foo.cs | 0 .../MountPointRoot/foo/foo.foo.cs | 0 .../MountPointRoot/mount.foo.cs | 0 .../.template.config/template.json | 0 .../TemplateWithStringCoalesce/bar.cs | 0 .../TemplateWithTags/.template.config/template.json | 0 .../test_templates/TemplateWithTags/bar.cs | 0 .../.template.config/template.json | 0 .../TemplateWithUnspecifiedSourceName/bar.cs | 0 .../TemplateWithUnspecifiedSourceName/bar/bar.cs | 0 .../.template.config/template.json | 0 .../FirstLetterCaseForms/Param2TestValue.cs | 0 .../FirstLetterCaseForms/param1TestValue.cs | 0 .../IdentityForms/Param1TestValue.cs | 0 .../IdentityForms/param 3 test value.cs | 0 .../IdentityForms/param2TestValue.cs | 0 .../KebabCaseForms/param-1-test-value.cs | 0 .../TitleCaseForms/Param 3 Test Value.cs | 0 .../test_templates/TemplateWithValueForms/bar.2.cs | 0 .../test_templates/TemplateWithValueForms/bar.cs | 0 .../TestTemplate/.template.config/template.json | 0 .../test_templates/TestTemplate/Test.cs | 0 .../DerivedSymbol/.template.config/template.json | 0 .../ValueForms/DerivedSymbol/My.Web.App.txt | 0 .../.template.config/template.json | 0 .../DerivedSymbolFromGeneratedSymbol/My.Web.App.txt | 0 test/UnitTests.proj | 6 ------ 334 files changed, 15 insertions(+), 23 deletions(-) delete mode 100644 test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Directory.Build.props delete mode 100644 test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Directory.Build.targets rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/Microsoft.TemplateEngine.TestTemplates.csproj (89%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/nupkg_templates/TestNupkgInstallTemplate.0.0.1.nupkg (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/nupkg_templates/TestNupkgInstallTemplateV2.0.0.2.nupkg (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/ConfigurationKitchenSink/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/ConfigurationKitchenSink/Company.ClassLibrary1.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/ConfigurationKitchenSink/RenameBattery/A.txt (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/ConfigurationKitchenSink/RenameBattery/C.txt (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/ConfigurationKitchenSink/Test.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/ConfigurationKitchenSink/Test.css (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/ConfigurationKitchenSink/Test.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/Constraints/RestrictedTemplate/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/Constraints/RestrictedTemplate/bar.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/DefaultIfOptionWithoutValue/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/DefaultIfOptionWithoutValue/ChoiceOtherFile.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/DefaultIfOptionWithoutValue/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/DefaultIfOptionWithoutValue/StringOtherFile.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/Invalid/InvalidHostData/.template.config/dotnetcli.host.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/Invalid/InvalidHostData/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/Invalid/InvalidHostData/global.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/Invalid/Localization/InvalidFormat/.template.config/localize/templatestrings.de-DE.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/Invalid/Localization/InvalidFormat/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/Invalid/Localization/InvalidFormat/bar.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/Invalid/Localization/ValidationFailure/.template.config/localize/templatestrings.de-DE.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/Invalid/Localization/ValidationFailure/.template.config/localize/templatestrings.tr.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/Invalid/Localization/ValidationFailure/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/Invalid/Localization/ValidationFailure/bar.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/Invalid/MissingIdentity/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/Invalid/MissingMandatoryConfig/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/Invalid/SameShortName/TemplateA/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/Invalid/SameShortName/TemplateA/bar.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/Invalid/SameShortName/TemplateB/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/Invalid/SameShortName/TemplateB/bar.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/AddPackageReference/Basic/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/AddPackageReference/Basic/Basic.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/AddPackageReference/Basic/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/AddPackageReference/BasicWithFiles/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/AddPackageReference/BasicWithFiles/Basic.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/AddPackageReference/BasicWithFiles/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/AddProjectReference/Basic/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/AddProjectReference/Basic/Project1/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/AddProjectReference/Basic/Project1/Project1.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/AddProjectReference/Basic/Project2/MyClass.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/AddProjectReference/Basic/Project2/Project2.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/AddProjectToSolution/Basic/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/AddProjectToSolution/Basic/Basic.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/AddProjectToSolution/Basic/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/AddProjectToSolution/BasicWithFiles/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/AddProjectToSolution/BasicWithFiles/Basic.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/AddProjectToSolution/BasicWithFiles/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/AddProjectToSolution/BasicWithIndexes/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/AddProjectToSolution/BasicWithIndexes/Client/Client.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/AddProjectToSolution/BasicWithIndexes/Client/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/AddProjectToSolution/BasicWithIndexes/Server/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/AddProjectToSolution/BasicWithIndexes/Server/Server.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/Instructions/Basic/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/Instructions/Basic/Class1.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/Basic/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/Basic/Basic.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/Basic/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/BasicWithFiles/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/BasicWithFiles/Basic.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/BasicWithFiles/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/CustomSourcePath/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/CustomSourcePath/Custom/Path/Basic.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/CustomSourcePath/Custom/Path/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/CustomSourcePathFiles/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/CustomSourcePathFiles/Custom/Path/Basic.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/CustomSourcePathFiles/Custom/Path/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPath/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPath/Src/Custom/Path/Basic.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPath/Src/Custom/Path/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPathFiles/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPathFiles/Src/Custom/Path/Basic.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPathFiles/Src/Custom/Path/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/CustomTargetPath/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/CustomTargetPath/Basic.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/CustomTargetPath/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/CustomTargetPathFiles/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/CustomTargetPathFiles/Basic.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/CustomTargetPathFiles/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/Invalid/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/Invalid/Invalid.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/Invalid/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/Invalid_ContinueOnError/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/Invalid_ContinueOnError/Invalid.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/Invalid_ContinueOnError/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/SourceRename/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/SourceRename/Basic.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/SourceRename/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/SourceRenameFiles/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/SourceRenameFiles/Basic.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/SourceRenameFiles/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject.Tests/MyTestProject.Tests.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject.Tests/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject/MyTestProject.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject.Tests/MyTestProject.Tests.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject.Tests/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject/MyTestProject.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject1/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject1/TemplateProject1.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject2/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject2/TemplateProject2.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject1/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject1/TemplateProject1.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject2/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject2/TemplateProject2.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RunScript/Basic/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RunScript/Basic/setup.cmd (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RunScript/Basic/setup.sh (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RunScript/DoNotRedirect/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RunScript/DoNotRedirect/setup.cmd (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RunScript/DoNotRedirect/setup.sh (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RunScript/Redirect/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RunScript/Redirect/setup.cmd (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RunScript/Redirect/setup.sh (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RunScript/RedirectOnError/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RunScript/RedirectOnError/setup.cmd (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/RunScript/RedirectOnError/setup.sh (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/UnknownPostAction/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/UnknownPostAction/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/UnknownPostAction/UnknownPostAction.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/WithFileRename/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/WithFileRename/MyTestProject.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/PostActions/WithFileRename/testfile.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/SourceNameForms/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/SourceNameForms/Good.Source.Name.1.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/SourceNameForms/fileRename-name-lc2.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/SourceWithExcludeAndWithout/With/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/SourceWithExcludeAndWithout/With/bar.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/SourceWithExcludeAndWithout/With/foo.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/SourceWithExcludeAndWithout/With/packages.lock.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/SourceWithExcludeAndWithout/Without/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/SourceWithExcludeAndWithout/Without/bar.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/SourceWithExcludeAndWithout/Without/foo.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/SourceWithExcludeAndWithout/Without/packages.lock.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateConditionalProcessing/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateConditionalProcessing/Test.cmd (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateConditionalProcessing/Test.cpp (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateConditionalProcessing/Test.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateConditionalProcessing/Test.cshtml (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateConditionalProcessing/Test.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateConditionalProcessing/Test.css (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateConditionalProcessing/Test.fs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateConditionalProcessing/Test.haml (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateConditionalProcessing/Test.js (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateConditionalProcessing/Test.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateConditionalProcessing/Test.jsx (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateConditionalProcessing/Test.othertype (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateConditionalProcessing/Test.ts (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateConditionalProcessing/Test.vb (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateConditionalProcessing/Test.xml (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateConditionalProcessing/Test.yml (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateGrouping/CSharpItemAuthor1/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateGrouping/FSharpItemAuthor1/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateGrouping/QSharpItemAuthor2/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateGrouping/QSharpProjectAuthor2/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateResolution/DifferentLanguagesGroup/BasicFSharp/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateResolution/DifferentLanguagesGroup/BasicFSharp/bar.fs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateResolution/DifferentLanguagesGroup/BasicVB/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateResolution/DifferentLanguagesGroup/BasicVB/bar.vb (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateResolution/SamePrecedenceGroup/BasicTemplate1/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateResolution/SamePrecedenceGroup/BasicTemplate1/bar.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateResolution/SamePrecedenceGroup/BasicTemplate2/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateResolution/SamePrecedenceGroup/BasicTemplate2/bar.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateResolution/SameShortName/BasicFSharp/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateResolution/SameShortName/BasicFSharp/bar.fs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateResolution/SameShortName/BasicVB/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateResolution/SameShortName/BasicVB/bar.vb (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithBinaryFile/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithBinaryFile/image.png (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithBooleanParameters/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithBooleanParameters/bar-computed.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithBooleanParameters/bar.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithBooleanParameters/bar.props (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithBooleanParameters/bar.vb (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithBrokenGeneratedInComputed/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithBrokenGeneratedInComputed/MyProject.Helper.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithBrokenGeneratedInComputed/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithCaseSensitiveNameBasedRenames/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithCaseSensitiveNameBasedRenames/Norenamepart/FileNorenamepart.txt (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithCaseSensitiveNameBasedRenames/Norenamepart/FileYesRenamePart.txt (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithCaseSensitiveNameBasedRenames/YesRenamePart/FileNorenamepart.txt (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithCaseSensitiveNameBasedRenames/YesRenamePart/FileYesRenamePart.txt (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithCircleDependencyInMacros/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithCircleDependencyInMacros/MyProject.Helper.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithCircleDependencyInMacros/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithCliHostFile/.template.config/dotnetcli.host.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithCliHostFile/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithCliHostFile/bar.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithComputedInDerivedThroughGenerated/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithComputedInDerivedThroughGenerated/MyProject.Helper.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithComputedInDerivedThroughGenerated/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithComputedInGenerated/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithComputedInGenerated/MyProject.Helper.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithComputedInGenerated/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithConditionalParameters/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithConditionalParameters/Test.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithConditions/.dockerignore (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithConditions/.editorconfig (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithConditions/.gitattributes (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithConditions/.gitignore (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithConditions/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithConditions/Dockerfile (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithConditions/Package.appxmanifest (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithConditions/nuget.config (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithConditions/test.axaml (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithConditions/test.cake (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithConditions/test.md (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithConditions/test.ps1 (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithConditions/test.sln (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithConditions/test.slnx (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithConditions/test.yaml (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithDerivedSymbolFileRename/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithDerivedSymbolFileRename/Application1.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithDerivedSymbolWithValueForms/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithDerivedSymbolWithValueForms/ContentTest.txt (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithDerivedSymbolWithValueForms/SomeApp1.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithFileRenameDate/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithFileRenameDate/date_name.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithGenSymbolWithRefToDerivedSymbol_DifferentOrder/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithGenSymbolWithRefToDerivedSymbol_DifferentOrder/MyProject.Helper.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithGenSymbolWithRefToDerivedSymbol_DifferentOrder/Tool.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithGenSymbolWithRefToDerivedSymbol_DifferentOrder/ToolExtension.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithGeneratedInComputed/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithGeneratedInComputed/MyProject.Helper.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithGeneratedInComputed/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithGeneratedSwitchInComputed/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithGeneratedSwitchInComputed/MyProject.Helper.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithGeneratedSwitchInComputed/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithGeneratedSymbolWithRefToDerivedSymbol/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithGeneratedSymbolWithRefToDerivedSymbol/MyProject.Helper.csproj (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithGeneratedSymbolWithRefToDerivedSymbol/Tool.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithGeneratedSymbolWithRefToDerivedSymbol/ToolExtension.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithJoinAndFolderRename/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithJoinAndFolderRename/Api/bar.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithLocalization/.template.config/localize/templatestrings.de-DE.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithLocalization/.template.config/localize/templatestrings.tr.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithLocalization/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithLocalization/bar.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithMultiValueChoice/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithMultiValueChoice/Test.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithMultipleChoicesAndCoalesce/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithMultipleChoicesAndCoalesce/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithMultipleChoicesAndPartialMatches/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithMultipleChoicesAndPartialMatches/Program.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithMultipleRenamesOnSameFile/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithMultipleRenamesOnSameFile/barandfoo.txt (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithMultipleRenamesOnSameFile/foobar.txt (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithMultipleRenamesOnSameFileHandlesInducedOverlap/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithMultipleRenamesOnSameFileHandlesInducedOverlap/foo.txt (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithMultipleRenamesOnSameFileHandlesOverlap/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithMultipleRenamesOnSameFileHandlesOverlap/foob.txt (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithOnlyIfForLocalhost/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithOnlyIfForLocalhost/test.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithOnlyIfStatement/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithOnlyIfStatement/test.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithPlaceholderFiles/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithPlaceholderFiles/Src/Path/bar/_._ (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithPlaceholderFiles/Src/Path/foo/_._ (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithPortsAndCoalesce/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithPortsAndCoalesce/bar.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithPreferDefaultName/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithPreferDefaultName/toChange.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithPreferDefaultNameButNoDefaultName/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithPreferDefaultNameButNoDefaultName/toChange.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithRegexMatchMacro/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithRegexMatchMacro/bar.2.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithRegexMatchMacro/bar.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithRenames/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithRenames/MYPROJECT3.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithRenames/MyProject1.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithRenames/bar.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithRenames/bar/bar.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithRenames/myproject2.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithRenames/uc/bar_uc.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithSourceBasedRenames/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithSourceBasedRenames/foo.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithSourceName/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithSourceName/bar.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithSourceName/bar/bar.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithSourceNameAndCustomSourceAndTargetPaths/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithSourceNameAndCustomSourceAndTargetPaths/Src/Custom/Path/foo.name.txt (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithSourceNameAndCustomSourceAndTargetPaths/Src/Custom/Path/foo/foo.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithSourceNameAndCustomSourcePath/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithSourceNameAndCustomSourcePath/Custom/Path/foo.name.txt (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithSourceNameAndCustomSourcePath/Custom/Path/foo/foo.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithSourceNameAndCustomTargetPath/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithSourceNameAndCustomTargetPath/foo.name.txt (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithSourceNameAndCustomTargetPath/foo/foo.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithSourceNameInTargetPathGetsRenamed/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithSourceNameInTargetPathGetsRenamed/foo.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithSourcePathOutsideConfigRoot/MountPointRoot/foo/bar/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithSourcePathOutsideConfigRoot/MountPointRoot/foo/bar/bar.foo.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithSourcePathOutsideConfigRoot/MountPointRoot/foo/foo.foo.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithSourcePathOutsideConfigRoot/MountPointRoot/mount.foo.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithStringCoalesce/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithStringCoalesce/bar.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithTags/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithTags/bar.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithUnspecifiedSourceName/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithUnspecifiedSourceName/bar.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithUnspecifiedSourceName/bar/bar.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithValueForms/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithValueForms/FirstLetterCaseForms/Param2TestValue.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithValueForms/FirstLetterCaseForms/param1TestValue.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithValueForms/IdentityForms/Param1TestValue.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithValueForms/IdentityForms/param 3 test value.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithValueForms/IdentityForms/param2TestValue.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithValueForms/KebabCaseForms/param-1-test-value.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithValueForms/TitleCaseForms/Param 3 Test Value.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithValueForms/bar.2.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TemplateWithValueForms/bar.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TestTemplate/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/TestTemplate/Test.cs (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/ValueForms/DerivedSymbol/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/ValueForms/DerivedSymbol/My.Web.App.txt (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/ValueForms/DerivedSymbolFromGeneratedSymbol/.template.config/template.json (100%) rename test/{TemplateEngine/Microsoft.TemplateEngine.TestTemplates => TestAssets/TestPackages/TemplateEngine}/test_templates/ValueForms/DerivedSymbolFromGeneratedSymbol/My.Web.App.txt (100%) diff --git a/Directory.Build.props b/Directory.Build.props index 1a346baabf11..3cf66cc45d0e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -49,6 +49,7 @@ $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src')) $(MSBuildThisFileDirectory)src\TemplateEngine\ $(MSBuildThisFileDirectory)test\TemplateEngine\ + $(MSBuildThisFileDirectory)test\TestAssets\TestPackages\TemplateEngine\ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'redist', '$(Configuration)')) $([MSBuild]::NormalizeDirectory('$(TestHostFolder)', 'dotnet')) $(TestHostDotNetRoot)$([System.IO.Path]::GetFileName('$(DotNetTool)')) diff --git a/TemplateEngine.slnf b/TemplateEngine.slnf index 689af3753dd1..135327395ddb 100644 --- a/TemplateEngine.slnf +++ b/TemplateEngine.slnf @@ -49,6 +49,7 @@ "test\\TemplateEngine\\Microsoft.TemplateSearch.Common.UnitTests\\Microsoft.TemplateSearch.Common.UnitTests.csproj", "test\\TemplateEngine\\Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests\\Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests.csproj", "test\\TestAssets\\TestPackages\\dotnet-new\\Microsoft.TemplateEngine.TestTemplates.csproj", + "test\\TestAssets\\TestPackages\\TemplateEngine\\Microsoft.TemplateEngine.TestTemplates.csproj", "test\\dotnet-new.IntegrationTests\\dotnet-new.IntegrationTests.csproj", "test\\dotnet.Tests\\dotnet.Tests.csproj" ] diff --git a/sdk.slnx b/sdk.slnx index 2226defcda03..1992385d0211 100644 --- a/sdk.slnx +++ b/sdk.slnx @@ -411,6 +411,9 @@ + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj index ab1ac1fec340..e877dde3b06d 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj @@ -6,7 +6,7 @@ - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj index 43f1e9255f61..c4ff84b4a7d8 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj @@ -5,7 +5,7 @@ - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj index 2ed5003578f9..27a93c77b614 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj @@ -6,7 +6,7 @@ - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Directory.Build.props b/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Directory.Build.props deleted file mode 100644 index 652e958e48e5..000000000000 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Directory.Build.props +++ /dev/null @@ -1,6 +0,0 @@ - - - false - false - - diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Directory.Build.targets b/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Directory.Build.targets deleted file mode 100644 index 058246e40862..000000000000 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Directory.Build.targets +++ /dev/null @@ -1 +0,0 @@ - diff --git a/test/TemplateEngine/Shared/TestBase.cs b/test/TemplateEngine/Shared/TestBase.cs index b833b1ab4ea0..2f69580dd0e3 100644 --- a/test/TemplateEngine/Shared/TestBase.cs +++ b/test/TemplateEngine/Shared/TestBase.cs @@ -36,13 +36,13 @@ internal static string ShippingPackagesLocation internal static string TemplateFeedLocation { get; } = Path.Combine(CodeBaseRoot, "template_feed"); - internal static string TestTemplatesLocation { get; } = Path.Combine(CodeBaseRoot, "test", "Microsoft.TemplateEngine.TestTemplates", "test_templates"); + internal static string TestTemplatesLocation { get; } = Path.Combine(CodeBaseRoot, "test", "TestAssets", "TestPackages", "TemplateEngine", "test_templates"); internal static string SampleTemplatesLocation { get; } = Path.Combine(CodeBaseRoot, "dotnet-template-samples"); - internal static string TestTemplatePackagesLocation { get; } = Path.Combine(CodeBaseRoot, "test", "Microsoft.TemplateEngine.TestTemplates", "nupkg_templates"); + internal static string TestTemplatePackagesLocation { get; } = Path.Combine(CodeBaseRoot, "test", "TestAssets", "TestPackages", "TemplateEngine", "nupkg_templates"); - internal static string TestPackageProjectPath { get; } = Path.Combine(CodeBaseRoot, "test", "Microsoft.TemplateEngine.TestTemplates", "Microsoft.TemplateEngine.TestTemplates.csproj"); + internal static string TestPackageProjectPath { get; } = Path.Combine(CodeBaseRoot, "test", "TestAssets", "TestPackages", "TemplateEngine", "Microsoft.TemplateEngine.TestTemplates.csproj"); internal static string PackTestTemplatesNuGetPackage(PackageManager packageManager) { @@ -73,9 +73,9 @@ private static string GetCodeBaseRoot() { throw new InvalidOperationException("Microsoft.TemplateEngine.sln was not found in codebase root"); } - if (!Directory.Exists(Path.Combine(codeBaseRoot!, "test", "Microsoft.TemplateEngine.TestTemplates"))) + if (!Directory.Exists(Path.Combine(codeBaseRoot!, "test", "TestAssets", "TestPackages", "TemplateEngine"))) { - throw new InvalidOperationException("Microsoft.TemplateEngine.TestTemplates was not found in test/"); + throw new InvalidOperationException("TestAssets/TestPackages/TemplateEngine was not found in test/"); } return codeBaseRoot!; } diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/Microsoft.TemplateEngine.TestTemplates.csproj b/test/TestAssets/TestPackages/TemplateEngine/Microsoft.TemplateEngine.TestTemplates.csproj similarity index 89% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/Microsoft.TemplateEngine.TestTemplates.csproj rename to test/TestAssets/TestPackages/TemplateEngine/Microsoft.TemplateEngine.TestTemplates.csproj index 6505f27299d8..4f3ca0c5c868 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/Microsoft.TemplateEngine.TestTemplates.csproj +++ b/test/TestAssets/TestPackages/TemplateEngine/Microsoft.TemplateEngine.TestTemplates.csproj @@ -1,7 +1,7 @@ - $(NetCurrent) + netstandard2.0 Template Microsoft.TemplateEngine.TestTemplates Microsoft @@ -11,7 +11,7 @@ content $(NoWarn);NU5128;NU5110;NU5111 true - true + false true diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/nupkg_templates/TestNupkgInstallTemplate.0.0.1.nupkg b/test/TestAssets/TestPackages/TemplateEngine/nupkg_templates/TestNupkgInstallTemplate.0.0.1.nupkg similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/nupkg_templates/TestNupkgInstallTemplate.0.0.1.nupkg rename to test/TestAssets/TestPackages/TemplateEngine/nupkg_templates/TestNupkgInstallTemplate.0.0.1.nupkg diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/nupkg_templates/TestNupkgInstallTemplateV2.0.0.2.nupkg b/test/TestAssets/TestPackages/TemplateEngine/nupkg_templates/TestNupkgInstallTemplateV2.0.0.2.nupkg similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/nupkg_templates/TestNupkgInstallTemplateV2.0.0.2.nupkg rename to test/TestAssets/TestPackages/TemplateEngine/nupkg_templates/TestNupkgInstallTemplateV2.0.0.2.nupkg diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/ConfigurationKitchenSink/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/ConfigurationKitchenSink/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/ConfigurationKitchenSink/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/ConfigurationKitchenSink/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/ConfigurationKitchenSink/Company.ClassLibrary1.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/ConfigurationKitchenSink/Company.ClassLibrary1.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/ConfigurationKitchenSink/Company.ClassLibrary1.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/ConfigurationKitchenSink/Company.ClassLibrary1.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/ConfigurationKitchenSink/RenameBattery/A.txt b/test/TestAssets/TestPackages/TemplateEngine/test_templates/ConfigurationKitchenSink/RenameBattery/A.txt similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/ConfigurationKitchenSink/RenameBattery/A.txt rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/ConfigurationKitchenSink/RenameBattery/A.txt diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/ConfigurationKitchenSink/RenameBattery/C.txt b/test/TestAssets/TestPackages/TemplateEngine/test_templates/ConfigurationKitchenSink/RenameBattery/C.txt similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/ConfigurationKitchenSink/RenameBattery/C.txt rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/ConfigurationKitchenSink/RenameBattery/C.txt diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/ConfigurationKitchenSink/Test.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/ConfigurationKitchenSink/Test.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/ConfigurationKitchenSink/Test.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/ConfigurationKitchenSink/Test.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/ConfigurationKitchenSink/Test.css b/test/TestAssets/TestPackages/TemplateEngine/test_templates/ConfigurationKitchenSink/Test.css similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/ConfigurationKitchenSink/Test.css rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/ConfigurationKitchenSink/Test.css diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/ConfigurationKitchenSink/Test.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/ConfigurationKitchenSink/Test.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/ConfigurationKitchenSink/Test.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/ConfigurationKitchenSink/Test.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Constraints/RestrictedTemplate/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/Constraints/RestrictedTemplate/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Constraints/RestrictedTemplate/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/Constraints/RestrictedTemplate/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Constraints/RestrictedTemplate/bar.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/Constraints/RestrictedTemplate/bar.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Constraints/RestrictedTemplate/bar.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/Constraints/RestrictedTemplate/bar.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/DefaultIfOptionWithoutValue/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/DefaultIfOptionWithoutValue/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/DefaultIfOptionWithoutValue/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/DefaultIfOptionWithoutValue/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/DefaultIfOptionWithoutValue/ChoiceOtherFile.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/DefaultIfOptionWithoutValue/ChoiceOtherFile.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/DefaultIfOptionWithoutValue/ChoiceOtherFile.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/DefaultIfOptionWithoutValue/ChoiceOtherFile.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/DefaultIfOptionWithoutValue/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/DefaultIfOptionWithoutValue/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/DefaultIfOptionWithoutValue/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/DefaultIfOptionWithoutValue/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/DefaultIfOptionWithoutValue/StringOtherFile.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/DefaultIfOptionWithoutValue/StringOtherFile.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/DefaultIfOptionWithoutValue/StringOtherFile.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/DefaultIfOptionWithoutValue/StringOtherFile.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/InvalidHostData/.template.config/dotnetcli.host.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/InvalidHostData/.template.config/dotnetcli.host.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/InvalidHostData/.template.config/dotnetcli.host.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/InvalidHostData/.template.config/dotnetcli.host.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/InvalidHostData/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/InvalidHostData/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/InvalidHostData/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/InvalidHostData/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/InvalidHostData/global.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/InvalidHostData/global.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/InvalidHostData/global.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/InvalidHostData/global.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/Localization/InvalidFormat/.template.config/localize/templatestrings.de-DE.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/Localization/InvalidFormat/.template.config/localize/templatestrings.de-DE.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/Localization/InvalidFormat/.template.config/localize/templatestrings.de-DE.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/Localization/InvalidFormat/.template.config/localize/templatestrings.de-DE.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/Localization/InvalidFormat/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/Localization/InvalidFormat/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/Localization/InvalidFormat/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/Localization/InvalidFormat/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/Localization/InvalidFormat/bar.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/Localization/InvalidFormat/bar.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/Localization/InvalidFormat/bar.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/Localization/InvalidFormat/bar.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/Localization/ValidationFailure/.template.config/localize/templatestrings.de-DE.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/Localization/ValidationFailure/.template.config/localize/templatestrings.de-DE.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/Localization/ValidationFailure/.template.config/localize/templatestrings.de-DE.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/Localization/ValidationFailure/.template.config/localize/templatestrings.de-DE.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/Localization/ValidationFailure/.template.config/localize/templatestrings.tr.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/Localization/ValidationFailure/.template.config/localize/templatestrings.tr.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/Localization/ValidationFailure/.template.config/localize/templatestrings.tr.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/Localization/ValidationFailure/.template.config/localize/templatestrings.tr.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/Localization/ValidationFailure/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/Localization/ValidationFailure/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/Localization/ValidationFailure/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/Localization/ValidationFailure/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/Localization/ValidationFailure/bar.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/Localization/ValidationFailure/bar.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/Localization/ValidationFailure/bar.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/Localization/ValidationFailure/bar.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/MissingIdentity/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/MissingIdentity/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/MissingIdentity/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/MissingIdentity/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/MissingMandatoryConfig/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/MissingMandatoryConfig/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/MissingMandatoryConfig/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/MissingMandatoryConfig/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/SameShortName/TemplateA/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/SameShortName/TemplateA/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/SameShortName/TemplateA/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/SameShortName/TemplateA/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/SameShortName/TemplateA/bar.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/SameShortName/TemplateA/bar.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/SameShortName/TemplateA/bar.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/SameShortName/TemplateA/bar.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/SameShortName/TemplateB/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/SameShortName/TemplateB/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/SameShortName/TemplateB/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/SameShortName/TemplateB/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/SameShortName/TemplateB/bar.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/SameShortName/TemplateB/bar.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/Invalid/SameShortName/TemplateB/bar.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/Invalid/SameShortName/TemplateB/bar.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddPackageReference/Basic/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddPackageReference/Basic/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddPackageReference/Basic/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddPackageReference/Basic/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddPackageReference/Basic/Basic.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddPackageReference/Basic/Basic.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddPackageReference/Basic/Basic.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddPackageReference/Basic/Basic.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddPackageReference/Basic/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddPackageReference/Basic/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddPackageReference/Basic/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddPackageReference/Basic/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddPackageReference/BasicWithFiles/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddPackageReference/BasicWithFiles/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddPackageReference/BasicWithFiles/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddPackageReference/BasicWithFiles/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddPackageReference/BasicWithFiles/Basic.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddPackageReference/BasicWithFiles/Basic.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddPackageReference/BasicWithFiles/Basic.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddPackageReference/BasicWithFiles/Basic.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddPackageReference/BasicWithFiles/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddPackageReference/BasicWithFiles/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddPackageReference/BasicWithFiles/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddPackageReference/BasicWithFiles/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectReference/Basic/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectReference/Basic/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectReference/Basic/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectReference/Basic/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectReference/Basic/Project1/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectReference/Basic/Project1/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectReference/Basic/Project1/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectReference/Basic/Project1/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectReference/Basic/Project1/Project1.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectReference/Basic/Project1/Project1.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectReference/Basic/Project1/Project1.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectReference/Basic/Project1/Project1.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectReference/Basic/Project2/MyClass.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectReference/Basic/Project2/MyClass.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectReference/Basic/Project2/MyClass.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectReference/Basic/Project2/MyClass.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectReference/Basic/Project2/Project2.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectReference/Basic/Project2/Project2.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectReference/Basic/Project2/Project2.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectReference/Basic/Project2/Project2.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectToSolution/Basic/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectToSolution/Basic/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectToSolution/Basic/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectToSolution/Basic/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectToSolution/Basic/Basic.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectToSolution/Basic/Basic.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectToSolution/Basic/Basic.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectToSolution/Basic/Basic.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectToSolution/Basic/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectToSolution/Basic/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectToSolution/Basic/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectToSolution/Basic/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectToSolution/BasicWithFiles/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectToSolution/BasicWithFiles/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectToSolution/BasicWithFiles/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectToSolution/BasicWithFiles/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectToSolution/BasicWithFiles/Basic.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectToSolution/BasicWithFiles/Basic.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectToSolution/BasicWithFiles/Basic.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectToSolution/BasicWithFiles/Basic.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectToSolution/BasicWithFiles/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectToSolution/BasicWithFiles/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectToSolution/BasicWithFiles/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectToSolution/BasicWithFiles/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectToSolution/BasicWithIndexes/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectToSolution/BasicWithIndexes/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectToSolution/BasicWithIndexes/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectToSolution/BasicWithIndexes/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectToSolution/BasicWithIndexes/Client/Client.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectToSolution/BasicWithIndexes/Client/Client.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectToSolution/BasicWithIndexes/Client/Client.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectToSolution/BasicWithIndexes/Client/Client.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectToSolution/BasicWithIndexes/Client/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectToSolution/BasicWithIndexes/Client/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectToSolution/BasicWithIndexes/Client/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectToSolution/BasicWithIndexes/Client/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectToSolution/BasicWithIndexes/Server/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectToSolution/BasicWithIndexes/Server/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectToSolution/BasicWithIndexes/Server/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectToSolution/BasicWithIndexes/Server/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectToSolution/BasicWithIndexes/Server/Server.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectToSolution/BasicWithIndexes/Server/Server.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/AddProjectToSolution/BasicWithIndexes/Server/Server.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/AddProjectToSolution/BasicWithIndexes/Server/Server.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/Instructions/Basic/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/Instructions/Basic/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/Instructions/Basic/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/Instructions/Basic/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/Instructions/Basic/Class1.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/Instructions/Basic/Class1.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/Instructions/Basic/Class1.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/Instructions/Basic/Class1.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/Basic/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/Basic/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/Basic/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/Basic/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/Basic/Basic.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/Basic/Basic.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/Basic/Basic.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/Basic/Basic.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/Basic/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/Basic/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/Basic/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/Basic/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/BasicWithFiles/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/BasicWithFiles/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/BasicWithFiles/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/BasicWithFiles/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/BasicWithFiles/Basic.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/BasicWithFiles/Basic.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/BasicWithFiles/Basic.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/BasicWithFiles/Basic.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/BasicWithFiles/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/BasicWithFiles/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/BasicWithFiles/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/BasicWithFiles/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomSourcePath/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomSourcePath/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomSourcePath/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomSourcePath/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomSourcePath/Custom/Path/Basic.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomSourcePath/Custom/Path/Basic.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomSourcePath/Custom/Path/Basic.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomSourcePath/Custom/Path/Basic.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomSourcePath/Custom/Path/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomSourcePath/Custom/Path/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomSourcePath/Custom/Path/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomSourcePath/Custom/Path/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomSourcePathFiles/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomSourcePathFiles/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomSourcePathFiles/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomSourcePathFiles/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomSourcePathFiles/Custom/Path/Basic.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomSourcePathFiles/Custom/Path/Basic.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomSourcePathFiles/Custom/Path/Basic.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomSourcePathFiles/Custom/Path/Basic.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomSourcePathFiles/Custom/Path/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomSourcePathFiles/Custom/Path/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomSourcePathFiles/Custom/Path/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomSourcePathFiles/Custom/Path/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPath/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPath/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPath/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPath/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPath/Src/Custom/Path/Basic.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPath/Src/Custom/Path/Basic.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPath/Src/Custom/Path/Basic.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPath/Src/Custom/Path/Basic.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPath/Src/Custom/Path/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPath/Src/Custom/Path/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPath/Src/Custom/Path/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPath/Src/Custom/Path/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPathFiles/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPathFiles/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPathFiles/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPathFiles/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPathFiles/Src/Custom/Path/Basic.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPathFiles/Src/Custom/Path/Basic.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPathFiles/Src/Custom/Path/Basic.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPathFiles/Src/Custom/Path/Basic.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPathFiles/Src/Custom/Path/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPathFiles/Src/Custom/Path/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPathFiles/Src/Custom/Path/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPathFiles/Src/Custom/Path/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomTargetPath/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomTargetPath/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomTargetPath/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomTargetPath/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomTargetPath/Basic.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomTargetPath/Basic.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomTargetPath/Basic.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomTargetPath/Basic.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomTargetPath/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomTargetPath/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomTargetPath/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomTargetPath/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomTargetPathFiles/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomTargetPathFiles/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomTargetPathFiles/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomTargetPathFiles/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomTargetPathFiles/Basic.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomTargetPathFiles/Basic.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomTargetPathFiles/Basic.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomTargetPathFiles/Basic.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomTargetPathFiles/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomTargetPathFiles/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/CustomTargetPathFiles/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/CustomTargetPathFiles/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/Invalid/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/Invalid/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/Invalid/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/Invalid/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/Invalid/Invalid.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/Invalid/Invalid.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/Invalid/Invalid.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/Invalid/Invalid.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/Invalid/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/Invalid/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/Invalid/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/Invalid/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/Invalid_ContinueOnError/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/Invalid_ContinueOnError/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/Invalid_ContinueOnError/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/Invalid_ContinueOnError/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/Invalid_ContinueOnError/Invalid.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/Invalid_ContinueOnError/Invalid.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/Invalid_ContinueOnError/Invalid.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/Invalid_ContinueOnError/Invalid.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/Invalid_ContinueOnError/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/Invalid_ContinueOnError/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/Invalid_ContinueOnError/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/Invalid_ContinueOnError/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/SourceRename/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/SourceRename/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/SourceRename/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/SourceRename/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/SourceRename/Basic.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/SourceRename/Basic.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/SourceRename/Basic.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/SourceRename/Basic.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/SourceRename/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/SourceRename/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/SourceRename/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/SourceRename/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/SourceRenameFiles/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/SourceRenameFiles/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/SourceRenameFiles/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/SourceRenameFiles/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/SourceRenameFiles/Basic.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/SourceRenameFiles/Basic.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/SourceRenameFiles/Basic.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/SourceRenameFiles/Basic.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/SourceRenameFiles/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/SourceRenameFiles/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/SourceRenameFiles/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/SourceRenameFiles/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject.Tests/MyTestProject.Tests.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject.Tests/MyTestProject.Tests.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject.Tests/MyTestProject.Tests.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject.Tests/MyTestProject.Tests.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject.Tests/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject.Tests/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject.Tests/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject.Tests/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject/MyTestProject.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject/MyTestProject.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject/MyTestProject.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject/MyTestProject.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject.Tests/MyTestProject.Tests.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject.Tests/MyTestProject.Tests.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject.Tests/MyTestProject.Tests.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject.Tests/MyTestProject.Tests.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject.Tests/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject.Tests/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject.Tests/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject.Tests/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject/MyTestProject.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject/MyTestProject.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject/MyTestProject.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject/MyTestProject.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject1/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject1/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject1/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject1/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject1/TemplateProject1.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject1/TemplateProject1.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject1/TemplateProject1.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject1/TemplateProject1.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject2/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject2/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject2/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject2/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject2/TemplateProject2.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject2/TemplateProject2.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject2/TemplateProject2.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject2/TemplateProject2.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject1/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject1/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject1/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject1/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject1/TemplateProject1.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject1/TemplateProject1.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject1/TemplateProject1.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject1/TemplateProject1.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject2/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject2/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject2/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject2/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject2/TemplateProject2.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject2/TemplateProject2.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject2/TemplateProject2.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject2/TemplateProject2.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RunScript/Basic/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RunScript/Basic/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RunScript/Basic/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RunScript/Basic/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RunScript/Basic/setup.cmd b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RunScript/Basic/setup.cmd similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RunScript/Basic/setup.cmd rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RunScript/Basic/setup.cmd diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RunScript/Basic/setup.sh b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RunScript/Basic/setup.sh similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RunScript/Basic/setup.sh rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RunScript/Basic/setup.sh diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RunScript/DoNotRedirect/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RunScript/DoNotRedirect/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RunScript/DoNotRedirect/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RunScript/DoNotRedirect/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RunScript/DoNotRedirect/setup.cmd b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RunScript/DoNotRedirect/setup.cmd similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RunScript/DoNotRedirect/setup.cmd rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RunScript/DoNotRedirect/setup.cmd diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RunScript/DoNotRedirect/setup.sh b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RunScript/DoNotRedirect/setup.sh similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RunScript/DoNotRedirect/setup.sh rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RunScript/DoNotRedirect/setup.sh diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RunScript/Redirect/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RunScript/Redirect/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RunScript/Redirect/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RunScript/Redirect/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RunScript/Redirect/setup.cmd b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RunScript/Redirect/setup.cmd similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RunScript/Redirect/setup.cmd rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RunScript/Redirect/setup.cmd diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RunScript/Redirect/setup.sh b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RunScript/Redirect/setup.sh similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RunScript/Redirect/setup.sh rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RunScript/Redirect/setup.sh diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RunScript/RedirectOnError/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RunScript/RedirectOnError/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RunScript/RedirectOnError/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RunScript/RedirectOnError/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RunScript/RedirectOnError/setup.cmd b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RunScript/RedirectOnError/setup.cmd similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RunScript/RedirectOnError/setup.cmd rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RunScript/RedirectOnError/setup.cmd diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RunScript/RedirectOnError/setup.sh b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RunScript/RedirectOnError/setup.sh similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/RunScript/RedirectOnError/setup.sh rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/RunScript/RedirectOnError/setup.sh diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/UnknownPostAction/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/UnknownPostAction/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/UnknownPostAction/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/UnknownPostAction/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/UnknownPostAction/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/UnknownPostAction/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/UnknownPostAction/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/UnknownPostAction/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/UnknownPostAction/UnknownPostAction.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/UnknownPostAction/UnknownPostAction.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/UnknownPostAction/UnknownPostAction.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/UnknownPostAction/UnknownPostAction.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/WithFileRename/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/WithFileRename/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/WithFileRename/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/WithFileRename/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/WithFileRename/MyTestProject.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/WithFileRename/MyTestProject.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/WithFileRename/MyTestProject.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/WithFileRename/MyTestProject.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/WithFileRename/testfile.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/WithFileRename/testfile.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/WithFileRename/testfile.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/WithFileRename/testfile.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/SourceNameForms/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/SourceNameForms/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/SourceNameForms/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/SourceNameForms/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/SourceNameForms/Good.Source.Name.1.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/SourceNameForms/Good.Source.Name.1.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/SourceNameForms/Good.Source.Name.1.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/SourceNameForms/Good.Source.Name.1.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/SourceNameForms/fileRename-name-lc2.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/SourceNameForms/fileRename-name-lc2.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/SourceNameForms/fileRename-name-lc2.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/SourceNameForms/fileRename-name-lc2.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/SourceWithExcludeAndWithout/With/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/SourceWithExcludeAndWithout/With/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/SourceWithExcludeAndWithout/With/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/SourceWithExcludeAndWithout/With/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/SourceWithExcludeAndWithout/With/bar.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/SourceWithExcludeAndWithout/With/bar.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/SourceWithExcludeAndWithout/With/bar.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/SourceWithExcludeAndWithout/With/bar.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/SourceWithExcludeAndWithout/With/foo.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/SourceWithExcludeAndWithout/With/foo.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/SourceWithExcludeAndWithout/With/foo.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/SourceWithExcludeAndWithout/With/foo.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/SourceWithExcludeAndWithout/With/packages.lock.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/SourceWithExcludeAndWithout/With/packages.lock.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/SourceWithExcludeAndWithout/With/packages.lock.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/SourceWithExcludeAndWithout/With/packages.lock.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/SourceWithExcludeAndWithout/Without/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/SourceWithExcludeAndWithout/Without/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/SourceWithExcludeAndWithout/Without/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/SourceWithExcludeAndWithout/Without/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/SourceWithExcludeAndWithout/Without/bar.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/SourceWithExcludeAndWithout/Without/bar.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/SourceWithExcludeAndWithout/Without/bar.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/SourceWithExcludeAndWithout/Without/bar.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/SourceWithExcludeAndWithout/Without/foo.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/SourceWithExcludeAndWithout/Without/foo.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/SourceWithExcludeAndWithout/Without/foo.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/SourceWithExcludeAndWithout/Without/foo.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/SourceWithExcludeAndWithout/Without/packages.lock.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/SourceWithExcludeAndWithout/Without/packages.lock.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/SourceWithExcludeAndWithout/Without/packages.lock.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/SourceWithExcludeAndWithout/Without/packages.lock.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.cmd b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.cmd similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.cmd rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.cmd diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.cpp b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.cpp similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.cpp rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.cpp diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.cshtml b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.cshtml similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.cshtml rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.cshtml diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.css b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.css similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.css rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.css diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.fs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.fs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.fs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.fs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.haml b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.haml similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.haml rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.haml diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.js b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.js similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.js rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.js diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.jsx b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.jsx similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.jsx rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.jsx diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.othertype b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.othertype similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.othertype rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.othertype diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.ts b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.ts similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.ts rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.ts diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.vb b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.vb similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.vb rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.vb diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.xml b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.xml similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.xml rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.xml diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.yml b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.yml similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateConditionalProcessing/Test.yml rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateConditionalProcessing/Test.yml diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateGrouping/CSharpItemAuthor1/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateGrouping/CSharpItemAuthor1/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateGrouping/CSharpItemAuthor1/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateGrouping/CSharpItemAuthor1/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateGrouping/FSharpItemAuthor1/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateGrouping/FSharpItemAuthor1/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateGrouping/FSharpItemAuthor1/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateGrouping/FSharpItemAuthor1/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateGrouping/QSharpItemAuthor2/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateGrouping/QSharpItemAuthor2/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateGrouping/QSharpItemAuthor2/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateGrouping/QSharpItemAuthor2/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateGrouping/QSharpProjectAuthor2/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateGrouping/QSharpProjectAuthor2/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateGrouping/QSharpProjectAuthor2/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateGrouping/QSharpProjectAuthor2/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateResolution/DifferentLanguagesGroup/BasicFSharp/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateResolution/DifferentLanguagesGroup/BasicFSharp/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateResolution/DifferentLanguagesGroup/BasicFSharp/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateResolution/DifferentLanguagesGroup/BasicFSharp/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateResolution/DifferentLanguagesGroup/BasicFSharp/bar.fs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateResolution/DifferentLanguagesGroup/BasicFSharp/bar.fs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateResolution/DifferentLanguagesGroup/BasicFSharp/bar.fs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateResolution/DifferentLanguagesGroup/BasicFSharp/bar.fs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateResolution/DifferentLanguagesGroup/BasicVB/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateResolution/DifferentLanguagesGroup/BasicVB/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateResolution/DifferentLanguagesGroup/BasicVB/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateResolution/DifferentLanguagesGroup/BasicVB/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateResolution/DifferentLanguagesGroup/BasicVB/bar.vb b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateResolution/DifferentLanguagesGroup/BasicVB/bar.vb similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateResolution/DifferentLanguagesGroup/BasicVB/bar.vb rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateResolution/DifferentLanguagesGroup/BasicVB/bar.vb diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateResolution/SamePrecedenceGroup/BasicTemplate1/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateResolution/SamePrecedenceGroup/BasicTemplate1/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateResolution/SamePrecedenceGroup/BasicTemplate1/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateResolution/SamePrecedenceGroup/BasicTemplate1/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateResolution/SamePrecedenceGroup/BasicTemplate1/bar.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateResolution/SamePrecedenceGroup/BasicTemplate1/bar.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateResolution/SamePrecedenceGroup/BasicTemplate1/bar.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateResolution/SamePrecedenceGroup/BasicTemplate1/bar.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateResolution/SamePrecedenceGroup/BasicTemplate2/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateResolution/SamePrecedenceGroup/BasicTemplate2/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateResolution/SamePrecedenceGroup/BasicTemplate2/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateResolution/SamePrecedenceGroup/BasicTemplate2/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateResolution/SamePrecedenceGroup/BasicTemplate2/bar.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateResolution/SamePrecedenceGroup/BasicTemplate2/bar.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateResolution/SamePrecedenceGroup/BasicTemplate2/bar.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateResolution/SamePrecedenceGroup/BasicTemplate2/bar.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateResolution/SameShortName/BasicFSharp/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateResolution/SameShortName/BasicFSharp/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateResolution/SameShortName/BasicFSharp/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateResolution/SameShortName/BasicFSharp/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateResolution/SameShortName/BasicFSharp/bar.fs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateResolution/SameShortName/BasicFSharp/bar.fs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateResolution/SameShortName/BasicFSharp/bar.fs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateResolution/SameShortName/BasicFSharp/bar.fs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateResolution/SameShortName/BasicVB/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateResolution/SameShortName/BasicVB/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateResolution/SameShortName/BasicVB/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateResolution/SameShortName/BasicVB/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateResolution/SameShortName/BasicVB/bar.vb b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateResolution/SameShortName/BasicVB/bar.vb similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateResolution/SameShortName/BasicVB/bar.vb rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateResolution/SameShortName/BasicVB/bar.vb diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithBinaryFile/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithBinaryFile/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithBinaryFile/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithBinaryFile/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithBinaryFile/image.png b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithBinaryFile/image.png similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithBinaryFile/image.png rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithBinaryFile/image.png diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithBooleanParameters/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithBooleanParameters/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithBooleanParameters/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithBooleanParameters/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithBooleanParameters/bar-computed.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithBooleanParameters/bar-computed.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithBooleanParameters/bar-computed.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithBooleanParameters/bar-computed.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithBooleanParameters/bar.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithBooleanParameters/bar.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithBooleanParameters/bar.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithBooleanParameters/bar.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithBooleanParameters/bar.props b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithBooleanParameters/bar.props similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithBooleanParameters/bar.props rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithBooleanParameters/bar.props diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithBooleanParameters/bar.vb b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithBooleanParameters/bar.vb similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithBooleanParameters/bar.vb rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithBooleanParameters/bar.vb diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithBrokenGeneratedInComputed/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithBrokenGeneratedInComputed/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithBrokenGeneratedInComputed/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithBrokenGeneratedInComputed/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithBrokenGeneratedInComputed/MyProject.Helper.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithBrokenGeneratedInComputed/MyProject.Helper.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithBrokenGeneratedInComputed/MyProject.Helper.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithBrokenGeneratedInComputed/MyProject.Helper.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithBrokenGeneratedInComputed/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithBrokenGeneratedInComputed/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithBrokenGeneratedInComputed/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithBrokenGeneratedInComputed/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithCaseSensitiveNameBasedRenames/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithCaseSensitiveNameBasedRenames/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithCaseSensitiveNameBasedRenames/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithCaseSensitiveNameBasedRenames/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithCaseSensitiveNameBasedRenames/Norenamepart/FileNorenamepart.txt b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithCaseSensitiveNameBasedRenames/Norenamepart/FileNorenamepart.txt similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithCaseSensitiveNameBasedRenames/Norenamepart/FileNorenamepart.txt rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithCaseSensitiveNameBasedRenames/Norenamepart/FileNorenamepart.txt diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithCaseSensitiveNameBasedRenames/Norenamepart/FileYesRenamePart.txt b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithCaseSensitiveNameBasedRenames/Norenamepart/FileYesRenamePart.txt similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithCaseSensitiveNameBasedRenames/Norenamepart/FileYesRenamePart.txt rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithCaseSensitiveNameBasedRenames/Norenamepart/FileYesRenamePart.txt diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithCaseSensitiveNameBasedRenames/YesRenamePart/FileNorenamepart.txt b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithCaseSensitiveNameBasedRenames/YesRenamePart/FileNorenamepart.txt similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithCaseSensitiveNameBasedRenames/YesRenamePart/FileNorenamepart.txt rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithCaseSensitiveNameBasedRenames/YesRenamePart/FileNorenamepart.txt diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithCaseSensitiveNameBasedRenames/YesRenamePart/FileYesRenamePart.txt b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithCaseSensitiveNameBasedRenames/YesRenamePart/FileYesRenamePart.txt similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithCaseSensitiveNameBasedRenames/YesRenamePart/FileYesRenamePart.txt rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithCaseSensitiveNameBasedRenames/YesRenamePart/FileYesRenamePart.txt diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithCircleDependencyInMacros/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithCircleDependencyInMacros/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithCircleDependencyInMacros/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithCircleDependencyInMacros/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithCircleDependencyInMacros/MyProject.Helper.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithCircleDependencyInMacros/MyProject.Helper.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithCircleDependencyInMacros/MyProject.Helper.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithCircleDependencyInMacros/MyProject.Helper.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithCircleDependencyInMacros/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithCircleDependencyInMacros/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithCircleDependencyInMacros/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithCircleDependencyInMacros/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithCliHostFile/.template.config/dotnetcli.host.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithCliHostFile/.template.config/dotnetcli.host.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithCliHostFile/.template.config/dotnetcli.host.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithCliHostFile/.template.config/dotnetcli.host.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithCliHostFile/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithCliHostFile/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithCliHostFile/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithCliHostFile/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithCliHostFile/bar.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithCliHostFile/bar.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithCliHostFile/bar.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithCliHostFile/bar.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithComputedInDerivedThroughGenerated/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithComputedInDerivedThroughGenerated/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithComputedInDerivedThroughGenerated/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithComputedInDerivedThroughGenerated/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithComputedInDerivedThroughGenerated/MyProject.Helper.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithComputedInDerivedThroughGenerated/MyProject.Helper.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithComputedInDerivedThroughGenerated/MyProject.Helper.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithComputedInDerivedThroughGenerated/MyProject.Helper.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithComputedInDerivedThroughGenerated/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithComputedInDerivedThroughGenerated/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithComputedInDerivedThroughGenerated/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithComputedInDerivedThroughGenerated/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithComputedInGenerated/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithComputedInGenerated/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithComputedInGenerated/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithComputedInGenerated/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithComputedInGenerated/MyProject.Helper.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithComputedInGenerated/MyProject.Helper.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithComputedInGenerated/MyProject.Helper.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithComputedInGenerated/MyProject.Helper.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithComputedInGenerated/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithComputedInGenerated/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithComputedInGenerated/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithComputedInGenerated/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditionalParameters/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditionalParameters/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditionalParameters/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditionalParameters/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditionalParameters/Test.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditionalParameters/Test.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditionalParameters/Test.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditionalParameters/Test.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/.dockerignore b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/.dockerignore similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/.dockerignore rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/.dockerignore diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/.editorconfig b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/.editorconfig similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/.editorconfig rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/.editorconfig diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/.gitattributes b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/.gitattributes similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/.gitattributes rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/.gitattributes diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/.gitignore b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/.gitignore similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/.gitignore rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/.gitignore diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/Dockerfile b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/Dockerfile similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/Dockerfile rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/Dockerfile diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/Package.appxmanifest b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/Package.appxmanifest similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/Package.appxmanifest rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/Package.appxmanifest diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/nuget.config b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/nuget.config similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/nuget.config rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/nuget.config diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/test.axaml b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/test.axaml similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/test.axaml rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/test.axaml diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/test.cake b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/test.cake similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/test.cake rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/test.cake diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/test.md b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/test.md similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/test.md rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/test.md diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/test.ps1 b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/test.ps1 similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/test.ps1 rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/test.ps1 diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/test.sln b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/test.sln similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/test.sln rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/test.sln diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/test.slnx b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/test.slnx similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/test.slnx rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/test.slnx diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/test.yaml b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/test.yaml similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/test.yaml rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithConditions/test.yaml diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithDerivedSymbolFileRename/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithDerivedSymbolFileRename/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithDerivedSymbolFileRename/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithDerivedSymbolFileRename/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithDerivedSymbolFileRename/Application1.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithDerivedSymbolFileRename/Application1.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithDerivedSymbolFileRename/Application1.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithDerivedSymbolFileRename/Application1.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithDerivedSymbolWithValueForms/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithDerivedSymbolWithValueForms/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithDerivedSymbolWithValueForms/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithDerivedSymbolWithValueForms/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithDerivedSymbolWithValueForms/ContentTest.txt b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithDerivedSymbolWithValueForms/ContentTest.txt similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithDerivedSymbolWithValueForms/ContentTest.txt rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithDerivedSymbolWithValueForms/ContentTest.txt diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithDerivedSymbolWithValueForms/SomeApp1.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithDerivedSymbolWithValueForms/SomeApp1.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithDerivedSymbolWithValueForms/SomeApp1.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithDerivedSymbolWithValueForms/SomeApp1.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithFileRenameDate/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithFileRenameDate/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithFileRenameDate/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithFileRenameDate/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithFileRenameDate/date_name.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithFileRenameDate/date_name.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithFileRenameDate/date_name.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithFileRenameDate/date_name.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGenSymbolWithRefToDerivedSymbol_DifferentOrder/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGenSymbolWithRefToDerivedSymbol_DifferentOrder/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGenSymbolWithRefToDerivedSymbol_DifferentOrder/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGenSymbolWithRefToDerivedSymbol_DifferentOrder/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGenSymbolWithRefToDerivedSymbol_DifferentOrder/MyProject.Helper.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGenSymbolWithRefToDerivedSymbol_DifferentOrder/MyProject.Helper.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGenSymbolWithRefToDerivedSymbol_DifferentOrder/MyProject.Helper.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGenSymbolWithRefToDerivedSymbol_DifferentOrder/MyProject.Helper.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGenSymbolWithRefToDerivedSymbol_DifferentOrder/Tool.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGenSymbolWithRefToDerivedSymbol_DifferentOrder/Tool.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGenSymbolWithRefToDerivedSymbol_DifferentOrder/Tool.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGenSymbolWithRefToDerivedSymbol_DifferentOrder/Tool.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGenSymbolWithRefToDerivedSymbol_DifferentOrder/ToolExtension.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGenSymbolWithRefToDerivedSymbol_DifferentOrder/ToolExtension.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGenSymbolWithRefToDerivedSymbol_DifferentOrder/ToolExtension.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGenSymbolWithRefToDerivedSymbol_DifferentOrder/ToolExtension.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGeneratedInComputed/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGeneratedInComputed/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGeneratedInComputed/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGeneratedInComputed/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGeneratedInComputed/MyProject.Helper.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGeneratedInComputed/MyProject.Helper.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGeneratedInComputed/MyProject.Helper.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGeneratedInComputed/MyProject.Helper.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGeneratedInComputed/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGeneratedInComputed/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGeneratedInComputed/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGeneratedInComputed/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGeneratedSwitchInComputed/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGeneratedSwitchInComputed/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGeneratedSwitchInComputed/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGeneratedSwitchInComputed/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGeneratedSwitchInComputed/MyProject.Helper.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGeneratedSwitchInComputed/MyProject.Helper.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGeneratedSwitchInComputed/MyProject.Helper.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGeneratedSwitchInComputed/MyProject.Helper.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGeneratedSwitchInComputed/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGeneratedSwitchInComputed/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGeneratedSwitchInComputed/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGeneratedSwitchInComputed/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGeneratedSymbolWithRefToDerivedSymbol/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGeneratedSymbolWithRefToDerivedSymbol/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGeneratedSymbolWithRefToDerivedSymbol/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGeneratedSymbolWithRefToDerivedSymbol/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGeneratedSymbolWithRefToDerivedSymbol/MyProject.Helper.csproj b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGeneratedSymbolWithRefToDerivedSymbol/MyProject.Helper.csproj similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGeneratedSymbolWithRefToDerivedSymbol/MyProject.Helper.csproj rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGeneratedSymbolWithRefToDerivedSymbol/MyProject.Helper.csproj diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGeneratedSymbolWithRefToDerivedSymbol/Tool.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGeneratedSymbolWithRefToDerivedSymbol/Tool.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGeneratedSymbolWithRefToDerivedSymbol/Tool.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGeneratedSymbolWithRefToDerivedSymbol/Tool.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGeneratedSymbolWithRefToDerivedSymbol/ToolExtension.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGeneratedSymbolWithRefToDerivedSymbol/ToolExtension.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithGeneratedSymbolWithRefToDerivedSymbol/ToolExtension.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithGeneratedSymbolWithRefToDerivedSymbol/ToolExtension.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithJoinAndFolderRename/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithJoinAndFolderRename/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithJoinAndFolderRename/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithJoinAndFolderRename/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithJoinAndFolderRename/Api/bar.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithJoinAndFolderRename/Api/bar.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithJoinAndFolderRename/Api/bar.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithJoinAndFolderRename/Api/bar.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithLocalization/.template.config/localize/templatestrings.de-DE.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithLocalization/.template.config/localize/templatestrings.de-DE.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithLocalization/.template.config/localize/templatestrings.de-DE.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithLocalization/.template.config/localize/templatestrings.de-DE.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithLocalization/.template.config/localize/templatestrings.tr.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithLocalization/.template.config/localize/templatestrings.tr.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithLocalization/.template.config/localize/templatestrings.tr.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithLocalization/.template.config/localize/templatestrings.tr.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithLocalization/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithLocalization/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithLocalization/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithLocalization/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithLocalization/bar.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithLocalization/bar.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithLocalization/bar.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithLocalization/bar.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultiValueChoice/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithMultiValueChoice/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultiValueChoice/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithMultiValueChoice/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultiValueChoice/Test.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithMultiValueChoice/Test.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultiValueChoice/Test.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithMultiValueChoice/Test.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultipleChoicesAndCoalesce/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithMultipleChoicesAndCoalesce/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultipleChoicesAndCoalesce/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithMultipleChoicesAndCoalesce/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultipleChoicesAndCoalesce/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithMultipleChoicesAndCoalesce/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultipleChoicesAndCoalesce/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithMultipleChoicesAndCoalesce/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultipleChoicesAndPartialMatches/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithMultipleChoicesAndPartialMatches/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultipleChoicesAndPartialMatches/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithMultipleChoicesAndPartialMatches/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultipleChoicesAndPartialMatches/Program.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithMultipleChoicesAndPartialMatches/Program.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultipleChoicesAndPartialMatches/Program.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithMultipleChoicesAndPartialMatches/Program.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultipleRenamesOnSameFile/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithMultipleRenamesOnSameFile/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultipleRenamesOnSameFile/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithMultipleRenamesOnSameFile/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultipleRenamesOnSameFile/barandfoo.txt b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithMultipleRenamesOnSameFile/barandfoo.txt similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultipleRenamesOnSameFile/barandfoo.txt rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithMultipleRenamesOnSameFile/barandfoo.txt diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultipleRenamesOnSameFile/foobar.txt b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithMultipleRenamesOnSameFile/foobar.txt similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultipleRenamesOnSameFile/foobar.txt rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithMultipleRenamesOnSameFile/foobar.txt diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultipleRenamesOnSameFileHandlesInducedOverlap/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithMultipleRenamesOnSameFileHandlesInducedOverlap/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultipleRenamesOnSameFileHandlesInducedOverlap/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithMultipleRenamesOnSameFileHandlesInducedOverlap/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultipleRenamesOnSameFileHandlesInducedOverlap/foo.txt b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithMultipleRenamesOnSameFileHandlesInducedOverlap/foo.txt similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultipleRenamesOnSameFileHandlesInducedOverlap/foo.txt rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithMultipleRenamesOnSameFileHandlesInducedOverlap/foo.txt diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultipleRenamesOnSameFileHandlesOverlap/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithMultipleRenamesOnSameFileHandlesOverlap/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultipleRenamesOnSameFileHandlesOverlap/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithMultipleRenamesOnSameFileHandlesOverlap/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultipleRenamesOnSameFileHandlesOverlap/foob.txt b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithMultipleRenamesOnSameFileHandlesOverlap/foob.txt similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithMultipleRenamesOnSameFileHandlesOverlap/foob.txt rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithMultipleRenamesOnSameFileHandlesOverlap/foob.txt diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithOnlyIfForLocalhost/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithOnlyIfForLocalhost/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithOnlyIfForLocalhost/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithOnlyIfForLocalhost/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithOnlyIfForLocalhost/test.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithOnlyIfForLocalhost/test.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithOnlyIfForLocalhost/test.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithOnlyIfForLocalhost/test.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithOnlyIfStatement/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithOnlyIfStatement/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithOnlyIfStatement/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithOnlyIfStatement/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithOnlyIfStatement/test.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithOnlyIfStatement/test.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithOnlyIfStatement/test.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithOnlyIfStatement/test.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithPlaceholderFiles/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithPlaceholderFiles/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithPlaceholderFiles/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithPlaceholderFiles/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithPlaceholderFiles/Src/Path/bar/_._ b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithPlaceholderFiles/Src/Path/bar/_._ similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithPlaceholderFiles/Src/Path/bar/_._ rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithPlaceholderFiles/Src/Path/bar/_._ diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithPlaceholderFiles/Src/Path/foo/_._ b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithPlaceholderFiles/Src/Path/foo/_._ similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithPlaceholderFiles/Src/Path/foo/_._ rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithPlaceholderFiles/Src/Path/foo/_._ diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithPortsAndCoalesce/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithPortsAndCoalesce/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithPortsAndCoalesce/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithPortsAndCoalesce/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithPortsAndCoalesce/bar.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithPortsAndCoalesce/bar.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithPortsAndCoalesce/bar.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithPortsAndCoalesce/bar.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithPreferDefaultName/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithPreferDefaultName/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithPreferDefaultName/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithPreferDefaultName/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithPreferDefaultName/toChange.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithPreferDefaultName/toChange.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithPreferDefaultName/toChange.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithPreferDefaultName/toChange.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithPreferDefaultNameButNoDefaultName/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithPreferDefaultNameButNoDefaultName/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithPreferDefaultNameButNoDefaultName/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithPreferDefaultNameButNoDefaultName/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithPreferDefaultNameButNoDefaultName/toChange.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithPreferDefaultNameButNoDefaultName/toChange.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithPreferDefaultNameButNoDefaultName/toChange.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithPreferDefaultNameButNoDefaultName/toChange.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithRegexMatchMacro/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithRegexMatchMacro/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithRegexMatchMacro/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithRegexMatchMacro/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithRegexMatchMacro/bar.2.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithRegexMatchMacro/bar.2.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithRegexMatchMacro/bar.2.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithRegexMatchMacro/bar.2.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithRegexMatchMacro/bar.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithRegexMatchMacro/bar.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithRegexMatchMacro/bar.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithRegexMatchMacro/bar.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithRenames/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithRenames/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithRenames/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithRenames/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithRenames/MYPROJECT3.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithRenames/MYPROJECT3.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithRenames/MYPROJECT3.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithRenames/MYPROJECT3.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithRenames/MyProject1.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithRenames/MyProject1.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithRenames/MyProject1.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithRenames/MyProject1.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithRenames/bar.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithRenames/bar.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithRenames/bar.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithRenames/bar.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithRenames/bar/bar.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithRenames/bar/bar.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithRenames/bar/bar.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithRenames/bar/bar.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithRenames/myproject2.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithRenames/myproject2.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithRenames/myproject2.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithRenames/myproject2.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithRenames/uc/bar_uc.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithRenames/uc/bar_uc.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithRenames/uc/bar_uc.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithRenames/uc/bar_uc.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceBasedRenames/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceBasedRenames/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceBasedRenames/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceBasedRenames/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceBasedRenames/foo.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceBasedRenames/foo.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceBasedRenames/foo.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceBasedRenames/foo.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceName/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceName/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceName/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceName/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceName/bar.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceName/bar.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceName/bar.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceName/bar.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceName/bar/bar.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceName/bar/bar.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceName/bar/bar.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceName/bar/bar.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceNameAndCustomSourceAndTargetPaths/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceNameAndCustomSourceAndTargetPaths/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceNameAndCustomSourceAndTargetPaths/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceNameAndCustomSourceAndTargetPaths/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceNameAndCustomSourceAndTargetPaths/Src/Custom/Path/foo.name.txt b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceNameAndCustomSourceAndTargetPaths/Src/Custom/Path/foo.name.txt similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceNameAndCustomSourceAndTargetPaths/Src/Custom/Path/foo.name.txt rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceNameAndCustomSourceAndTargetPaths/Src/Custom/Path/foo.name.txt diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceNameAndCustomSourceAndTargetPaths/Src/Custom/Path/foo/foo.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceNameAndCustomSourceAndTargetPaths/Src/Custom/Path/foo/foo.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceNameAndCustomSourceAndTargetPaths/Src/Custom/Path/foo/foo.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceNameAndCustomSourceAndTargetPaths/Src/Custom/Path/foo/foo.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceNameAndCustomSourcePath/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceNameAndCustomSourcePath/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceNameAndCustomSourcePath/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceNameAndCustomSourcePath/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceNameAndCustomSourcePath/Custom/Path/foo.name.txt b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceNameAndCustomSourcePath/Custom/Path/foo.name.txt similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceNameAndCustomSourcePath/Custom/Path/foo.name.txt rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceNameAndCustomSourcePath/Custom/Path/foo.name.txt diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceNameAndCustomSourcePath/Custom/Path/foo/foo.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceNameAndCustomSourcePath/Custom/Path/foo/foo.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceNameAndCustomSourcePath/Custom/Path/foo/foo.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceNameAndCustomSourcePath/Custom/Path/foo/foo.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceNameAndCustomTargetPath/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceNameAndCustomTargetPath/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceNameAndCustomTargetPath/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceNameAndCustomTargetPath/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceNameAndCustomTargetPath/foo.name.txt b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceNameAndCustomTargetPath/foo.name.txt similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceNameAndCustomTargetPath/foo.name.txt rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceNameAndCustomTargetPath/foo.name.txt diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceNameAndCustomTargetPath/foo/foo.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceNameAndCustomTargetPath/foo/foo.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceNameAndCustomTargetPath/foo/foo.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceNameAndCustomTargetPath/foo/foo.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceNameInTargetPathGetsRenamed/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceNameInTargetPathGetsRenamed/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceNameInTargetPathGetsRenamed/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceNameInTargetPathGetsRenamed/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceNameInTargetPathGetsRenamed/foo.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceNameInTargetPathGetsRenamed/foo.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourceNameInTargetPathGetsRenamed/foo.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourceNameInTargetPathGetsRenamed/foo.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourcePathOutsideConfigRoot/MountPointRoot/foo/bar/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourcePathOutsideConfigRoot/MountPointRoot/foo/bar/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourcePathOutsideConfigRoot/MountPointRoot/foo/bar/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourcePathOutsideConfigRoot/MountPointRoot/foo/bar/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourcePathOutsideConfigRoot/MountPointRoot/foo/bar/bar.foo.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourcePathOutsideConfigRoot/MountPointRoot/foo/bar/bar.foo.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourcePathOutsideConfigRoot/MountPointRoot/foo/bar/bar.foo.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourcePathOutsideConfigRoot/MountPointRoot/foo/bar/bar.foo.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourcePathOutsideConfigRoot/MountPointRoot/foo/foo.foo.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourcePathOutsideConfigRoot/MountPointRoot/foo/foo.foo.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourcePathOutsideConfigRoot/MountPointRoot/foo/foo.foo.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourcePathOutsideConfigRoot/MountPointRoot/foo/foo.foo.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourcePathOutsideConfigRoot/MountPointRoot/mount.foo.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourcePathOutsideConfigRoot/MountPointRoot/mount.foo.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithSourcePathOutsideConfigRoot/MountPointRoot/mount.foo.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithSourcePathOutsideConfigRoot/MountPointRoot/mount.foo.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithStringCoalesce/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithStringCoalesce/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithStringCoalesce/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithStringCoalesce/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithStringCoalesce/bar.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithStringCoalesce/bar.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithStringCoalesce/bar.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithStringCoalesce/bar.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithTags/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithTags/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithTags/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithTags/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithTags/bar.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithTags/bar.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithTags/bar.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithTags/bar.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithUnspecifiedSourceName/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithUnspecifiedSourceName/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithUnspecifiedSourceName/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithUnspecifiedSourceName/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithUnspecifiedSourceName/bar.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithUnspecifiedSourceName/bar.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithUnspecifiedSourceName/bar.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithUnspecifiedSourceName/bar.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithUnspecifiedSourceName/bar/bar.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithUnspecifiedSourceName/bar/bar.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithUnspecifiedSourceName/bar/bar.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithUnspecifiedSourceName/bar/bar.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithValueForms/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithValueForms/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithValueForms/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithValueForms/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithValueForms/FirstLetterCaseForms/Param2TestValue.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithValueForms/FirstLetterCaseForms/Param2TestValue.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithValueForms/FirstLetterCaseForms/Param2TestValue.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithValueForms/FirstLetterCaseForms/Param2TestValue.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithValueForms/FirstLetterCaseForms/param1TestValue.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithValueForms/FirstLetterCaseForms/param1TestValue.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithValueForms/FirstLetterCaseForms/param1TestValue.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithValueForms/FirstLetterCaseForms/param1TestValue.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithValueForms/IdentityForms/Param1TestValue.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithValueForms/IdentityForms/Param1TestValue.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithValueForms/IdentityForms/Param1TestValue.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithValueForms/IdentityForms/Param1TestValue.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithValueForms/IdentityForms/param 3 test value.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithValueForms/IdentityForms/param 3 test value.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithValueForms/IdentityForms/param 3 test value.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithValueForms/IdentityForms/param 3 test value.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithValueForms/IdentityForms/param2TestValue.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithValueForms/IdentityForms/param2TestValue.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithValueForms/IdentityForms/param2TestValue.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithValueForms/IdentityForms/param2TestValue.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithValueForms/KebabCaseForms/param-1-test-value.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithValueForms/KebabCaseForms/param-1-test-value.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithValueForms/KebabCaseForms/param-1-test-value.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithValueForms/KebabCaseForms/param-1-test-value.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithValueForms/TitleCaseForms/Param 3 Test Value.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithValueForms/TitleCaseForms/Param 3 Test Value.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithValueForms/TitleCaseForms/Param 3 Test Value.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithValueForms/TitleCaseForms/Param 3 Test Value.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithValueForms/bar.2.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithValueForms/bar.2.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithValueForms/bar.2.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithValueForms/bar.2.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithValueForms/bar.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithValueForms/bar.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithValueForms/bar.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TemplateWithValueForms/bar.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TestTemplate/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TestTemplate/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TestTemplate/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TestTemplate/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TestTemplate/Test.cs b/test/TestAssets/TestPackages/TemplateEngine/test_templates/TestTemplate/Test.cs similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/TestTemplate/Test.cs rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/TestTemplate/Test.cs diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/ValueForms/DerivedSymbol/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/ValueForms/DerivedSymbol/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/ValueForms/DerivedSymbol/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/ValueForms/DerivedSymbol/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/ValueForms/DerivedSymbol/My.Web.App.txt b/test/TestAssets/TestPackages/TemplateEngine/test_templates/ValueForms/DerivedSymbol/My.Web.App.txt similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/ValueForms/DerivedSymbol/My.Web.App.txt rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/ValueForms/DerivedSymbol/My.Web.App.txt diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/ValueForms/DerivedSymbolFromGeneratedSymbol/.template.config/template.json b/test/TestAssets/TestPackages/TemplateEngine/test_templates/ValueForms/DerivedSymbolFromGeneratedSymbol/.template.config/template.json similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/ValueForms/DerivedSymbolFromGeneratedSymbol/.template.config/template.json rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/ValueForms/DerivedSymbolFromGeneratedSymbol/.template.config/template.json diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/ValueForms/DerivedSymbolFromGeneratedSymbol/My.Web.App.txt b/test/TestAssets/TestPackages/TemplateEngine/test_templates/ValueForms/DerivedSymbolFromGeneratedSymbol/My.Web.App.txt similarity index 100% rename from test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/ValueForms/DerivedSymbolFromGeneratedSymbol/My.Web.App.txt rename to test/TestAssets/TestPackages/TemplateEngine/test_templates/ValueForms/DerivedSymbolFromGeneratedSymbol/My.Web.App.txt diff --git a/test/UnitTests.proj b/test/UnitTests.proj index 9dfacdfe2a15..289858317516 100644 --- a/test/UnitTests.proj +++ b/test/UnitTests.proj @@ -93,11 +93,6 @@ - - - - - @@ -138,7 +133,6 @@ - From 34696f1b7739eb5144739a909822863381428535 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 8 Apr 2026 13:18:46 +0000 Subject: [PATCH 23/48] Rename TemplateEngine MSBuild properties for brevity MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TemplateEngineRoot → TemplateEngSrcDir TemplateEngineTestRoot → TemplateEngTestDir TemplateEngineTestAssetsRoot → TemplateEngTestAssetsDir --- Directory.Build.props | 6 +++--- .../Microsoft.TemplateEngine.Cli.csproj | 4 ++-- src/Cli/dotnet/dotnet.csproj | 2 +- ...rosoft.TemplateEngine.Core.Contracts.csproj | 2 +- .../Microsoft.TemplateEngine.Core.csproj | 6 +++--- .../Microsoft.TemplateEngine.Edge.csproj | 4 ++-- .../Microsoft.TemplateEngine.IDE.csproj | 8 ++++---- ...Engine.Orchestrator.RunnableProjects.csproj | 4 ++-- .../Microsoft.TemplateEngine.Utils.csproj | 2 +- .../Microsoft.TemplateSearch.Common.csproj | 2 +- ...crosoft.TemplateEngine.Authoring.CLI.csproj | 10 +++++----- ...osoft.TemplateEngine.Authoring.Tasks.csproj | 6 +++--- ....Authoring.TemplateApiVerifier.Shared.props | 6 +++--- ...Engine.Authoring.TemplateApiVerifier.csproj | 4 ++-- ...ine.Authoring.TemplateVerifier.Shared.props | 2 +- ...oft.TemplateSearch.TemplateDiscovery.csproj | 6 +++--- ...crosoft.TemplateEngine.Cli.UnitTests.csproj | 6 +++--- ...ngine.Authoring.CLI.IntegrationTests.csproj | 6 +++--- ...mplateEngine.Authoring.CLI.UnitTests.csproj | 4 ++-- ...ine.Authoring.Tasks.IntegrationTests.csproj | 6 +++--- ...ng.TemplateVerifier.IntegrationTests.csproj | 8 ++++---- ...Authoring.TemplateVerifier.UnitTests.csproj | 4 ++-- ...Authoring.Templates.IntegrationTests.csproj | 6 +++--- ...rosoft.TemplateEngine.Core.UnitTests.csproj | 10 +++++----- ...rosoft.TemplateEngine.Edge.UnitTests.csproj | 10 +++++----- ....TemplateEngine.IDE.IntegrationTests.csproj | 14 +++++++------- ...Microsoft.TemplateEngine.Mocks.Shared.props | 12 ++++++------ ...hestrator.RunnableProjects.UnitTests.csproj | 18 +++++++++--------- ...ine.TemplateLocalizer.Core.UnitTests.csproj | 4 ++-- ...soft.TemplateEngine.TestHelper.Shared.props | 6 +++--- ...osoft.TemplateEngine.Utils.UnitTests.csproj | 6 +++--- ...soft.TemplateSearch.Common.UnitTests.csproj | 6 +++--- ...h.TemplateDiscovery.IntegrationTests.csproj | 4 ++-- .../dotnet-new.IntegrationTests.csproj | 4 ++-- test/dotnet.Tests/dotnet.Tests.csproj | 4 ++-- 35 files changed, 106 insertions(+), 106 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 3cf66cc45d0e..95dfdea861ef 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -47,9 +47,9 @@ $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src')) - $(MSBuildThisFileDirectory)src\TemplateEngine\ - $(MSBuildThisFileDirectory)test\TemplateEngine\ - $(MSBuildThisFileDirectory)test\TestAssets\TestPackages\TemplateEngine\ + $(MSBuildThisFileDirectory)src\TemplateEngine\ + $(MSBuildThisFileDirectory)test\TemplateEngine\ + $(MSBuildThisFileDirectory)test\TestAssets\TestPackages\TemplateEngine\ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'redist', '$(Configuration)')) $([MSBuild]::NormalizeDirectory('$(TestHostFolder)', 'dotnet')) $(TestHostDotNetRoot)$([System.IO.Path]::GetFileName('$(DotNetTool)')) diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Microsoft.TemplateEngine.Cli.csproj b/src/Cli/Microsoft.TemplateEngine.Cli/Microsoft.TemplateEngine.Cli.csproj index cda40a4ff05f..cb8a7e0d1ef9 100644 --- a/src/Cli/Microsoft.TemplateEngine.Cli/Microsoft.TemplateEngine.Cli.csproj +++ b/src/Cli/Microsoft.TemplateEngine.Cli/Microsoft.TemplateEngine.Cli.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/src/Cli/dotnet/dotnet.csproj b/src/Cli/dotnet/dotnet.csproj index bbe486da6993..f6f72c3d1306 100644 --- a/src/Cli/dotnet/dotnet.csproj +++ b/src/Cli/dotnet/dotnet.csproj @@ -87,7 +87,7 @@ - + diff --git a/src/TemplateEngine/Microsoft.TemplateEngine.Core.Contracts/Microsoft.TemplateEngine.Core.Contracts.csproj b/src/TemplateEngine/Microsoft.TemplateEngine.Core.Contracts/Microsoft.TemplateEngine.Core.Contracts.csproj index 924aa520a687..c1bf0f11f5b0 100644 --- a/src/TemplateEngine/Microsoft.TemplateEngine.Core.Contracts/Microsoft.TemplateEngine.Core.Contracts.csproj +++ b/src/TemplateEngine/Microsoft.TemplateEngine.Core.Contracts/Microsoft.TemplateEngine.Core.Contracts.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/TemplateEngine/Microsoft.TemplateEngine.Core/Microsoft.TemplateEngine.Core.csproj b/src/TemplateEngine/Microsoft.TemplateEngine.Core/Microsoft.TemplateEngine.Core.csproj index 51067d5a51e5..9f6b89199982 100644 --- a/src/TemplateEngine/Microsoft.TemplateEngine.Core/Microsoft.TemplateEngine.Core.csproj +++ b/src/TemplateEngine/Microsoft.TemplateEngine.Core/Microsoft.TemplateEngine.Core.csproj @@ -19,9 +19,9 @@ - - - + + + diff --git a/src/TemplateEngine/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj b/src/TemplateEngine/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj index df081eb9a08b..24a8aa0da514 100644 --- a/src/TemplateEngine/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj +++ b/src/TemplateEngine/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj @@ -24,8 +24,8 @@ - - + + diff --git a/src/TemplateEngine/Microsoft.TemplateEngine.IDE/Microsoft.TemplateEngine.IDE.csproj b/src/TemplateEngine/Microsoft.TemplateEngine.IDE/Microsoft.TemplateEngine.IDE.csproj index 98490826cba2..cfa34f756b93 100644 --- a/src/TemplateEngine/Microsoft.TemplateEngine.IDE/Microsoft.TemplateEngine.IDE.csproj +++ b/src/TemplateEngine/Microsoft.TemplateEngine.IDE/Microsoft.TemplateEngine.IDE.csproj @@ -14,10 +14,10 @@ - - - - + + + + diff --git a/src/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.csproj b/src/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.csproj index fab4e136b1be..d38430d4d543 100644 --- a/src/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.csproj +++ b/src/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/TemplateEngine/Microsoft.TemplateEngine.Utils/Microsoft.TemplateEngine.Utils.csproj b/src/TemplateEngine/Microsoft.TemplateEngine.Utils/Microsoft.TemplateEngine.Utils.csproj index 8880b802a392..4c1b5225976f 100644 --- a/src/TemplateEngine/Microsoft.TemplateEngine.Utils/Microsoft.TemplateEngine.Utils.csproj +++ b/src/TemplateEngine/Microsoft.TemplateEngine.Utils/Microsoft.TemplateEngine.Utils.csproj @@ -26,7 +26,7 @@ - + diff --git a/src/TemplateEngine/Microsoft.TemplateSearch.Common/Microsoft.TemplateSearch.Common.csproj b/src/TemplateEngine/Microsoft.TemplateSearch.Common/Microsoft.TemplateSearch.Common.csproj index ce630ce3b51c..2b397d94c5d5 100644 --- a/src/TemplateEngine/Microsoft.TemplateSearch.Common/Microsoft.TemplateSearch.Common.csproj +++ b/src/TemplateEngine/Microsoft.TemplateSearch.Common/Microsoft.TemplateSearch.Common.csproj @@ -24,7 +24,7 @@ - + diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.CLI/Microsoft.TemplateEngine.Authoring.CLI.csproj b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.CLI/Microsoft.TemplateEngine.Authoring.CLI.csproj index f59e563c154a..645a16a8fa50 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.CLI/Microsoft.TemplateEngine.Authoring.CLI.csproj +++ b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.CLI/Microsoft.TemplateEngine.Authoring.CLI.csproj @@ -19,11 +19,11 @@ - - - - - + + + + + diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.Tasks/Microsoft.TemplateEngine.Authoring.Tasks.csproj b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.Tasks/Microsoft.TemplateEngine.Authoring.Tasks.csproj index ae259dc3b462..7e68a9b61935 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.Tasks/Microsoft.TemplateEngine.Authoring.Tasks.csproj +++ b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.Tasks/Microsoft.TemplateEngine.Authoring.Tasks.csproj @@ -23,9 +23,9 @@ - - - + + + diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.Shared.props b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.Shared.props index d2b0789fb8e1..28124900ce60 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.Shared.props +++ b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.Shared.props @@ -12,9 +12,9 @@ - - - + + + diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj index e9d1a9982147..41411b59580c 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj +++ b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj @@ -3,8 +3,8 @@ - - + + diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.Shared.props b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.Shared.props index a80d99807668..5766eeb8868b 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.Shared.props +++ b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.Shared.props @@ -17,7 +17,7 @@ - + diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj b/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj index 680afd8d96da..e4edd64ff65a 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj +++ b/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj @@ -20,9 +20,9 @@ - - - + + + diff --git a/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj b/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj index 23ec953e0254..9d1bdf113db8 100644 --- a/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj +++ b/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj @@ -18,9 +18,9 @@ - - - + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj index e877dde3b06d..283c916f2fad 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.UnitTests/Microsoft.TemplateEngine.Authoring.CLI.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.UnitTests/Microsoft.TemplateEngine.Authoring.CLI.UnitTests.csproj index 9fb621064ad0..f847ee13990a 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.UnitTests/Microsoft.TemplateEngine.Authoring.CLI.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.UnitTests/Microsoft.TemplateEngine.Authoring.CLI.UnitTests.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj index 7b61e7e7e0ed..4175c1f8f032 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj @@ -15,8 +15,8 @@ - - + + @@ -24,7 +24,7 @@ - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj index c4ff84b4a7d8..ce52b46107e0 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj @@ -3,10 +3,10 @@ - - - - + + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj index 783351f7aefb..54d20d200fbf 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj @@ -3,8 +3,8 @@ - - + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests.csproj index 1abf335de519..1cc03cf3333a 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Core.UnitTests/Microsoft.TemplateEngine.Core.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Core.UnitTests/Microsoft.TemplateEngine.Core.UnitTests.csproj index 1c9cb7fde4a9..b01e18d0c00b 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Core.UnitTests/Microsoft.TemplateEngine.Core.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Core.UnitTests/Microsoft.TemplateEngine.Core.UnitTests.csproj @@ -9,11 +9,11 @@ - - - - - + + + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Edge.UnitTests/Microsoft.TemplateEngine.Edge.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Edge.UnitTests/Microsoft.TemplateEngine.Edge.UnitTests.csproj index 9b183126e0fe..5b0a26be8a93 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Edge.UnitTests/Microsoft.TemplateEngine.Edge.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Edge.UnitTests/Microsoft.TemplateEngine.Edge.UnitTests.csproj @@ -9,11 +9,11 @@ - - - - - + + + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/Microsoft.TemplateEngine.IDE.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/Microsoft.TemplateEngine.IDE.IntegrationTests.csproj index 9bf6caa2645d..925afabd73ed 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/Microsoft.TemplateEngine.IDE.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/Microsoft.TemplateEngine.IDE.IntegrationTests.csproj @@ -11,16 +11,16 @@ - - - - - + + + + + - - + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/Microsoft.TemplateEngine.Mocks.Shared.props b/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/Microsoft.TemplateEngine.Mocks.Shared.props index d4853f673b5a..03d4b88c165c 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/Microsoft.TemplateEngine.Mocks.Shared.props +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/Microsoft.TemplateEngine.Mocks.Shared.props @@ -13,12 +13,12 @@ - - - - - - + + + + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj index 93ffa0787dba..8cfb344d7410 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj @@ -20,17 +20,17 @@ - - - - - - + + + + + + - - + + @@ -43,7 +43,7 @@ - diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj index 27a93c77b614..89723f0a1978 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/Microsoft.TemplateEngine.TestHelper.Shared.props b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/Microsoft.TemplateEngine.TestHelper.Shared.props index e36a6a1e6d48..3d343942de0c 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/Microsoft.TemplateEngine.TestHelper.Shared.props +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/Microsoft.TemplateEngine.TestHelper.Shared.props @@ -10,9 +10,9 @@ - - - + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/Microsoft.TemplateEngine.Utils.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/Microsoft.TemplateEngine.Utils.UnitTests.csproj index a0e65fd7b4f4..f98adba4e2f7 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/Microsoft.TemplateEngine.Utils.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/Microsoft.TemplateEngine.Utils.UnitTests.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/test/TemplateEngine/Microsoft.TemplateSearch.Common.UnitTests/Microsoft.TemplateSearch.Common.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateSearch.Common.UnitTests/Microsoft.TemplateSearch.Common.UnitTests.csproj index d512160c8b50..37e315a05067 100644 --- a/test/TemplateEngine/Microsoft.TemplateSearch.Common.UnitTests/Microsoft.TemplateSearch.Common.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateSearch.Common.UnitTests/Microsoft.TemplateSearch.Common.UnitTests.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/test/TemplateEngine/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests.csproj index 99317ddbffd7..60bd92f41d7a 100644 --- a/test/TemplateEngine/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj b/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj index 364830086407..0ae965d096e4 100644 --- a/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj +++ b/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/test/dotnet.Tests/dotnet.Tests.csproj b/test/dotnet.Tests/dotnet.Tests.csproj index 5074552062ca..876cf9bd4b57 100644 --- a/test/dotnet.Tests/dotnet.Tests.csproj +++ b/test/dotnet.Tests/dotnet.Tests.csproj @@ -89,8 +89,8 @@ - - + + From 814358105f4c32e8947cef03a795800e29252457 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 8 Apr 2026 13:21:18 +0000 Subject: [PATCH 24/48] Misc cleanup --- src/TemplateEngine/Directory.Build.props | 3 +-- .../Microsoft.TemplateEngine.Mocks/MockTemplateInfo.cs | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/TemplateEngine/Directory.Build.props b/src/TemplateEngine/Directory.Build.props index 7f6650b70844..f1ed2cd5c33e 100644 --- a/src/TemplateEngine/Directory.Build.props +++ b/src/TemplateEngine/Directory.Build.props @@ -3,8 +3,7 @@ + + From ab0bc1d0e054b0afb839d5eb0189efd6a4e925ec Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 8 Apr 2026 14:44:07 +0000 Subject: [PATCH 26/48] Resolve package diffs --- TemplateEngine.slnf | 1 + .../Samples/Microsoft.TemplateEngine.Samples.csproj | 2 +- sdk.slnx | 4 ++++ src/TemplateEngine/Directory.Build.targets | 10 ++++++++++ ...Microsoft.TemplateEngine.Authoring.Templates.csproj | 2 +- 5 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 src/TemplateEngine/Directory.Build.targets diff --git a/TemplateEngine.slnf b/TemplateEngine.slnf index 135327395ddb..79ff3d0686ed 100644 --- a/TemplateEngine.slnf +++ b/TemplateEngine.slnf @@ -29,6 +29,7 @@ "template_feed\\Microsoft.DotNet.Common.ItemTemplates\\Microsoft.DotNet.Common.ItemTemplates.csproj", "template_feed\\Microsoft.DotNet.Common.ProjectTemplates.11.0\\Microsoft.DotNet.Common.ProjectTemplates.11.0.csproj", "template_feed\\Microsoft.TemplateEngine.Authoring.Templates\\Microsoft.TemplateEngine.Authoring.Templates.csproj", + "documentation\\TemplateEngine\\Samples\\Microsoft.TemplateEngine.Samples.csproj", "test\\Microsoft.DotNet.TemplateLocator.Tests\\Microsoft.DotNet.TemplateLocator.Tests.csproj", "test\\Microsoft.NET.TestFramework\\Microsoft.NET.TestFramework.csproj", "test\\Microsoft.TemplateEngine.Cli.UnitTests\\Microsoft.TemplateEngine.Cli.UnitTests.csproj", diff --git a/documentation/TemplateEngine/Samples/Microsoft.TemplateEngine.Samples.csproj b/documentation/TemplateEngine/Samples/Microsoft.TemplateEngine.Samples.csproj index 9d1ba4ce15d7..9a4c3db38b11 100644 --- a/documentation/TemplateEngine/Samples/Microsoft.TemplateEngine.Samples.csproj +++ b/documentation/TemplateEngine/Samples/Microsoft.TemplateEngine.Samples.csproj @@ -16,7 +16,7 @@ Microsoft Common Project File for Dotnet Template Samples en-US - https://github.com/dotnet/templating + https://github.com/dotnet/sdk Template True diff --git a/sdk.slnx b/sdk.slnx index 1992385d0211..c1a01bb05837 100644 --- a/sdk.slnx +++ b/sdk.slnx @@ -333,6 +333,10 @@ + + + + diff --git a/src/TemplateEngine/Directory.Build.targets b/src/TemplateEngine/Directory.Build.targets new file mode 100644 index 000000000000..530ffbd13260 --- /dev/null +++ b/src/TemplateEngine/Directory.Build.targets @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/template_feed/Microsoft.TemplateEngine.Authoring.Templates/Microsoft.TemplateEngine.Authoring.Templates.csproj b/template_feed/Microsoft.TemplateEngine.Authoring.Templates/Microsoft.TemplateEngine.Authoring.Templates.csproj index 0ecf01b3fe44..838c066d57fd 100644 --- a/template_feed/Microsoft.TemplateEngine.Authoring.Templates/Microsoft.TemplateEngine.Authoring.Templates.csproj +++ b/template_feed/Microsoft.TemplateEngine.Authoring.Templates/Microsoft.TemplateEngine.Authoring.Templates.csproj @@ -17,7 +17,7 @@ Microsoft The templates for useful items and projects for template authoring. en-US - https://github.com/dotnet/templating + https://github.com/dotnet/sdk Template True true From 1ad581659b0218c15578bf50a413cb10c999ba06 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 8 Apr 2026 09:59:20 -0500 Subject: [PATCH 27/48] Update src/TemplateEngine/Directory.Build.targets Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/TemplateEngine/Directory.Build.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/TemplateEngine/Directory.Build.targets b/src/TemplateEngine/Directory.Build.targets index 530ffbd13260..9119f88e7667 100644 --- a/src/TemplateEngine/Directory.Build.targets +++ b/src/TemplateEngine/Directory.Build.targets @@ -3,8 +3,8 @@ - - + + From adca7af010c3040c1a6a8cb519cb2a81248a8b2a Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 8 Apr 2026 09:59:48 -0500 Subject: [PATCH 28/48] Update src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.Tasks/Microsoft.TemplateEngine.Authoring.Tasks.csproj Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../Microsoft.TemplateEngine.Authoring.Tasks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.Tasks/Microsoft.TemplateEngine.Authoring.Tasks.csproj b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.Tasks/Microsoft.TemplateEngine.Authoring.Tasks.csproj index 7e68a9b61935..265ab83163c7 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.Tasks/Microsoft.TemplateEngine.Authoring.Tasks.csproj +++ b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.Tasks/Microsoft.TemplateEngine.Authoring.Tasks.csproj @@ -23,7 +23,7 @@ - + From 8ff6e5bf1ad0a7aeaa835ce6f29416e9551b62ce Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 13 Apr 2026 20:02:00 +0000 Subject: [PATCH 29/48] Update GetCodeBaseRoot --- test/TemplateEngine/Shared/TestBase.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/TemplateEngine/Shared/TestBase.cs b/test/TemplateEngine/Shared/TestBase.cs index 2f69580dd0e3..5919a17b27ce 100644 --- a/test/TemplateEngine/Shared/TestBase.cs +++ b/test/TemplateEngine/Shared/TestBase.cs @@ -69,9 +69,9 @@ private static string GetCodeBaseRoot() { throw new InvalidOperationException("The codebase root was not found"); } - if (!File.Exists(Path.Combine(codeBaseRoot!, "Microsoft.TemplateEngine.sln"))) + if (!File.Exists(Path.Combine(codeBaseRoot!, "TemplateEngine.slnf"))) { - throw new InvalidOperationException("Microsoft.TemplateEngine.sln was not found in codebase root"); + throw new InvalidOperationException("TemplateEngine.slnf was not found in codebase root"); } if (!Directory.Exists(Path.Combine(codeBaseRoot!, "test", "TestAssets", "TestPackages", "TemplateEngine"))) { From 3981dc7f74ed5dd21b44052edb81954b5b2a981b Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 13 Apr 2026 21:00:23 +0000 Subject: [PATCH 30/48] Pin NuGet packages to netstandard2.0-compatible version for TemplateEngine TemplateEngine projects target netstandard2.0 but the repo-wide NuGet 7.x packages dropped netstandard2.0 support. Use VersionOverride in Edge.csproj to pin direct NuGet refs to 6.13.2, and disable CentralPackageTransitivePinningEnabled for TemplateEngine so transitive NuGet deps also resolve to 6.13.2. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- eng/Versions.props | 1 + src/TemplateEngine/Directory.Build.props | 8 ++++++++ .../Microsoft.TemplateEngine.Edge.csproj | 6 +++--- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6cdcadaf47c9..3e37a6104252 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -61,6 +61,7 @@ 1.0.52 1.4.0 1.12.0 + 6.13.2 diff --git a/src/TemplateEngine/Directory.Build.props b/src/TemplateEngine/Directory.Build.props index f1ed2cd5c33e..c492ef908413 100644 --- a/src/TemplateEngine/Directory.Build.props +++ b/src/TemplateEngine/Directory.Build.props @@ -12,6 +12,14 @@ --> $(NoWarn);NU5105;NU5128;NU5100;NU5118;0419;0649;RS0016;RS0041 + + false + + + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/TemplateEngineSamplesTest.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/TemplateEngineSamplesTest.cs index 8139b7cb918e..b8552ef988d0 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/TemplateEngineSamplesTest.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/TemplateEngineSamplesTest.cs @@ -62,7 +62,7 @@ public async Task TemplateEngineSamplesProjectTest( await engine.Execute(options); } - private string GetSamplesTemplateLocation() => Path.Combine(CodeBaseRoot, "dotnet-template-samples", "content"); + private string GetSamplesTemplateLocation() => Path.Combine(CodeBaseRoot!, "dotnet-template-samples", "content"); private (Dictionary Args, string ArgsScenarioName) GetTemplateArgs(string[]? args) { diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/SchemaTests/JSONSchemaTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/SchemaTests/JSONSchemaTests.cs index bae0bdb31a4f..d56b9a6c5768 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/SchemaTests/JSONSchemaTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/SchemaTests/JSONSchemaTests.cs @@ -69,10 +69,10 @@ public void TestAllTestTemplatesHaveValidJson(string testTemplateName) //those templates are intentionally wrong //string[] exceptions = new[] { "MissingIdentity", "MissingMandatoryConfig" }; - return Directory.EnumerateFiles(SampleTemplatesLocation, "template.json", SearchOption.AllDirectories) + return Directory.EnumerateFiles(SampleTemplatesLocation!, "template.json", SearchOption.AllDirectories) .Where(s => s.Contains(".template.config")) //.Where(s => !exceptions.Any(e => s.Contains(e))) - .Select(s => s.Remove(s.Length - JsonLocation.Length).Remove(0, SampleTemplatesLocation.Length).Trim(Path.DirectorySeparatorChar)) + .Select(s => s.Remove(s.Length - JsonLocation.Length).Remove(0, SampleTemplatesLocation!.Length).Trim(Path.DirectorySeparatorChar)) .Select(s => new object?[] { s }); } @@ -80,7 +80,7 @@ public void TestAllTestTemplatesHaveValidJson(string testTemplateName) [MemberData(nameof(GetAllTemplateSamples))] public void TestAllSampleTemplatesHaveValidJson(string testTemplateName) { - string testFile = Path.Combine(SampleTemplatesLocation, testTemplateName, JsonLocation); + string testFile = Path.Combine(SampleTemplatesLocation!, testTemplateName, JsonLocation); IsJSONSchemaValid(testFile); } } diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/ValidationTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/ValidationTests.cs index cc0b5fd43601..cb373bb25089 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/ValidationTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/ValidationTests.cs @@ -36,7 +36,7 @@ public async Task ValidateAllTestTemplates() public async Task ValidateAllSampleTemplates() { IEngineEnvironmentSettings environmentSettings = _environmentSettingsHelper.CreateEnvironment(virtualize: true); - using IMountPoint sourceMountPoint = environmentSettings.MountPath(SampleTemplatesLocation); + using IMountPoint sourceMountPoint = environmentSettings.MountPath(SampleTemplatesLocation!); RunnableProjectGenerator generator = new(); IReadOnlyList loadedTemplates = await generator.GetTemplatesFromMountPointInternalAsync(sourceMountPoint, default); Assert.True(loadedTemplates.All(t => t.IsValid)); diff --git a/test/TemplateEngine/Shared/TestBase.cs b/test/TemplateEngine/Shared/TestBase.cs index 5919a17b27ce..940a447a700e 100644 --- a/test/TemplateEngine/Shared/TestBase.cs +++ b/test/TemplateEngine/Shared/TestBase.cs @@ -1,48 +1,60 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.NET.TestFramework; using Microsoft.TemplateEngine.TestHelper; namespace Microsoft.TemplateEngine.Tests { /// /// The class contains the utils for unit and integration tests. + /// Paths are resolved via which handles both + /// local (repo-rooted) and Helix (environment variable) environments. /// public abstract class TestBase { - internal static string CodeBaseRoot { get; } = GetCodeBaseRoot(); + private static readonly Lazy s_codeBaseRoot = new(SdkTestContext.GetRepoRoot); + + internal static string? CodeBaseRoot => s_codeBaseRoot.Value; internal static string ShippingPackagesLocation { get { -#if DEBUG - string configuration = "Debug"; -#elif RELEASE - string configuration = "Release"; -#else - throw new NotSupportedException("The configuration is not supported"); -#endif - - string packagesLocation = Path.Combine(CodeBaseRoot, "artifacts", "packages", configuration, "Shipping"); - - if (!Directory.Exists(packagesLocation)) + string? location = SdkTestContext.Current.ShippingPackagesDirectory; + if (string.IsNullOrEmpty(location) || !Directory.Exists(location)) { - throw new Exception($"{packagesLocation} does not exist"); + throw new InvalidOperationException( + $"ShippingPackagesDirectory '{location}' does not exist. " + + "Set the DOTNET_SDK_ARTIFACTS_DIR environment variable or run from the repo root."); } - return Path.GetFullPath(packagesLocation); + return Path.GetFullPath(location); } } - internal static string TemplateFeedLocation { get; } = Path.Combine(CodeBaseRoot, "template_feed"); + internal static string TemplateFeedLocation { get; } = SdkTestContext.Current.RepoTemplatePackages; - internal static string TestTemplatesLocation { get; } = Path.Combine(CodeBaseRoot, "test", "TestAssets", "TestPackages", "TemplateEngine", "test_templates"); + internal static string TestTemplatesLocation { get; } = + Path.Combine(SdkTestContext.Current.TestAssetsDirectory, "TestPackages", "TemplateEngine", "test_templates"); - internal static string SampleTemplatesLocation { get; } = Path.Combine(CodeBaseRoot, "dotnet-template-samples"); + internal static string? SampleTemplatesLocation + { + get + { + string? repoRoot = CodeBaseRoot; + if (repoRoot == null) + { + return null; + } + return Path.Combine(repoRoot, "dotnet-template-samples"); + } + } - internal static string TestTemplatePackagesLocation { get; } = Path.Combine(CodeBaseRoot, "test", "TestAssets", "TestPackages", "TemplateEngine", "nupkg_templates"); + internal static string TestTemplatePackagesLocation { get; } = + Path.Combine(SdkTestContext.Current.TestAssetsDirectory, "TestPackages", "TemplateEngine", "nupkg_templates"); - internal static string TestPackageProjectPath { get; } = Path.Combine(CodeBaseRoot, "test", "TestAssets", "TestPackages", "TemplateEngine", "Microsoft.TemplateEngine.TestTemplates.csproj"); + internal static string TestPackageProjectPath { get; } = + Path.Combine(SdkTestContext.Current.TestAssetsDirectory, "TestPackages", "TemplateEngine", "Microsoft.TemplateEngine.TestTemplates.csproj"); internal static string PackTestTemplatesNuGetPackage(PackageManager packageManager) { @@ -59,25 +71,5 @@ internal static string GetTestTemplateLocation(string templateName) } return Path.GetFullPath(templateLocation); } - - private static string GetCodeBaseRoot() - { - string codebase = typeof(TestBase).Assembly.Location; - string? codeBaseRoot = new FileInfo(codebase).Directory?.Parent?.Parent?.Parent?.Parent?.Parent?.FullName; - - if (string.IsNullOrEmpty(codeBaseRoot)) - { - throw new InvalidOperationException("The codebase root was not found"); - } - if (!File.Exists(Path.Combine(codeBaseRoot!, "TemplateEngine.slnf"))) - { - throw new InvalidOperationException("TemplateEngine.slnf was not found in codebase root"); - } - if (!Directory.Exists(Path.Combine(codeBaseRoot!, "test", "TestAssets", "TestPackages", "TemplateEngine"))) - { - throw new InvalidOperationException("TestAssets/TestPackages/TemplateEngine was not found in test/"); - } - return codeBaseRoot!; - } } } From f55f0aa55035e17dbe1204f1f12d98356ad7cb12 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 13 Apr 2026 22:38:03 +0000 Subject: [PATCH 32/48] Add TemplateEngine sample templates to Helix payload and make TestBase non-nullable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Copy documentation/TemplateEngine/Samples into the Helix test layout so tests referencing SampleTemplatesLocation work in CI. Add the DOTNET_SDK_TEST_TEMPLATE_SAMPLES_DIR environment variable to both SetupHelixEnvironment scripts. Make all TestBase members non-nullable — CodeBaseRoot now throws InvalidOperationException if the repo root cannot be determined rather than returning null, so consumers don't need null checks. Update SampleTemplatesLocation to reflect the new path (documentation/TemplateEngine/Samples) and update TemplateEngineSamplesTest to use SampleTemplatesLocation instead of hardcoding the old path. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- build/SetupHelixEnvironment.cmd | 1 + build/SetupHelixEnvironment.sh | 1 + .../TemplateEngineSamplesTest.cs | 2 +- .../SchemaTests/JSONSchemaTests.cs | 6 +++--- .../ValidationTests.cs | 2 +- test/TemplateEngine/Shared/TestBase.cs | 18 +++++++++++------- test/UnitTests.proj | 4 ++++ 7 files changed, 22 insertions(+), 12 deletions(-) diff --git a/build/SetupHelixEnvironment.cmd b/build/SetupHelixEnvironment.cmd index 44502d045821..186b72f43e82 100644 --- a/build/SetupHelixEnvironment.cmd +++ b/build/SetupHelixEnvironment.cmd @@ -35,6 +35,7 @@ set DOTNET_SDK_TEST_EXECUTION_DIRECTORY=%TestExecutionDirectory% set DOTNET_SDK_TEST_MSBUILDSDKRESOLVER_FOLDER=%HELIX_CORRELATION_PAYLOAD%\r set DOTNET_SDK_TEST_ASSETS_DIRECTORY=%TestExecutionDirectory%\TestAssets set DOTNET_SDK_TEST_REPO_TEMPLATE_PACKAGES=%TestExecutionDirectory%\template_feed +set DOTNET_SDK_TEST_TEMPLATE_SAMPLES_DIR=%TestExecutionDirectory%\TemplateSamples REM call dotnet new so the first run message doesn't interfere with the first test dotnet new --debug:ephemeral-hive diff --git a/build/SetupHelixEnvironment.sh b/build/SetupHelixEnvironment.sh index 8eb1d997813b..abb6ee151ada 100644 --- a/build/SetupHelixEnvironment.sh +++ b/build/SetupHelixEnvironment.sh @@ -23,6 +23,7 @@ export DOTNET_SDK_TEST_EXECUTION_DIRECTORY=$TestExecutionDirectory export DOTNET_SDK_TEST_MSBUILDSDKRESOLVER_FOLDER=$HELIX_CORRELATION_PAYLOAD/r export DOTNET_SDK_TEST_ASSETS_DIRECTORY=$TestExecutionDirectory/TestAssets export DOTNET_SDK_TEST_REPO_TEMPLATE_PACKAGES=$TestExecutionDirectory/template_feed +export DOTNET_SDK_TEST_TEMPLATE_SAMPLES_DIR=$TestExecutionDirectory/TemplateSamples # call dotnet new so the first run message doesn't interfere with the first test dotnet new --debug:ephemeral-hive diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/TemplateEngineSamplesTest.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/TemplateEngineSamplesTest.cs index b8552ef988d0..f17ad741feca 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/TemplateEngineSamplesTest.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/TemplateEngineSamplesTest.cs @@ -62,7 +62,7 @@ public async Task TemplateEngineSamplesProjectTest( await engine.Execute(options); } - private string GetSamplesTemplateLocation() => Path.Combine(CodeBaseRoot!, "dotnet-template-samples", "content"); + private string GetSamplesTemplateLocation() => Path.Combine(SampleTemplatesLocation, "content"); private (Dictionary Args, string ArgsScenarioName) GetTemplateArgs(string[]? args) { diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/SchemaTests/JSONSchemaTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/SchemaTests/JSONSchemaTests.cs index d56b9a6c5768..bae0bdb31a4f 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/SchemaTests/JSONSchemaTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/SchemaTests/JSONSchemaTests.cs @@ -69,10 +69,10 @@ public void TestAllTestTemplatesHaveValidJson(string testTemplateName) //those templates are intentionally wrong //string[] exceptions = new[] { "MissingIdentity", "MissingMandatoryConfig" }; - return Directory.EnumerateFiles(SampleTemplatesLocation!, "template.json", SearchOption.AllDirectories) + return Directory.EnumerateFiles(SampleTemplatesLocation, "template.json", SearchOption.AllDirectories) .Where(s => s.Contains(".template.config")) //.Where(s => !exceptions.Any(e => s.Contains(e))) - .Select(s => s.Remove(s.Length - JsonLocation.Length).Remove(0, SampleTemplatesLocation!.Length).Trim(Path.DirectorySeparatorChar)) + .Select(s => s.Remove(s.Length - JsonLocation.Length).Remove(0, SampleTemplatesLocation.Length).Trim(Path.DirectorySeparatorChar)) .Select(s => new object?[] { s }); } @@ -80,7 +80,7 @@ public void TestAllTestTemplatesHaveValidJson(string testTemplateName) [MemberData(nameof(GetAllTemplateSamples))] public void TestAllSampleTemplatesHaveValidJson(string testTemplateName) { - string testFile = Path.Combine(SampleTemplatesLocation!, testTemplateName, JsonLocation); + string testFile = Path.Combine(SampleTemplatesLocation, testTemplateName, JsonLocation); IsJSONSchemaValid(testFile); } } diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/ValidationTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/ValidationTests.cs index cb373bb25089..cc0b5fd43601 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/ValidationTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/ValidationTests.cs @@ -36,7 +36,7 @@ public async Task ValidateAllTestTemplates() public async Task ValidateAllSampleTemplates() { IEngineEnvironmentSettings environmentSettings = _environmentSettingsHelper.CreateEnvironment(virtualize: true); - using IMountPoint sourceMountPoint = environmentSettings.MountPath(SampleTemplatesLocation!); + using IMountPoint sourceMountPoint = environmentSettings.MountPath(SampleTemplatesLocation); RunnableProjectGenerator generator = new(); IReadOnlyList loadedTemplates = await generator.GetTemplatesFromMountPointInternalAsync(sourceMountPoint, default); Assert.True(loadedTemplates.All(t => t.IsValid)); diff --git a/test/TemplateEngine/Shared/TestBase.cs b/test/TemplateEngine/Shared/TestBase.cs index 940a447a700e..e384f11b8c46 100644 --- a/test/TemplateEngine/Shared/TestBase.cs +++ b/test/TemplateEngine/Shared/TestBase.cs @@ -13,9 +13,12 @@ namespace Microsoft.TemplateEngine.Tests /// public abstract class TestBase { - private static readonly Lazy s_codeBaseRoot = new(SdkTestContext.GetRepoRoot); + private static readonly Lazy s_codeBaseRoot = new(() => + SdkTestContext.GetRepoRoot() + ?? throw new InvalidOperationException( + "Could not determine the repo root. Ensure .git exists in the directory tree or set the required DOTNET_SDK_TEST_* environment variables.")); - internal static string? CodeBaseRoot => s_codeBaseRoot.Value; + internal static string CodeBaseRoot => s_codeBaseRoot.Value; internal static string ShippingPackagesLocation { @@ -37,16 +40,17 @@ internal static string ShippingPackagesLocation internal static string TestTemplatesLocation { get; } = Path.Combine(SdkTestContext.Current.TestAssetsDirectory, "TestPackages", "TemplateEngine", "test_templates"); - internal static string? SampleTemplatesLocation + internal static string SampleTemplatesLocation { get { - string? repoRoot = CodeBaseRoot; - if (repoRoot == null) + string? envSamplesDir = Environment.GetEnvironmentVariable("DOTNET_SDK_TEST_TEMPLATE_SAMPLES_DIR"); + if (!string.IsNullOrEmpty(envSamplesDir) && Directory.Exists(envSamplesDir)) { - return null; + return envSamplesDir; } - return Path.Combine(repoRoot, "dotnet-template-samples"); + + return Path.Combine(CodeBaseRoot, "documentation", "TemplateEngine", "Samples"); } } diff --git a/test/UnitTests.proj b/test/UnitTests.proj index 289858317516..da7824c8048d 100644 --- a/test/UnitTests.proj +++ b/test/UnitTests.proj @@ -96,6 +96,9 @@ + + + @@ -134,6 +137,7 @@ + From 9686a7700b485b982305be038871336eb29a80f7 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 14 Apr 2026 01:50:48 +0000 Subject: [PATCH 33/48] Update DefaultTemplatePackageProviderTests to use SdkTestContext Replace brittle 5-level parent directory walk with SdkTestContext.Current.TestAssetsDirectory to resolve test template paths, matching the pattern used by TestBase. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../DefaultTemplatePackageProviderTests.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/DefaultTemplatePackageProviderTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/DefaultTemplatePackageProviderTests.cs index a759217f79a9..7eb0018115f4 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/DefaultTemplatePackageProviderTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/DefaultTemplatePackageProviderTests.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.NET.TestFramework; using Microsoft.TemplateEngine.Abstractions; using Microsoft.TemplateEngine.TestHelper; using Xunit; @@ -19,11 +20,13 @@ public DefaultTemplatePackageProviderTests(EnvironmentSettingsHelper environment [Fact] public async Task ReturnsFoldersAndNuPkgs() { - var thisDir = Path.GetDirectoryName(typeof(DefaultTemplatePackageProviderTests).Assembly.Location); + string testAssetsDir = SdkTestContext.Current.TestAssetsDirectory; + string templateEngineTestAssets = Path.Combine(testAssetsDir, "TestPackages", "TemplateEngine"); + //Pass in 5 folders - var folders = Directory.GetDirectories(Path.Combine(thisDir!, "..", "..", "..", "..", "..", "test", "Microsoft.TemplateEngine.TestTemplates", "test_templates")).Take(5); + var folders = Directory.GetDirectories(Path.Combine(templateEngineTestAssets, "test_templates")).Take(5); //And one *.nupkg, but that folder contains 2 .nupkg files - var nupkgs = new[] { Path.Combine(thisDir!, "..", "..", "..", "..", "..", "test", "Microsoft.TemplateEngine.TestTemplates", "nupkg_templates", "*.nupkg") }; + var nupkgs = new[] { Path.Combine(templateEngineTestAssets, "nupkg_templates", "*.nupkg") }; var provider = new DefaultTemplatePackageProvider(null!, _engineEnvironmentSettings, nupkgs, folders); var sources = await provider.GetAllTemplatePackagesAsync(default); From e5f271a1b6c3fd4b912f8a0e008dd83c2b9e0dc0 Mon Sep 17 00:00:00 2001 From: Copilot Date: Tue, 14 Apr 2026 16:27:58 +0000 Subject: [PATCH 34/48] Fix TemplateEngine test failures in Helix Use AppContext.BaseDirectory for Verify snapshot path resolution instead of relative paths that resolve against [CallerFilePath] (which bakes in build-machine paths like /mnt/vss that don't exist on Helix workers). Changes: - VerifySettingsFixture: Use absolute paths in DerivePathInfo callbacks - SnapshotsDirectory: Use Path.Combine(AppContext.BaseDirectory, ...) for all TemplateEngine tests that pass through VerificationEngine - csproj files: Change snapshot items from Content+None(CopyToOutput=Never) to None(CopyToOutput=PreserveNewest) so snapshots are included in published test payloads sent to Helix - StringExtractorTests: Use AppContext.BaseDirectory instead of navigating 5 levels up the repo tree to find test templates Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- ...gine.Authoring.CLI.IntegrationTests.csproj | 3 +-- .../VerifySettingsFixture.cs | 2 +- .../ExampleTemplateTest.cs | 4 ++-- ...g.TemplateVerifier.IntegrationTests.csproj | 3 +-- ...uthoring.TemplateVerifier.UnitTests.csproj | 3 +-- .../VerificationEngineTests.cs | 4 ++-- .../AuthoringTemplatesTests.cs | 16 +++++++------- ...uthoring.Templates.IntegrationTests.csproj | 7 +----- ...TemplateEngine.IDE.IntegrationTests.csproj | 3 +-- .../SnapshotTests.cs | 12 +++++----- .../VerifySettingsFixture.cs | 2 +- ...estrator.RunnableProjects.UnitTests.csproj | 3 ++- .../SnapshotTests.cs | 22 +++++++++---------- .../VerifySettingsFixture.cs | 2 +- .../StringExtractorTests.cs | 11 +--------- 15 files changed, 40 insertions(+), 57 deletions(-) diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj index 283c916f2fad..15dad9ad9d63 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj @@ -16,8 +16,7 @@ - - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/VerifySettingsFixture.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/VerifySettingsFixture.cs index 79757a88da50..8284815c6e82 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/VerifySettingsFixture.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/VerifySettingsFixture.cs @@ -18,7 +18,7 @@ public VerifySettingsFixture() s_called = true; DerivePathInfo( (_, _, type, method) => new( - directory: "Snapshots", + directory: Path.Combine(AppContext.BaseDirectory, "Snapshots"), typeName: type.Name, methodName: method.Name)); diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/ExampleTemplateTest.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/ExampleTemplateTest.cs index 43bc71c15214..7db969780c66 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/ExampleTemplateTest.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/ExampleTemplateTest.cs @@ -34,7 +34,7 @@ public async Task VerificationEngineSampleDogfoodTest() { TemplateSpecificArgs = new string[] { "--paramB", "true" }, TemplatePath = templateLocation, - SnapshotsDirectory = "Snapshots", + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Snapshots"), OutputDirectory = workingDir, VerifyCommandOutput = true, DoNotPrependCallerMethodNameToScenarioName = true, @@ -70,7 +70,7 @@ public async Task VerificationEngineSampleDogfoodTest_ExecThroughApi() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = "Snapshots", + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Snapshots"), OutputDirectory = workingDir, VerifyCommandOutput = true, DoNotPrependCallerMethodNameToScenarioName = true, diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj index ce52b46107e0..224290ce2801 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj @@ -11,8 +11,7 @@ - - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj index 54d20d200fbf..ebdc63884906 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj @@ -9,8 +9,7 @@ - - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/VerificationEngineTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/VerificationEngineTests.cs index d1ab0d7d8de3..75be4bcd99a2 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/VerificationEngineTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/VerificationEngineTests.cs @@ -111,7 +111,7 @@ await executeTask public async Task ExecuteSucceedsOnExpectedInstantiationFailure() { string workingDir = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName().Replace(".", string.Empty)); - string snapshotsDir = "Snapshots"; + string snapshotsDir = Path.Combine(AppContext.BaseDirectory, "Snapshots"); ICommandRunner commandRunner = A.Fake(); A.CallTo(() => commandRunner.RunCommand(A._)) @@ -135,7 +135,7 @@ public async Task ExecuteSucceedsOnExpectedInstantiationFailure() public async Task ExecuteSucceedsOnExpectedInstantiationSuccess() { string workingDir = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName().Replace(".", string.Empty)); - string snapshotsDir = "Snapshots"; + string snapshotsDir = Path.Combine(AppContext.BaseDirectory, "Snapshots"); ICommandRunner commandRunner = A.Fake(); A.CallTo(() => commandRunner.RunCommand(A._)) diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/AuthoringTemplatesTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/AuthoringTemplatesTests.cs index 7b14480cfe5e..94cad3c89ba7 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/AuthoringTemplatesTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/AuthoringTemplatesTests.cs @@ -31,7 +31,7 @@ public async Task TemplateJsonTest() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = "Snapshots", + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Snapshots"), OutputDirectory = workingDir, DoNotPrependCallerMethodNameToScenarioName = true, ScenarioName = "Basic", @@ -60,7 +60,7 @@ public async Task TemplateJsonTest_WithParameters() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = "Snapshots", + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Snapshots"), OutputDirectory = workingDir, DoNotPrependCallerMethodNameToScenarioName = true, ScenarioName = "WithParams", @@ -88,7 +88,7 @@ public async Task TemplateJsonTest_NoConfigFolder() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = "Snapshots", + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Snapshots"), OutputDirectory = workingDir, DoNotPrependCallerMethodNameToScenarioName = true, ScenarioName = "NoConfigFolder", @@ -111,7 +111,7 @@ public async Task TemplatePackageTest() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = "Snapshots", + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Snapshots"), OutputDirectory = workingDir, DoNotPrependCallerMethodNameToScenarioName = true, ScenarioName = "Basic", @@ -138,7 +138,7 @@ public async Task TemplatePackageTest_WithName() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = "Snapshots", + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Snapshots"), OutputDirectory = workingDir, DoNotPrependCallerMethodNameToScenarioName = true, ScenarioName = "WithName", @@ -166,7 +166,7 @@ public async Task TemplatePackageTest_NoMSBuildTasks() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = "Snapshots", + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Snapshots"), OutputDirectory = workingDir, DoNotPrependCallerMethodNameToScenarioName = true, ScenarioName = "NoMSBuildTasks", @@ -189,7 +189,7 @@ public async Task TemplateJsonTest_CLI() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = "Snapshots", + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Snapshots"), OutputDirectory = workingDir, DoNotPrependCallerMethodNameToScenarioName = true, VerifyCommandOutput = true, @@ -211,7 +211,7 @@ public async Task TemplatePackageTest_CLI() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = "Snapshots", + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Snapshots"), OutputDirectory = workingDir, DoNotPrependCallerMethodNameToScenarioName = true, VerifyCommandOutput = true, diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests.csproj index 1cc03cf3333a..70585e22bd2c 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests.csproj @@ -16,12 +16,7 @@ - - - - - - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/Microsoft.TemplateEngine.IDE.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/Microsoft.TemplateEngine.IDE.IntegrationTests.csproj index 925afabd73ed..a7276e8c8225 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/Microsoft.TemplateEngine.IDE.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/Microsoft.TemplateEngine.IDE.IntegrationTests.csproj @@ -29,8 +29,7 @@ - - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/SnapshotTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/SnapshotTests.cs index 0d0d8d975466..8fb1122b6e24 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/SnapshotTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/SnapshotTests.cs @@ -30,7 +30,7 @@ public Task PreferDefaultNameTest() new TemplateVerifierOptions(templateName: "TestAssets.TemplateWithPreferDefaultName") { TemplatePath = templateLocation, - SnapshotsDirectory = "Approvals", + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals"), DoNotPrependTemplateNameToScenarioName = true, DoNotAppendTemplateArgsToScenarioName = true, ScenarioName = "Basic" @@ -50,7 +50,7 @@ public Task TemplateWithOnlyIfStatementTest() new TemplateVerifierOptions(templateName: "TestAssets.TemplateWithOnlyIfStatement") { TemplatePath = templateLocation, - SnapshotsDirectory = "Approvals", + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals"), DoNotPrependTemplateNameToScenarioName = true, DoNotAppendTemplateArgsToScenarioName = true, ScenarioName = "Basic" @@ -70,7 +70,7 @@ public Task TemplateWithOnlyIfStatementTestForLocalhostTest() new TemplateVerifierOptions(templateName: "TestAssets.TemplateWithOnlyIfForLocalhost") { TemplatePath = templateLocation, - SnapshotsDirectory = "Approvals", + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals"), DoNotPrependTemplateNameToScenarioName = true, DoNotAppendTemplateArgsToScenarioName = true, ScenarioName = "Basic" @@ -99,7 +99,7 @@ public async Task BooleanConditionsTest(string testName, string?[]? parametersAr TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = "Approvals", + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals"), OutputDirectory = workingDirectory, DoNotPrependTemplateNameToScenarioName = true, DoNotAppendTemplateArgsToScenarioName = true, @@ -145,7 +145,7 @@ public async Task LegacyTests(string scenarioName, string templateFolderName, st TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = "Approvals", + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals"), OutputDirectory = workingDirectory, DoNotPrependTemplateNameToScenarioName = true, DoNotAppendTemplateArgsToScenarioName = false, @@ -169,7 +169,7 @@ public async Task LegacyTest_PortsAndCoalesceRenames() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: "TestAssets.TemplateWithPortsAndCoalesce") { TemplatePath = templateLocation, - SnapshotsDirectory = "Approvals", + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals"), OutputDirectory = workingDirectory, DoNotPrependTemplateNameToScenarioName = true, DoNotAppendTemplateArgsToScenarioName = false, diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/VerifySettingsFixture.cs b/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/VerifySettingsFixture.cs index f44508b1159d..6f213f0c781e 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/VerifySettingsFixture.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/VerifySettingsFixture.cs @@ -19,7 +19,7 @@ public VerifySettingsFixture() DerivePathInfo( (_, _, type, method) => new( - directory: "Approvals", + directory: Path.Combine(AppContext.BaseDirectory, "Approvals"), typeName: type.Name, methodName: method.Name)); diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj index 8cfb344d7410..e913c4731a3f 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj @@ -39,7 +39,8 @@ - + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/SnapshotTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/SnapshotTests.cs index 4696a107c60d..8529db34fa9c 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/SnapshotTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/SnapshotTests.cs @@ -39,7 +39,7 @@ public Task TestGeneratedSymbolWithRefToDerivedSymbol() OutputDirectory = workingDir, DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, - SnapshotsDirectory = "Approvals" + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals") } .WithInstantiationThroughTemplateCreatorApi(templateParams); @@ -64,7 +64,7 @@ public Task TestGeneratedSymbolWithRefToDerivedSymbol_DifferentOrder() OutputDirectory = workingDir, DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, - SnapshotsDirectory = "Approvals" + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals") } .WithInstantiationThroughTemplateCreatorApi(templateParams); @@ -89,7 +89,7 @@ public Task TestCoalesce_EmptyStringForMultiChoices() OutputDirectory = workingDir, DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, - SnapshotsDirectory = "Approvals" + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals") } .WithInstantiationThroughTemplateCreatorApi(templateParams); @@ -114,7 +114,7 @@ public Task TestSingleSelectionForMultiChoices() OutputDirectory = workingDir, DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, - SnapshotsDirectory = "Approvals" + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals") } .WithInstantiationThroughTemplateCreatorApi(templateParams); @@ -140,7 +140,7 @@ public Task TestTemplateWithBrokenGeneratedInComputed() DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, VerifyCommandOutput = true, - SnapshotsDirectory = "Approvals" + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals") } .WithInstantiationThroughTemplateCreatorApi(templateParams); @@ -162,7 +162,7 @@ public Task TestTemplateWithComputedInGenerated() DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, VerifyCommandOutput = true, - SnapshotsDirectory = "Approvals" + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals") } .WithInstantiationThroughTemplateCreatorApi( new Dictionary() @@ -188,7 +188,7 @@ public Task TestTemplateWithComputedInDerivedThroughGenerated() DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, VerifyCommandOutput = true, - SnapshotsDirectory = "Approvals" + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals") } .WithInstantiationThroughTemplateCreatorApi(new Dictionary()); @@ -210,7 +210,7 @@ public Task TestTemplateWithGeneratedInComputed() DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, VerifyCommandOutput = true, - SnapshotsDirectory = "Approvals" + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals") } .WithInstantiationThroughTemplateCreatorApi( new Dictionary() @@ -237,7 +237,7 @@ public Task TestTemplateWithGeneratedSwitchInComputed() DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, VerifyCommandOutput = true, - SnapshotsDirectory = "Approvals" + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals") } .WithInstantiationThroughTemplateCreatorApi( new Dictionary() @@ -266,7 +266,7 @@ public Task TestTemplateWithCircleDependencyInMacros() DoNotPrependTemplateNameToScenarioName = true, VerifyCommandOutput = true, IsCommandExpectedToFail = true, - SnapshotsDirectory = "Approvals" + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals") } .WithInstantiationThroughTemplateCreatorApi(new Dictionary()); @@ -295,7 +295,7 @@ public Task TestSelectionForMultiChoicesWhenThereAreMultiplePartialMatchesAndOne OutputDirectory = workingDir, DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, - SnapshotsDirectory = "Approvals" + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals") } .WithInstantiationThroughTemplateCreatorApi(templateParams); diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/VerifySettingsFixture.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/VerifySettingsFixture.cs index 9c4277648512..abd24afbc722 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/VerifySettingsFixture.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/VerifySettingsFixture.cs @@ -18,7 +18,7 @@ public VerifySettingsFixture() s_called = true; DerivePathInfo( (_, _, type, method) => new( - directory: "Approvals", + directory: Path.Combine(AppContext.BaseDirectory, "Approvals"), typeName: type.Name, methodName: method.Name)); diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/StringExtractorTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/StringExtractorTests.cs index 00c12ef9ea91..eea8dbaf08d1 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/StringExtractorTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/StringExtractorTests.cs @@ -187,17 +187,8 @@ private static IReadOnlyList ExtractStrings(string json, out str private static string GetTestTemplateJsonContent() { - string thisDir = Path.GetDirectoryName(typeof(StringExtractorTests).Assembly.Location) - ?? throw new Exception("Failed to get assembly location, which is required to access test templates."); string templateJsonPath = Path.GetFullPath(Path.Combine( - thisDir, - "..", - "..", - "..", - "..", - "..", - "test", - "Microsoft.TemplateEngine.TestTemplates", + AppContext.BaseDirectory, "test_templates", "TemplateWithLocalization", ".template.config", From e6148617ac948ed8032d52660e841b63d613368a Mon Sep 17 00:00:00 2001 From: Copilot Date: Tue, 14 Apr 2026 17:56:27 +0000 Subject: [PATCH 35/48] Fix remaining TemplateEngine Helix test failures - ExportCommandTests: Use AppContext.BaseDirectory for test template paths instead of navigating up the repo tree - TemplateEngineSamplesTest/VerificationEngineTests: Add explicit SnapshotsDirectory to avoid CallerFilePath-based resolution - Authoring.Tasks.IntegrationTests: Add Authoring.Tasks to BuildTestPackages.targets so the nupkg is staged in Testpackages for Helix, and update tests to include TestPackages as a NuGet source - TestUtils: Add multi-source overload for SetupNuGetConfigForPackagesLocation - Documentation: Add Helix environment simulation guide and common failure patterns to repro-helix-failure.md Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../BuildTestPackages.targets | 5 +++++ .../ExportCommandTests.cs | 11 +---------- .../LocalizeTemplateTests.cs | 9 +++++---- .../ValidateTemplatesTests.cs | 5 +++-- .../TemplateEngineSamplesTest.cs | 1 + .../VerificationEngineTests.cs | 1 + .../Microsoft.TemplateEngine.TestHelper/TestUtils.cs | 11 ++++++++++- 7 files changed, 26 insertions(+), 17 deletions(-) diff --git a/test/Microsoft.NET.TestFramework/BuildTestPackages.targets b/test/Microsoft.NET.TestFramework/BuildTestPackages.targets index a78de75f9f5f..36c3c7512bc3 100644 --- a/test/Microsoft.NET.TestFramework/BuildTestPackages.targets +++ b/test/Microsoft.NET.TestFramework/BuildTestPackages.targets @@ -159,6 +159,11 @@ Microsoft.Net.Sdk.Compilers.Toolset.csproj $(Version) + + Microsoft.TemplateEngine.Authoring.Tasks + Microsoft.TemplateEngine.Authoring.Tasks.csproj + $(Version) + %(Name) diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ExportCommandTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ExportCommandTests.cs index 4e945be749cf..19454e6591a3 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ExportCommandTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ExportCommandTests.cs @@ -243,17 +243,8 @@ private static string GetTestTemplateInTempDir(string templateName) private static string GetTestTemplateJsonContent() { - string? thisDir = Path.GetDirectoryName(typeof(ExportCommandTests).Assembly.Location); - Assert.NotNull(thisDir); string templateJsonPath = Path.GetFullPath(Path.Combine( - thisDir!, - "..", - "..", - "..", - "..", - "..", - "test", - "Microsoft.TemplateEngine.TestTemplates", + AppContext.BaseDirectory, "test_templates", "TemplateWithLocalization", ".template.config", diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/LocalizeTemplateTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/LocalizeTemplateTests.cs index 816d6bd40911..f2e63b29ffcd 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/LocalizeTemplateTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/LocalizeTemplateTests.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.NET.TestFramework; using Microsoft.TemplateEngine.CommandUtils; using Microsoft.TemplateEngine.TestHelper; using Microsoft.TemplateEngine.Tests; @@ -22,7 +23,7 @@ public void CanRunTask() { string tmpDir = TestUtils.CreateTemporaryFolder(); TestUtils.DirectoryCopy("Resources/BasicTemplatePackage", tmpDir, true); - TestUtils.SetupNuGetConfigForPackagesLocation(tmpDir, ShippingPackagesLocation); + TestUtils.SetupNuGetConfigForPackagesLocation(tmpDir, new[] { ShippingPackagesLocation, SdkTestContext.Current.TestPackages }); new DotnetCommand(_log, "add", "TemplatePackage.csproj", "package", "Microsoft.TemplateEngine.Authoring.Tasks", "--prerelease") .WithoutTelemetry() @@ -52,7 +53,7 @@ public void CanRunTaskSelectedLangs() { string tmpDir = TestUtils.CreateTemporaryFolder(); TestUtils.DirectoryCopy("Resources/TemplatePackageEnDe", tmpDir, true); - TestUtils.SetupNuGetConfigForPackagesLocation(tmpDir, ShippingPackagesLocation); + TestUtils.SetupNuGetConfigForPackagesLocation(tmpDir, new[] { ShippingPackagesLocation, SdkTestContext.Current.TestPackages }); new DotnetCommand(_log, "add", "TemplatePackage.csproj", "package", "Microsoft.TemplateEngine.Authoring.Tasks", "--prerelease") .WithoutTelemetry() @@ -83,7 +84,7 @@ public void CanRunTaskSelectedTemplates() { string tmpDir = TestUtils.CreateTemporaryFolder(); TestUtils.DirectoryCopy("Resources/TemplatePackagePartiallyLocalized", tmpDir, true); - TestUtils.SetupNuGetConfigForPackagesLocation(tmpDir, ShippingPackagesLocation); + TestUtils.SetupNuGetConfigForPackagesLocation(tmpDir, new[] { ShippingPackagesLocation, SdkTestContext.Current.TestPackages }); new DotnetCommand(_log, "add", "TemplatePackage.csproj", "package", "Microsoft.TemplateEngine.Authoring.Tasks", "--prerelease") .WithoutTelemetry() @@ -115,7 +116,7 @@ public void CanRunTaskAndDetectError() { string tmpDir = TestUtils.CreateTemporaryFolder(); TestUtils.DirectoryCopy("Resources/InvalidTemplatePackage", tmpDir, true); - TestUtils.SetupNuGetConfigForPackagesLocation(tmpDir, ShippingPackagesLocation); + TestUtils.SetupNuGetConfigForPackagesLocation(tmpDir, new[] { ShippingPackagesLocation, SdkTestContext.Current.TestPackages }); new DotnetCommand(_log, "add", "TemplatePackage.csproj", "package", "Microsoft.TemplateEngine.Authoring.Tasks", "--prerelease") .WithoutTelemetry() diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/ValidateTemplatesTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/ValidateTemplatesTests.cs index 7239b104cc87..0eb073fd7c11 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/ValidateTemplatesTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/ValidateTemplatesTests.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.NET.TestFramework; using Microsoft.TemplateEngine.CommandUtils; using Microsoft.TemplateEngine.TestHelper; using Microsoft.TemplateEngine.Tests; @@ -22,7 +23,7 @@ public void CanRunValidateTask_OnError() { string tmpDir = TestUtils.CreateTemporaryFolder(); TestUtils.DirectoryCopy("Resources/InvalidTemplatePackage_MissingName", tmpDir, true); - TestUtils.SetupNuGetConfigForPackagesLocation(tmpDir, ShippingPackagesLocation); + TestUtils.SetupNuGetConfigForPackagesLocation(tmpDir, new[] { ShippingPackagesLocation, SdkTestContext.Current.TestPackages }); new DotnetCommand(_log, "add", "TemplatePackage.csproj", "package", "Microsoft.TemplateEngine.Authoring.Tasks", "--prerelease") .WithoutTelemetry() @@ -46,7 +47,7 @@ public void CanRunValidateTask_OnInfo() { string tmpDir = TestUtils.CreateTemporaryFolder(); TestUtils.DirectoryCopy("Resources/InvalidTemplatePackage_MissingOptionalData", tmpDir, true); - TestUtils.SetupNuGetConfigForPackagesLocation(tmpDir, ShippingPackagesLocation); + TestUtils.SetupNuGetConfigForPackagesLocation(tmpDir, new[] { ShippingPackagesLocation, SdkTestContext.Current.TestPackages }); new DotnetCommand(_log, "add", "TemplatePackage.csproj", "package", "Microsoft.TemplateEngine.Authoring.Tasks", "--prerelease") .WithoutTelemetry() diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/TemplateEngineSamplesTest.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/TemplateEngineSamplesTest.cs index f17ad741feca..c1a60d89316a 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/TemplateEngineSamplesTest.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/TemplateEngineSamplesTest.cs @@ -50,6 +50,7 @@ public async Task TemplateEngineSamplesProjectTest( TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: shortName) { TemplatePath = templateLocation, + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Snapshots"), DoNotPrependCallerMethodNameToScenarioName = true, ScenarioName = $"{folderName.Substring(folderName.IndexOf('-') + 1)}{argsScenarioName}" } diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/VerificationEngineTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/VerificationEngineTests.cs index 53e097671cc6..98a8cbfb9f40 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/VerificationEngineTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/VerificationEngineTests.cs @@ -150,6 +150,7 @@ public async Task VerificationEngine_DotFile_EditorConfigTests() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: "editorconfig") { TemplateSpecificArgs = new[] { "--empty" }, + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Snapshots"), VerifyCommandOutput = true, }; diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/TestUtils.cs b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/TestUtils.cs index 2cac468dd2cf..ad8f6b1a80f8 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/TestUtils.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/TestUtils.cs @@ -14,6 +14,15 @@ public static string CreateTemporaryFolder(string name = "") public static void SetupNuGetConfigForPackagesLocation(string projectDirectory, string packagesLocation) { + SetupNuGetConfigForPackagesLocation(projectDirectory, new[] { packagesLocation }); + } + + public static void SetupNuGetConfigForPackagesLocation(string projectDirectory, IEnumerable packagesLocations) + { + var sources = string.Join( + Environment.NewLine, + packagesLocations.Select((loc, i) => $@" ")); + string nugetConfigShim = $@" @@ -22,7 +31,7 @@ public static void SetupNuGetConfigForPackagesLocation(string projectDirectory, - +{sources} "; From 9a8692ea1d0626c801f5396414f691cce830ce5b Mon Sep 17 00:00:00 2001 From: Copilot Date: Tue, 14 Apr 2026 20:26:52 +0000 Subject: [PATCH 36/48] Add SnapshotsDirectory to InstallsToCustomLocation test The test was missing SnapshotsDirectory, causing VerificationEngine to resolve the default 'Snapshots' path relative to [CallerFilePath] which doesn't exist on Helix workers. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../VerificationEngineTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/VerificationEngineTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/VerificationEngineTests.cs index 98a8cbfb9f40..41e164072429 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/VerificationEngineTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/VerificationEngineTests.cs @@ -166,6 +166,7 @@ public async Task VerificationEngine_InstallsToCustomLocation_WithSettingsDirect TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: "editorconfig") { TemplateSpecificArgs = new[] { "--empty" }, + SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Snapshots"), VerifyCommandOutput = false, SettingsDirectory = settingsPath }; From bf38d9e8d9804a2786a989fdb41dbcdd11135237 Mon Sep 17 00:00:00 2001 From: Copilot Date: Tue, 14 Apr 2026 20:26:52 +0000 Subject: [PATCH 37/48] Add TemplateSearch.TemplateDiscovery to test packages Stage the Microsoft.TemplateSearch.TemplateDiscovery nupkg in the Testpackages directory so dotnet-new.IntegrationTests can install it as a dotnet tool during Helix test runs. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- test/Microsoft.NET.TestFramework/BuildTestPackages.targets | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/Microsoft.NET.TestFramework/BuildTestPackages.targets b/test/Microsoft.NET.TestFramework/BuildTestPackages.targets index 36c3c7512bc3..21ae49a8b192 100644 --- a/test/Microsoft.NET.TestFramework/BuildTestPackages.targets +++ b/test/Microsoft.NET.TestFramework/BuildTestPackages.targets @@ -164,6 +164,11 @@ Microsoft.TemplateEngine.Authoring.Tasks.csproj $(Version) + + Microsoft.TemplateSearch.TemplateDiscovery + Microsoft.TemplateSearch.TemplateDiscovery.csproj + $(Version) + %(Name) From 50d0ddaab4aba81890917d0a3e736d23b24dcdf5 Mon Sep 17 00:00:00 2001 From: Copilot Date: Wed, 15 Apr 2026 14:15:56 +0000 Subject: [PATCH 38/48] Skip VerifyCommand tests that fail with Verify.XunitV3 outside xUnit context These tests run the CLI tool as a subprocess which calls Verifier.VerifyDirectory() from Verify.XunitV3. Without an xUnit test runner in the subprocess, TestContext.TestMethod is null causing exit code 70 instead of 65. https://github.com/dotnet/sdk/issues/53889 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../VerifyCommandTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/VerifyCommandTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/VerifyCommandTests.cs index 6eab42d9ebfd..00d4e171d1d0 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/VerifyCommandTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/VerifyCommandTests.cs @@ -19,7 +19,7 @@ public VerifyCommandTests(ITestOutputHelper log) _log = log; } - [Fact] + [Fact(Skip = "https://github.com/dotnet/sdk/issues/53889")] public void VerifyCommandFullDevLoop() { // dots issue https://github.com/VerifyTests/Verify/issues/658 @@ -121,7 +121,7 @@ public void VerifyCommandFullDevLoop() Directory.Delete(snapshotsDir, true); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/sdk/issues/53889")] public void VerifyCommandFullDevLoopWithNotInstalledTemplate() { // dots issue https://github.com/VerifyTests/Verify/issues/658 From 887818c9cdb627c11c9c315d1e4a8fe279f5540e Mon Sep 17 00:00:00 2001 From: Copilot Date: Wed, 15 Apr 2026 14:35:33 +0000 Subject: [PATCH 39/48] Consolidate snapshot directory paths into TestBase constants Add ApprovalsDirectory and SnapshotsDirectory properties to TestBase so all test projects use a single definition instead of repeating Path.Combine(AppContext.BaseDirectory, ...) at every call site. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../VerifySettingsFixture.cs | 3 ++- .../ExampleTemplateTest.cs | 4 ++-- .../TemplateEngineSamplesTest.cs | 2 +- .../VerificationEngineTests.cs | 4 ++-- .../AuthoringTemplatesTests.cs | 16 +++++++------- .../SnapshotTests.cs | 12 +++++----- .../VerifySettingsFixture.cs | 3 ++- .../SnapshotTests.cs | 22 +++++++++---------- .../VerifySettingsFixture.cs | 3 ++- test/TemplateEngine/Shared/TestBase.cs | 4 ++++ 10 files changed, 40 insertions(+), 33 deletions(-) diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/VerifySettingsFixture.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/VerifySettingsFixture.cs index 8284815c6e82..56a8d8b646f7 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/VerifySettingsFixture.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/VerifySettingsFixture.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.TemplateEngine.Tests; using VerifyTests.DiffPlex; namespace Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests @@ -18,7 +19,7 @@ public VerifySettingsFixture() s_called = true; DerivePathInfo( (_, _, type, method) => new( - directory: Path.Combine(AppContext.BaseDirectory, "Snapshots"), + directory: TestBase.SnapshotsDirectory, typeName: type.Name, methodName: method.Name)); diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/ExampleTemplateTest.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/ExampleTemplateTest.cs index 7db969780c66..337391bdf60f 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/ExampleTemplateTest.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/ExampleTemplateTest.cs @@ -34,7 +34,7 @@ public async Task VerificationEngineSampleDogfoodTest() { TemplateSpecificArgs = new string[] { "--paramB", "true" }, TemplatePath = templateLocation, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Snapshots"), + SnapshotsDirectory = SnapshotsDirectory, OutputDirectory = workingDir, VerifyCommandOutput = true, DoNotPrependCallerMethodNameToScenarioName = true, @@ -70,7 +70,7 @@ public async Task VerificationEngineSampleDogfoodTest_ExecThroughApi() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Snapshots"), + SnapshotsDirectory = SnapshotsDirectory, OutputDirectory = workingDir, VerifyCommandOutput = true, DoNotPrependCallerMethodNameToScenarioName = true, diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/TemplateEngineSamplesTest.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/TemplateEngineSamplesTest.cs index c1a60d89316a..ac042ff42648 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/TemplateEngineSamplesTest.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/TemplateEngineSamplesTest.cs @@ -50,7 +50,7 @@ public async Task TemplateEngineSamplesProjectTest( TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: shortName) { TemplatePath = templateLocation, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Snapshots"), + SnapshotsDirectory = SnapshotsDirectory, DoNotPrependCallerMethodNameToScenarioName = true, ScenarioName = $"{folderName.Substring(folderName.IndexOf('-') + 1)}{argsScenarioName}" } diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/VerificationEngineTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/VerificationEngineTests.cs index 41e164072429..def9b8c79703 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/VerificationEngineTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/VerificationEngineTests.cs @@ -150,7 +150,7 @@ public async Task VerificationEngine_DotFile_EditorConfigTests() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: "editorconfig") { TemplateSpecificArgs = new[] { "--empty" }, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Snapshots"), + SnapshotsDirectory = SnapshotsDirectory, VerifyCommandOutput = true, }; @@ -166,7 +166,7 @@ public async Task VerificationEngine_InstallsToCustomLocation_WithSettingsDirect TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: "editorconfig") { TemplateSpecificArgs = new[] { "--empty" }, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Snapshots"), + SnapshotsDirectory = SnapshotsDirectory, VerifyCommandOutput = false, SettingsDirectory = settingsPath }; diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/AuthoringTemplatesTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/AuthoringTemplatesTests.cs index 94cad3c89ba7..577c1d82370e 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/AuthoringTemplatesTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/AuthoringTemplatesTests.cs @@ -31,7 +31,7 @@ public async Task TemplateJsonTest() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Snapshots"), + SnapshotsDirectory = SnapshotsDirectory, OutputDirectory = workingDir, DoNotPrependCallerMethodNameToScenarioName = true, ScenarioName = "Basic", @@ -60,7 +60,7 @@ public async Task TemplateJsonTest_WithParameters() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Snapshots"), + SnapshotsDirectory = SnapshotsDirectory, OutputDirectory = workingDir, DoNotPrependCallerMethodNameToScenarioName = true, ScenarioName = "WithParams", @@ -88,7 +88,7 @@ public async Task TemplateJsonTest_NoConfigFolder() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Snapshots"), + SnapshotsDirectory = SnapshotsDirectory, OutputDirectory = workingDir, DoNotPrependCallerMethodNameToScenarioName = true, ScenarioName = "NoConfigFolder", @@ -111,7 +111,7 @@ public async Task TemplatePackageTest() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Snapshots"), + SnapshotsDirectory = SnapshotsDirectory, OutputDirectory = workingDir, DoNotPrependCallerMethodNameToScenarioName = true, ScenarioName = "Basic", @@ -138,7 +138,7 @@ public async Task TemplatePackageTest_WithName() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Snapshots"), + SnapshotsDirectory = SnapshotsDirectory, OutputDirectory = workingDir, DoNotPrependCallerMethodNameToScenarioName = true, ScenarioName = "WithName", @@ -166,7 +166,7 @@ public async Task TemplatePackageTest_NoMSBuildTasks() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Snapshots"), + SnapshotsDirectory = SnapshotsDirectory, OutputDirectory = workingDir, DoNotPrependCallerMethodNameToScenarioName = true, ScenarioName = "NoMSBuildTasks", @@ -189,7 +189,7 @@ public async Task TemplateJsonTest_CLI() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Snapshots"), + SnapshotsDirectory = SnapshotsDirectory, OutputDirectory = workingDir, DoNotPrependCallerMethodNameToScenarioName = true, VerifyCommandOutput = true, @@ -211,7 +211,7 @@ public async Task TemplatePackageTest_CLI() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Snapshots"), + SnapshotsDirectory = SnapshotsDirectory, OutputDirectory = workingDir, DoNotPrependCallerMethodNameToScenarioName = true, VerifyCommandOutput = true, diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/SnapshotTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/SnapshotTests.cs index 8fb1122b6e24..155cb88bc005 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/SnapshotTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/SnapshotTests.cs @@ -30,7 +30,7 @@ public Task PreferDefaultNameTest() new TemplateVerifierOptions(templateName: "TestAssets.TemplateWithPreferDefaultName") { TemplatePath = templateLocation, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals"), + SnapshotsDirectory = ApprovalsDirectory, DoNotPrependTemplateNameToScenarioName = true, DoNotAppendTemplateArgsToScenarioName = true, ScenarioName = "Basic" @@ -50,7 +50,7 @@ public Task TemplateWithOnlyIfStatementTest() new TemplateVerifierOptions(templateName: "TestAssets.TemplateWithOnlyIfStatement") { TemplatePath = templateLocation, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals"), + SnapshotsDirectory = ApprovalsDirectory, DoNotPrependTemplateNameToScenarioName = true, DoNotAppendTemplateArgsToScenarioName = true, ScenarioName = "Basic" @@ -70,7 +70,7 @@ public Task TemplateWithOnlyIfStatementTestForLocalhostTest() new TemplateVerifierOptions(templateName: "TestAssets.TemplateWithOnlyIfForLocalhost") { TemplatePath = templateLocation, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals"), + SnapshotsDirectory = ApprovalsDirectory, DoNotPrependTemplateNameToScenarioName = true, DoNotAppendTemplateArgsToScenarioName = true, ScenarioName = "Basic" @@ -99,7 +99,7 @@ public async Task BooleanConditionsTest(string testName, string?[]? parametersAr TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals"), + SnapshotsDirectory = ApprovalsDirectory, OutputDirectory = workingDirectory, DoNotPrependTemplateNameToScenarioName = true, DoNotAppendTemplateArgsToScenarioName = true, @@ -145,7 +145,7 @@ public async Task LegacyTests(string scenarioName, string templateFolderName, st TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals"), + SnapshotsDirectory = ApprovalsDirectory, OutputDirectory = workingDirectory, DoNotPrependTemplateNameToScenarioName = true, DoNotAppendTemplateArgsToScenarioName = false, @@ -169,7 +169,7 @@ public async Task LegacyTest_PortsAndCoalesceRenames() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: "TestAssets.TemplateWithPortsAndCoalesce") { TemplatePath = templateLocation, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals"), + SnapshotsDirectory = ApprovalsDirectory, OutputDirectory = workingDirectory, DoNotPrependTemplateNameToScenarioName = true, DoNotAppendTemplateArgsToScenarioName = false, diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/VerifySettingsFixture.cs b/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/VerifySettingsFixture.cs index 6f213f0c781e..30ced43aa3ec 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/VerifySettingsFixture.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/VerifySettingsFixture.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using VerifyTests.DiffPlex; +using Microsoft.TemplateEngine.Tests; namespace Microsoft.TemplateEngine.IDE.IntegrationTests { @@ -19,7 +20,7 @@ public VerifySettingsFixture() DerivePathInfo( (_, _, type, method) => new( - directory: Path.Combine(AppContext.BaseDirectory, "Approvals"), + directory: TestBase.ApprovalsDirectory, typeName: type.Name, methodName: method.Name)); diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/SnapshotTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/SnapshotTests.cs index 8529db34fa9c..7925ffe88fae 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/SnapshotTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/SnapshotTests.cs @@ -39,7 +39,7 @@ public Task TestGeneratedSymbolWithRefToDerivedSymbol() OutputDirectory = workingDir, DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals") + SnapshotsDirectory = ApprovalsDirectory } .WithInstantiationThroughTemplateCreatorApi(templateParams); @@ -64,7 +64,7 @@ public Task TestGeneratedSymbolWithRefToDerivedSymbol_DifferentOrder() OutputDirectory = workingDir, DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals") + SnapshotsDirectory = ApprovalsDirectory } .WithInstantiationThroughTemplateCreatorApi(templateParams); @@ -89,7 +89,7 @@ public Task TestCoalesce_EmptyStringForMultiChoices() OutputDirectory = workingDir, DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals") + SnapshotsDirectory = ApprovalsDirectory } .WithInstantiationThroughTemplateCreatorApi(templateParams); @@ -114,7 +114,7 @@ public Task TestSingleSelectionForMultiChoices() OutputDirectory = workingDir, DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals") + SnapshotsDirectory = ApprovalsDirectory } .WithInstantiationThroughTemplateCreatorApi(templateParams); @@ -140,7 +140,7 @@ public Task TestTemplateWithBrokenGeneratedInComputed() DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, VerifyCommandOutput = true, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals") + SnapshotsDirectory = ApprovalsDirectory } .WithInstantiationThroughTemplateCreatorApi(templateParams); @@ -162,7 +162,7 @@ public Task TestTemplateWithComputedInGenerated() DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, VerifyCommandOutput = true, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals") + SnapshotsDirectory = ApprovalsDirectory } .WithInstantiationThroughTemplateCreatorApi( new Dictionary() @@ -188,7 +188,7 @@ public Task TestTemplateWithComputedInDerivedThroughGenerated() DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, VerifyCommandOutput = true, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals") + SnapshotsDirectory = ApprovalsDirectory } .WithInstantiationThroughTemplateCreatorApi(new Dictionary()); @@ -210,7 +210,7 @@ public Task TestTemplateWithGeneratedInComputed() DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, VerifyCommandOutput = true, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals") + SnapshotsDirectory = ApprovalsDirectory } .WithInstantiationThroughTemplateCreatorApi( new Dictionary() @@ -237,7 +237,7 @@ public Task TestTemplateWithGeneratedSwitchInComputed() DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, VerifyCommandOutput = true, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals") + SnapshotsDirectory = ApprovalsDirectory } .WithInstantiationThroughTemplateCreatorApi( new Dictionary() @@ -266,7 +266,7 @@ public Task TestTemplateWithCircleDependencyInMacros() DoNotPrependTemplateNameToScenarioName = true, VerifyCommandOutput = true, IsCommandExpectedToFail = true, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals") + SnapshotsDirectory = ApprovalsDirectory } .WithInstantiationThroughTemplateCreatorApi(new Dictionary()); @@ -295,7 +295,7 @@ public Task TestSelectionForMultiChoicesWhenThereAreMultiplePartialMatchesAndOne OutputDirectory = workingDir, DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, - SnapshotsDirectory = Path.Combine(AppContext.BaseDirectory, "Approvals") + SnapshotsDirectory = ApprovalsDirectory } .WithInstantiationThroughTemplateCreatorApi(templateParams); diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/VerifySettingsFixture.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/VerifySettingsFixture.cs index abd24afbc722..a40f32e04fb6 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/VerifySettingsFixture.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/VerifySettingsFixture.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.TemplateEngine.Tests; using VerifyTests.DiffPlex; namespace Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests @@ -18,7 +19,7 @@ public VerifySettingsFixture() s_called = true; DerivePathInfo( (_, _, type, method) => new( - directory: Path.Combine(AppContext.BaseDirectory, "Approvals"), + directory: TestBase.ApprovalsDirectory, typeName: type.Name, methodName: method.Name)); diff --git a/test/TemplateEngine/Shared/TestBase.cs b/test/TemplateEngine/Shared/TestBase.cs index e384f11b8c46..ff482f74b878 100644 --- a/test/TemplateEngine/Shared/TestBase.cs +++ b/test/TemplateEngine/Shared/TestBase.cs @@ -37,6 +37,10 @@ internal static string ShippingPackagesLocation internal static string TemplateFeedLocation { get; } = SdkTestContext.Current.RepoTemplatePackages; + internal static string ApprovalsDirectory { get; } = Path.Combine(AppContext.BaseDirectory, "Approvals"); + + internal static string SnapshotsDirectory { get; } = Path.Combine(AppContext.BaseDirectory, "Snapshots"); + internal static string TestTemplatesLocation { get; } = Path.Combine(SdkTestContext.Current.TestAssetsDirectory, "TestPackages", "TemplateEngine", "test_templates"); From dc482f128b01312d9f310ee242ee5f08d4c72f23 Mon Sep 17 00:00:00 2001 From: Copilot Date: Wed, 15 Apr 2026 14:42:06 +0000 Subject: [PATCH 40/48] Use TestBase.TestTemplatesLocation in ExportCommandTests Replace raw AppContext.BaseDirectory + test_templates path with the existing TestBase helper property for consistency. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../ExportCommandTests.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ExportCommandTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ExportCommandTests.cs index 19454e6591a3..55417747a05f 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ExportCommandTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ExportCommandTests.cs @@ -243,12 +243,11 @@ private static string GetTestTemplateInTempDir(string templateName) private static string GetTestTemplateJsonContent() { - string templateJsonPath = Path.GetFullPath(Path.Combine( - AppContext.BaseDirectory, - "test_templates", + string templateJsonPath = Path.Combine( + TestTemplatesLocation, "TemplateWithLocalization", ".template.config", - "template.json")); + "template.json"); return File.ReadAllText(templateJsonPath); } From e01a5dfa5fb6c374155d2c617c6561bafcd66c96 Mon Sep 17 00:00:00 2001 From: Copilot Date: Wed, 15 Apr 2026 15:24:42 +0000 Subject: [PATCH 41/48] Clean up test infrastructure: consolidate paths, reduce Using removes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add SetupNuGetConfigForPackagesLocation helper to TestBase - Remove unnecessary TestTemplates ProjectReferences (CLI, TemplateVerifier, TemplateLocalizer) — tests access templates via TestBase.TestTemplatesLocation - TemplateLocalizer: link Shared/TestBase.cs and use TestTemplatesLocation - Reduce Directory.Build.targets Using removes from 6 to 2 (only the ones with actual type conflicts remain) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- test/TemplateEngine/Directory.Build.targets | 8 +++----- ...mplateEngine.Authoring.CLI.IntegrationTests.csproj | 1 - .../LocalizeTemplateTests.cs | 9 ++++----- .../ValidateTemplatesTests.cs | 5 ++--- ...Authoring.TemplateVerifier.IntegrationTests.csproj | 1 - .../VerificationEngineTests.cs | 5 +++-- ...lateEngine.TemplateLocalizer.Core.UnitTests.csproj | 6 +++++- .../StringExtractorTests.cs | 8 ++++---- test/TemplateEngine/Shared/TestBase.cs | 11 +++++++++++ 9 files changed, 32 insertions(+), 22 deletions(-) diff --git a/test/TemplateEngine/Directory.Build.targets b/test/TemplateEngine/Directory.Build.targets index 3a697a273712..7ac0cbdc6799 100644 --- a/test/TemplateEngine/Directory.Build.targets +++ b/test/TemplateEngine/Directory.Build.targets @@ -3,13 +3,11 @@ - + - - - - diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj index 15dad9ad9d63..927b21b3e958 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj @@ -6,7 +6,6 @@ - diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/LocalizeTemplateTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/LocalizeTemplateTests.cs index f2e63b29ffcd..21488c848eec 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/LocalizeTemplateTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/LocalizeTemplateTests.cs @@ -1,7 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.NET.TestFramework; using Microsoft.TemplateEngine.CommandUtils; using Microsoft.TemplateEngine.TestHelper; using Microsoft.TemplateEngine.Tests; @@ -23,7 +22,7 @@ public void CanRunTask() { string tmpDir = TestUtils.CreateTemporaryFolder(); TestUtils.DirectoryCopy("Resources/BasicTemplatePackage", tmpDir, true); - TestUtils.SetupNuGetConfigForPackagesLocation(tmpDir, new[] { ShippingPackagesLocation, SdkTestContext.Current.TestPackages }); + SetupNuGetConfigForPackagesLocation(tmpDir); new DotnetCommand(_log, "add", "TemplatePackage.csproj", "package", "Microsoft.TemplateEngine.Authoring.Tasks", "--prerelease") .WithoutTelemetry() @@ -53,7 +52,7 @@ public void CanRunTaskSelectedLangs() { string tmpDir = TestUtils.CreateTemporaryFolder(); TestUtils.DirectoryCopy("Resources/TemplatePackageEnDe", tmpDir, true); - TestUtils.SetupNuGetConfigForPackagesLocation(tmpDir, new[] { ShippingPackagesLocation, SdkTestContext.Current.TestPackages }); + SetupNuGetConfigForPackagesLocation(tmpDir); new DotnetCommand(_log, "add", "TemplatePackage.csproj", "package", "Microsoft.TemplateEngine.Authoring.Tasks", "--prerelease") .WithoutTelemetry() @@ -84,7 +83,7 @@ public void CanRunTaskSelectedTemplates() { string tmpDir = TestUtils.CreateTemporaryFolder(); TestUtils.DirectoryCopy("Resources/TemplatePackagePartiallyLocalized", tmpDir, true); - TestUtils.SetupNuGetConfigForPackagesLocation(tmpDir, new[] { ShippingPackagesLocation, SdkTestContext.Current.TestPackages }); + SetupNuGetConfigForPackagesLocation(tmpDir); new DotnetCommand(_log, "add", "TemplatePackage.csproj", "package", "Microsoft.TemplateEngine.Authoring.Tasks", "--prerelease") .WithoutTelemetry() @@ -116,7 +115,7 @@ public void CanRunTaskAndDetectError() { string tmpDir = TestUtils.CreateTemporaryFolder(); TestUtils.DirectoryCopy("Resources/InvalidTemplatePackage", tmpDir, true); - TestUtils.SetupNuGetConfigForPackagesLocation(tmpDir, new[] { ShippingPackagesLocation, SdkTestContext.Current.TestPackages }); + SetupNuGetConfigForPackagesLocation(tmpDir); new DotnetCommand(_log, "add", "TemplatePackage.csproj", "package", "Microsoft.TemplateEngine.Authoring.Tasks", "--prerelease") .WithoutTelemetry() diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/ValidateTemplatesTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/ValidateTemplatesTests.cs index 0eb073fd7c11..ba51860cb551 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/ValidateTemplatesTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/ValidateTemplatesTests.cs @@ -1,7 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.NET.TestFramework; using Microsoft.TemplateEngine.CommandUtils; using Microsoft.TemplateEngine.TestHelper; using Microsoft.TemplateEngine.Tests; @@ -23,7 +22,7 @@ public void CanRunValidateTask_OnError() { string tmpDir = TestUtils.CreateTemporaryFolder(); TestUtils.DirectoryCopy("Resources/InvalidTemplatePackage_MissingName", tmpDir, true); - TestUtils.SetupNuGetConfigForPackagesLocation(tmpDir, new[] { ShippingPackagesLocation, SdkTestContext.Current.TestPackages }); + SetupNuGetConfigForPackagesLocation(tmpDir); new DotnetCommand(_log, "add", "TemplatePackage.csproj", "package", "Microsoft.TemplateEngine.Authoring.Tasks", "--prerelease") .WithoutTelemetry() @@ -47,7 +46,7 @@ public void CanRunValidateTask_OnInfo() { string tmpDir = TestUtils.CreateTemporaryFolder(); TestUtils.DirectoryCopy("Resources/InvalidTemplatePackage_MissingOptionalData", tmpDir, true); - TestUtils.SetupNuGetConfigForPackagesLocation(tmpDir, new[] { ShippingPackagesLocation, SdkTestContext.Current.TestPackages }); + SetupNuGetConfigForPackagesLocation(tmpDir); new DotnetCommand(_log, "add", "TemplatePackage.csproj", "package", "Microsoft.TemplateEngine.Authoring.Tasks", "--prerelease") .WithoutTelemetry() diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj index 224290ce2801..8abe84b45046 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj @@ -5,7 +5,6 @@ - diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/VerificationEngineTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/VerificationEngineTests.cs index def9b8c79703..5d262353db2b 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/VerificationEngineTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/VerificationEngineTests.cs @@ -4,6 +4,7 @@ using FluentAssertions; using Microsoft.Extensions.Logging; using Microsoft.TemplateEngine.TestHelper; +using Microsoft.TemplateEngine.Tests; namespace Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests { @@ -150,7 +151,7 @@ public async Task VerificationEngine_DotFile_EditorConfigTests() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: "editorconfig") { TemplateSpecificArgs = new[] { "--empty" }, - SnapshotsDirectory = SnapshotsDirectory, + SnapshotsDirectory = TestBase.SnapshotsDirectory, VerifyCommandOutput = true, }; @@ -166,7 +167,7 @@ public async Task VerificationEngine_InstallsToCustomLocation_WithSettingsDirect TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: "editorconfig") { TemplateSpecificArgs = new[] { "--empty" }, - SnapshotsDirectory = SnapshotsDirectory, + SnapshotsDirectory = TestBase.SnapshotsDirectory, VerifyCommandOutput = false, SettingsDirectory = settingsPath }; diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj index 89723f0a1978..89e7e38b5b64 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj @@ -6,7 +6,11 @@ - + + + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/StringExtractorTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/StringExtractorTests.cs index eea8dbaf08d1..aef74263278c 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/StringExtractorTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/StringExtractorTests.cs @@ -3,6 +3,7 @@ using System.Text.Json; using Microsoft.TemplateEngine.TemplateLocalizer.Core.Exceptions; +using Microsoft.TemplateEngine.Tests; using Xunit; namespace Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests @@ -187,12 +188,11 @@ private static IReadOnlyList ExtractStrings(string json, out str private static string GetTestTemplateJsonContent() { - string templateJsonPath = Path.GetFullPath(Path.Combine( - AppContext.BaseDirectory, - "test_templates", + string templateJsonPath = Path.Combine( + TestBase.TestTemplatesLocation, "TemplateWithLocalization", ".template.config", - "template.json")); + "template.json"); return File.ReadAllText(templateJsonPath); } diff --git a/test/TemplateEngine/Shared/TestBase.cs b/test/TemplateEngine/Shared/TestBase.cs index ff482f74b878..cac23d7f0f92 100644 --- a/test/TemplateEngine/Shared/TestBase.cs +++ b/test/TemplateEngine/Shared/TestBase.cs @@ -79,5 +79,16 @@ internal static string GetTestTemplateLocation(string templateName) } return Path.GetFullPath(templateLocation); } + + /// + /// Creates a NuGet.config in the specified directory with sources for both + /// shipping packages and locally-built test packages. + /// + internal static void SetupNuGetConfigForPackagesLocation(string projectDirectory) + { + TestUtils.SetupNuGetConfigForPackagesLocation( + projectDirectory, + new[] { ShippingPackagesLocation, SdkTestContext.Current.TestPackages }); + } } } From 3ffe9de9c55fbcbcc31255726a1592e7c1366b63 Mon Sep 17 00:00:00 2001 From: Copilot Date: Wed, 15 Apr 2026 19:01:49 +0000 Subject: [PATCH 42/48] Add arm64 verified snapshots for ExampleTemplateTest The SampleDogfoodTest uses UniqueFor=Architecture but only x64 snapshots existed, causing verification failures on macOS arm64 Helix workers. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../TestAssets.SampleTestTemplate/Test.cs | 6 ++++++ .../std-streams/stderr.txt | 1 + .../std-streams/stdout.txt | 1 + 3 files changed, 8 insertions(+) create mode 100644 test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Snapshots/TestAssets.SampleTestTemplate.SampleDogfoodTest.arm64.verified/TestAssets.SampleTestTemplate/Test.cs create mode 100644 test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Snapshots/TestAssets.SampleTestTemplate.SampleDogfoodTest.arm64.verified/std-streams/stderr.txt create mode 100644 test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Snapshots/TestAssets.SampleTestTemplate.SampleDogfoodTest.arm64.verified/std-streams/stdout.txt diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Snapshots/TestAssets.SampleTestTemplate.SampleDogfoodTest.arm64.verified/TestAssets.SampleTestTemplate/Test.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Snapshots/TestAssets.SampleTestTemplate.SampleDogfoodTest.arm64.verified/TestAssets.SampleTestTemplate/Test.cs new file mode 100644 index 000000000000..e68913f9bb42 --- /dev/null +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Snapshots/TestAssets.SampleTestTemplate.SampleDogfoodTest.arm64.verified/TestAssets.SampleTestTemplate/Test.cs @@ -0,0 +1,6 @@ + +// value of paramA: false +// value of paramB: true + + + // ******* diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Snapshots/TestAssets.SampleTestTemplate.SampleDogfoodTest.arm64.verified/std-streams/stderr.txt b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Snapshots/TestAssets.SampleTestTemplate.SampleDogfoodTest.arm64.verified/std-streams/stderr.txt new file mode 100644 index 000000000000..5f282702bb03 --- /dev/null +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Snapshots/TestAssets.SampleTestTemplate.SampleDogfoodTest.arm64.verified/std-streams/stderr.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Snapshots/TestAssets.SampleTestTemplate.SampleDogfoodTest.arm64.verified/std-streams/stdout.txt b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Snapshots/TestAssets.SampleTestTemplate.SampleDogfoodTest.arm64.verified/std-streams/stdout.txt new file mode 100644 index 000000000000..5a67fb40d407 --- /dev/null +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Snapshots/TestAssets.SampleTestTemplate.SampleDogfoodTest.arm64.verified/std-streams/stdout.txt @@ -0,0 +1 @@ +The template "%TEMPLATE%" was created successfully. \ No newline at end of file From 49f6eb8f1e0622ac53715d9d7206349f7c30adba Mon Sep 17 00:00:00 2001 From: Copilot Date: Wed, 15 Apr 2026 19:01:49 +0000 Subject: [PATCH 43/48] Fix TemplateDiscoveryTool version resolution $(Version) is empty when the GeneratedText property is evaluated because SDK versioning targets haven't been imported yet. Use a placeholder in GeneratedText and substitute $(Version) inside the AddGeneratedFile target where it is available. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../dotnet-new.IntegrationTests.csproj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj b/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj index 0ae965d096e4..2bb58a031841 100644 --- a/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj +++ b/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj @@ -66,7 +66,7 @@ namespace Microsoft.DotNet.Cli.New.IntegrationTests internal class TemplatePackageVersion { - public const string MicrosoftTemplateSearchTemplateDiscoveryPackageVersion = "$(Version)"%3B + public const string MicrosoftTemplateSearchTemplateDiscoveryPackageVersion = "TEMPLATE_DISCOVERY_VERSION_PLACEHOLDER"%3B } } ]]> @@ -91,12 +91,14 @@ namespace Microsoft.DotNet.Cli.New.IntegrationTests $(IntermediateOutputPath)TemplatePackagesPaths.cs + + $(GeneratedText.Replace('TEMPLATE_DISCOVERY_VERSION_PLACEHOLDER', '$(Version)')) - + From ef417aaaf4e0f472fc2af79d377e3934dab8d6f5 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 16 Apr 2026 14:04:18 +0000 Subject: [PATCH 44/48] Add comment explaining NuGet VersionOverride for netstandard compatibility This project targets netstandard2.0, but the latest NuGet packages used by the rest of the SDK have dropped netstandard support. VersionOverride pins these to an older netstandard-compatible version. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../Microsoft.TemplateEngine.Edge.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/TemplateEngine/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj b/src/TemplateEngine/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj index 9c84c9c2a1ba..2c61604c2880 100644 --- a/src/TemplateEngine/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj +++ b/src/TemplateEngine/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj @@ -30,6 +30,10 @@ + From a2de6f285906ccbc6299e99140c9790b8e9c7ffb Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 16 Apr 2026 09:55:53 -0500 Subject: [PATCH 45/48] Update Directory.Build.props Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- Directory.Build.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 9c5cc186f2b4..7552d8069f1b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -47,9 +47,9 @@ $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src')) - $(MSBuildThisFileDirectory)src\TemplateEngine\ - $(MSBuildThisFileDirectory)test\TemplateEngine\ - $(MSBuildThisFileDirectory)test\TestAssets\TestPackages\TemplateEngine\ + $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src', 'TemplateEngine')) + $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'test', 'TemplateEngine')) + $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'test', 'TestAssets', 'TestPackages', 'TemplateEngine')) $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'redist', '$(Configuration)')) $([MSBuild]::NormalizeDirectory('$(TestHostFolder)', 'dotnet')) $(TestHostDotNetRoot)$([System.IO.Path]::GetFileName('$(DotNetTool)')) From 90435c00b86a27b6ff06976066944ee8d60036f3 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 16 Apr 2026 15:30:11 +0000 Subject: [PATCH 46/48] Remove unnecessary GenerateProgramFile override for TemplateEngine tests The TemplateEngine test Directory.Build.props was overriding GenerateProgramFile to true, but this is unnecessary because xUnit v3's _XunitGenerateEntryPoint target automatically generates the entry point for test projects. This aligns TemplateEngine tests with the rest of the SDK test projects which rely on the repo-root setting of GenerateProgramFile=false. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- test/TemplateEngine/Directory.Build.props | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/TemplateEngine/Directory.Build.props b/test/TemplateEngine/Directory.Build.props index 241ffaf813c2..b18027a80044 100644 --- a/test/TemplateEngine/Directory.Build.props +++ b/test/TemplateEngine/Directory.Build.props @@ -12,9 +12,6 @@ MicrosoftAspNetCore - - true - $(NoWarn);IDE0005;0649;CA2016;CA5394;CA1802 From 6d1b0edea27e1d5f1846eb46dceeffa9ab598809 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 16 Apr 2026 15:33:19 +0000 Subject: [PATCH 47/48] Remove duplicate Content include for Approvals files The Approvals files were included as both Content and None items. The Content include is redundant since the None include with CopyToOutputDirectory is sufficient to copy files to the output directory. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- ...TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj index e913c4731a3f..b3eb05ee135a 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj @@ -39,7 +39,6 @@ - From 8652c2adfcb2ca1d11e5c89ff07aeb3ed0fd148b Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 16 Apr 2026 19:14:14 +0000 Subject: [PATCH 48/48] Use TestBase.SnapshotsDirectory instead of inline path construction Replace inline Path.Combine(AppContext.BaseDirectory, "Snapshots") with TestBase.SnapshotsDirectory to be consistent with the IntegrationTests project. Added Shared file compilation to the UnitTests Shared.props to make TestBase accessible. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- ...ngine.Authoring.TemplateVerifier.UnitTests.Shared.props | 4 ++++ .../VerificationEngineTests.cs | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.Shared.props b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.Shared.props index 6fc088b56ec0..00bd80640834 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.Shared.props +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.Shared.props @@ -9,4 +9,8 @@ + + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/VerificationEngineTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/VerificationEngineTests.cs index 75be4bcd99a2..e55d5a1a01a0 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/VerificationEngineTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/VerificationEngineTests.cs @@ -7,6 +7,7 @@ using Microsoft.TemplateEngine.Authoring.TemplateVerifier.Commands; using Microsoft.TemplateEngine.CommandUtils; using Microsoft.TemplateEngine.TestHelper; +using Microsoft.TemplateEngine.Tests; namespace Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests { @@ -111,7 +112,6 @@ await executeTask public async Task ExecuteSucceedsOnExpectedInstantiationFailure() { string workingDir = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName().Replace(".", string.Empty)); - string snapshotsDir = Path.Combine(AppContext.BaseDirectory, "Snapshots"); ICommandRunner commandRunner = A.Fake(); A.CallTo(() => commandRunner.RunCommand(A._)) @@ -121,7 +121,7 @@ public async Task ExecuteSucceedsOnExpectedInstantiationFailure() { TemplateSpecificArgs = new string[] { "--a", "-b", "c", "--d" }, //DisableDiffTool = true, - SnapshotsDirectory = snapshotsDir, + SnapshotsDirectory = TestBase.SnapshotsDirectory, IsCommandExpectedToFail = true, OutputDirectory = workingDir, VerifyCommandOutput = true, @@ -135,7 +135,6 @@ public async Task ExecuteSucceedsOnExpectedInstantiationFailure() public async Task ExecuteSucceedsOnExpectedInstantiationSuccess() { string workingDir = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName().Replace(".", string.Empty)); - string snapshotsDir = Path.Combine(AppContext.BaseDirectory, "Snapshots"); ICommandRunner commandRunner = A.Fake(); A.CallTo(() => commandRunner.RunCommand(A._)) @@ -145,7 +144,7 @@ public async Task ExecuteSucceedsOnExpectedInstantiationSuccess() { TemplateSpecificArgs = new string[] { "--x", "y", "-z" }, //DisableDiffTool = true, - SnapshotsDirectory = snapshotsDir, + SnapshotsDirectory = TestBase.SnapshotsDirectory, IsCommandExpectedToFail = false, OutputDirectory = workingDir, VerifyCommandOutput = true,