From 4eb74ac93d39c536e7ed20cf8d3766980e6450cb Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 7 Apr 2026 18:46:00 +0000 Subject: [PATCH] Move TemplateEngine TestTemplates to TestAssets/TestPackages/TemplateEngine These are test assets consumed at test time (packed into a NuGet package by tests), not build targets. Move them to TestAssets/ where they belong alongside other test-only content and inherit the existing build isolation provided by TestAssets/Directory.Build.props. The csproj now targets netstandard2.0 since it is a content-only template package with no build output. --- .../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 324 files changed, 2 insertions(+), 2 deletions(-) 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/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