diff --git a/Directory.Build.props b/Directory.Build.props index e84845c5fe8b..7552d8069f1b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -47,6 +47,9 @@ $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src')) + $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src', 'TemplateEngine')) + $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'test', 'TemplateEngine')) + $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'test', 'TestAssets', 'TestPackages', 'TemplateEngine')) $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'redist', '$(Configuration)')) $([MSBuild]::NormalizeDirectory('$(TestHostFolder)', 'dotnet')) $(TestHostDotNetRoot)$([System.IO.Path]::GetFileName('$(DotNetTool)')) diff --git a/Directory.Packages.props b/Directory.Packages.props index 26224a9a7e62..8fb65bcf38dd 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -14,6 +14,7 @@ + @@ -68,6 +69,7 @@ + @@ -79,12 +81,6 @@ - - - - - - @@ -110,6 +106,7 @@ + @@ -122,7 +119,7 @@ - + diff --git a/TemplateEngine.slnf b/TemplateEngine.slnf index 2467a6ebabbd..79ff3d0686ed 100644 --- a/TemplateEngine.slnf +++ b/TemplateEngine.slnf @@ -2,7 +2,6 @@ "solution": { "path": "sdk.slnx", "projects": [ - "test\\TestAssets\\TestPackages\\dotnet-new\\Microsoft.TemplateEngine.TestTemplates.csproj", "src\\Cli\\Microsoft.DotNet.Cli.Sln.Internal\\Microsoft.DotNet.Cli.Sln.Internal.csproj", "src\\Cli\\Microsoft.DotNet.Cli.Utils\\Microsoft.DotNet.Cli.Utils.csproj", "src\\Cli\\Microsoft.DotNet.Configurer\\Microsoft.DotNet.Configurer.csproj", @@ -13,12 +12,47 @@ "src\\Microsoft.Win32.Msi\\Microsoft.Win32.Msi.csproj", "src\\Resolvers\\Microsoft.DotNet.NativeWrapper\\Microsoft.DotNet.NativeWrapper.csproj", "src\\Resolvers\\Microsoft.DotNet.SdkResolver\\Microsoft.DotNet.SdkResolver.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.Abstractions\\Microsoft.TemplateEngine.Abstractions.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.Core.Contracts\\Microsoft.TemplateEngine.Core.Contracts.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.Core\\Microsoft.TemplateEngine.Core.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.Edge\\Microsoft.TemplateEngine.Edge.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.IDE\\Microsoft.TemplateEngine.IDE.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.Orchestrator.RunnableProjects\\Microsoft.TemplateEngine.Orchestrator.RunnableProjects.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.Utils\\Microsoft.TemplateEngine.Utils.csproj", + "src\\TemplateEngine\\Microsoft.TemplateSearch.Common\\Microsoft.TemplateSearch.Common.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.CLI\\Microsoft.TemplateEngine.Authoring.CLI.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.Tasks\\Microsoft.TemplateEngine.Authoring.Tasks.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier\\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.TemplateVerifier\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.TemplateLocalizer.Core\\Microsoft.TemplateEngine.TemplateLocalizer.Core.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateSearch.TemplateDiscovery\\Microsoft.TemplateSearch.TemplateDiscovery.csproj", + "template_feed\\Microsoft.DotNet.Common.ItemTemplates\\Microsoft.DotNet.Common.ItemTemplates.csproj", + "template_feed\\Microsoft.DotNet.Common.ProjectTemplates.11.0\\Microsoft.DotNet.Common.ProjectTemplates.11.0.csproj", + "template_feed\\Microsoft.TemplateEngine.Authoring.Templates\\Microsoft.TemplateEngine.Authoring.Templates.csproj", + "documentation\\TemplateEngine\\Samples\\Microsoft.TemplateEngine.Samples.csproj", + "test\\Microsoft.DotNet.TemplateLocator.Tests\\Microsoft.DotNet.TemplateLocator.Tests.csproj", "test\\Microsoft.NET.TestFramework\\Microsoft.NET.TestFramework.csproj", "test\\Microsoft.TemplateEngine.Cli.UnitTests\\Microsoft.TemplateEngine.Cli.UnitTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests\\Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.CLI.UnitTests\\Microsoft.TemplateEngine.Authoring.CLI.UnitTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests\\Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests\\Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.Core.UnitTests\\Microsoft.TemplateEngine.Core.UnitTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.Edge.UnitTests\\Microsoft.TemplateEngine.Edge.UnitTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.IDE.IntegrationTests\\Microsoft.TemplateEngine.IDE.IntegrationTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.Mocks\\Microsoft.TemplateEngine.Mocks.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests\\Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests\\Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.TestHelper\\Microsoft.TemplateEngine.TestHelper.csproj", + "test\\TemplateEngine\\Microsoft.TemplateEngine.Utils.UnitTests\\Microsoft.TemplateEngine.Utils.UnitTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateSearch.Common.UnitTests\\Microsoft.TemplateSearch.Common.UnitTests.csproj", + "test\\TemplateEngine\\Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests\\Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests.csproj", + "test\\TestAssets\\TestPackages\\dotnet-new\\Microsoft.TemplateEngine.TestTemplates.csproj", + "test\\TestAssets\\TestPackages\\TemplateEngine\\Microsoft.TemplateEngine.TestTemplates.csproj", "test\\dotnet-new.IntegrationTests\\dotnet-new.IntegrationTests.csproj", - "test\\dotnet.Tests\\dotnet.Tests.csproj", - "template_feed\\Microsoft.DotNet.Common.ItemTemplates\\Microsoft.DotNet.Common.ItemTemplates.csproj", - "template_feed\\Microsoft.DotNet.Common.ProjectTemplates.11.0\\Microsoft.DotNet.Common.ProjectTemplates.11.0.csproj" + "test\\dotnet.Tests\\dotnet.Tests.csproj" ] } } diff --git a/build/SetupHelixEnvironment.cmd b/build/SetupHelixEnvironment.cmd index 44502d045821..186b72f43e82 100644 --- a/build/SetupHelixEnvironment.cmd +++ b/build/SetupHelixEnvironment.cmd @@ -35,6 +35,7 @@ set DOTNET_SDK_TEST_EXECUTION_DIRECTORY=%TestExecutionDirectory% set DOTNET_SDK_TEST_MSBUILDSDKRESOLVER_FOLDER=%HELIX_CORRELATION_PAYLOAD%\r set DOTNET_SDK_TEST_ASSETS_DIRECTORY=%TestExecutionDirectory%\TestAssets set DOTNET_SDK_TEST_REPO_TEMPLATE_PACKAGES=%TestExecutionDirectory%\template_feed +set DOTNET_SDK_TEST_TEMPLATE_SAMPLES_DIR=%TestExecutionDirectory%\TemplateSamples REM call dotnet new so the first run message doesn't interfere with the first test dotnet new --debug:ephemeral-hive diff --git a/build/SetupHelixEnvironment.sh b/build/SetupHelixEnvironment.sh index 8eb1d997813b..abb6ee151ada 100644 --- a/build/SetupHelixEnvironment.sh +++ b/build/SetupHelixEnvironment.sh @@ -23,6 +23,7 @@ export DOTNET_SDK_TEST_EXECUTION_DIRECTORY=$TestExecutionDirectory export DOTNET_SDK_TEST_MSBUILDSDKRESOLVER_FOLDER=$HELIX_CORRELATION_PAYLOAD/r export DOTNET_SDK_TEST_ASSETS_DIRECTORY=$TestExecutionDirectory/TestAssets export DOTNET_SDK_TEST_REPO_TEMPLATE_PACKAGES=$TestExecutionDirectory/template_feed +export DOTNET_SDK_TEST_TEMPLATE_SAMPLES_DIR=$TestExecutionDirectory/TemplateSamples # call dotnet new so the first run message doesn't interfere with the first test dotnet new --debug:ephemeral-hive diff --git a/documentation/TemplateEngine/Samples/Microsoft.TemplateEngine.Samples.csproj b/documentation/TemplateEngine/Samples/Microsoft.TemplateEngine.Samples.csproj index 9d1ba4ce15d7..9a4c3db38b11 100644 --- a/documentation/TemplateEngine/Samples/Microsoft.TemplateEngine.Samples.csproj +++ b/documentation/TemplateEngine/Samples/Microsoft.TemplateEngine.Samples.csproj @@ -16,7 +16,7 @@ Microsoft Common Project File for Dotnet Template Samples en-US - https://github.com/dotnet/templating + https://github.com/dotnet/sdk Template True diff --git a/eng/Signing.props b/eng/Signing.props index 760095763542..aa45ce67ba91 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -94,6 +94,7 @@ + @@ -107,6 +108,8 @@ + + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 896c605295e3..e492a5379f8a 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -90,15 +90,6 @@ This file should be imported by eng/Versions.props 11.0.100-preview.4.26208.110 11.0.100-preview.4.26208.110 11.0.100-preview.4.26208.110 - 11.0.100-preview.4.26208.110 - 11.0.100-preview.4.26208.110 - 11.0.100-preview.4.26208.110 - 11.0.100-preview.4.26208.110 - 11.0.100-preview.4.26208.110 - 11.0.100-preview.4.26208.110 - 11.0.100-preview.4.26208.110 - 11.0.100-preview.4.26208.110 - 11.0.100-preview.4.26208.110 18.7.0-preview-26208-110 18.7.0-preview-26208-110 3.3.0-preview.4.26208.110 @@ -234,15 +225,6 @@ This file should be imported by eng/Versions.props $(MicrosoftSourceLinkCommonPackageVersion) $(MicrosoftSourceLinkGitHubPackageVersion) $(MicrosoftSourceLinkGitLabPackageVersion) - $(MicrosoftTemplateEngineAbstractionsPackageVersion) - $(MicrosoftTemplateEngineAuthoringTemplateVerifierXunitV3PackageVersion) - $(MicrosoftTemplateEngineEdgePackageVersion) - $(MicrosoftTemplateEngineMocksXunitV3PackageVersion) - $(MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion) - $(MicrosoftTemplateEngineTestHelperXunitV3PackageVersion) - $(MicrosoftTemplateEngineUtilsPackageVersion) - $(MicrosoftTemplateSearchCommonPackageVersion) - $(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion) $(MicrosoftTestPlatformBuildPackageVersion) $(MicrosoftTestPlatformCLIPackageVersion) $(MicrosoftWebXdtPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ecd31a568b4..72a986a27317 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,42 +2,6 @@ - - https://github.com/dotnet/dotnet - 0cf6b19ed68d2d52e097e6af6d6046b4eeefefe2 - - - https://github.com/dotnet/dotnet - 0cf6b19ed68d2d52e097e6af6d6046b4eeefefe2 - - - https://github.com/dotnet/dotnet - 0cf6b19ed68d2d52e097e6af6d6046b4eeefefe2 - - - https://github.com/dotnet/dotnet - 0cf6b19ed68d2d52e097e6af6d6046b4eeefefe2 - - - https://github.com/dotnet/dotnet - 0cf6b19ed68d2d52e097e6af6d6046b4eeefefe2 - - - https://github.com/dotnet/dotnet - 0cf6b19ed68d2d52e097e6af6d6046b4eeefefe2 - - - https://github.com/dotnet/dotnet - 0cf6b19ed68d2d52e097e6af6d6046b4eeefefe2 - - - https://github.com/dotnet/dotnet - 0cf6b19ed68d2d52e097e6af6d6046b4eeefefe2 - - - https://github.com/dotnet/dotnet - 0cf6b19ed68d2d52e097e6af6d6046b4eeefefe2 - https://github.com/dotnet/dotnet 0cf6b19ed68d2d52e097e6af6d6046b4eeefefe2 diff --git a/eng/Versions.props b/eng/Versions.props index 6cdcadaf47c9..3e37a6104252 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -61,6 +61,7 @@ 1.0.52 1.4.0 1.12.0 + 6.13.2 diff --git a/eng/dependabot/Packages.props b/eng/dependabot/Packages.props index 6128e5be0b3d..99559afd12aa 100644 --- a/eng/dependabot/Packages.props +++ b/eng/dependabot/Packages.props @@ -7,7 +7,7 @@ - + diff --git a/sdk.slnx b/sdk.slnx index d00715f702e3..c1a01bb05837 100644 --- a/sdk.slnx +++ b/sdk.slnx @@ -312,9 +312,31 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -362,6 +384,22 @@ + + + + + + + + + + + + + + + + @@ -377,6 +415,9 @@ + + + diff --git a/source-build.slnf b/source-build.slnf index 076f129615be..9eff857ad022 100644 --- a/source-build.slnf +++ b/source-build.slnf @@ -43,13 +43,28 @@ "src\\Tasks\\sdk-tasks\\sdk-tasks.csproj", "src\\Tasks\\Microsoft.NET.Build.Extensions.Tasks\\Microsoft.NET.Build.Extensions.Tasks.csproj", "src\\Tasks\\Microsoft.NET.Build.Tasks\\Microsoft.NET.Build.Tasks.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.Abstractions\\Microsoft.TemplateEngine.Abstractions.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.Core\\Microsoft.TemplateEngine.Core.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.Core.Contracts\\Microsoft.TemplateEngine.Core.Contracts.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.Edge\\Microsoft.TemplateEngine.Edge.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.IDE\\Microsoft.TemplateEngine.IDE.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.Orchestrator.RunnableProjects\\Microsoft.TemplateEngine.Orchestrator.RunnableProjects.csproj", + "src\\TemplateEngine\\Microsoft.TemplateEngine.Utils\\Microsoft.TemplateEngine.Utils.csproj", + "src\\TemplateEngine\\Microsoft.TemplateSearch.Common\\Microsoft.TemplateSearch.Common.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.CLI\\Microsoft.TemplateEngine.Authoring.CLI.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.Tasks\\Microsoft.TemplateEngine.Authoring.Tasks.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier\\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.TemplateVerifier\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.TemplateLocalizer.Core\\Microsoft.TemplateEngine.TemplateLocalizer.Core.csproj", + "src\\TemplateEngine\\Tools\\Microsoft.TemplateSearch.TemplateDiscovery\\Microsoft.TemplateSearch.TemplateDiscovery.csproj", "src\\WasmSdk\\Tasks\\Microsoft.NET.Sdk.WebAssembly.Tasks.csproj", "src\\WebSdk\\ProjectSystem\\Tasks\\Microsoft.NET.Sdk.Web.ProjectSystem.Tasks.csproj", "src\\WebSdk\\Publish\\Tasks\\Microsoft.NET.Sdk.Publish.Tasks.csproj", "src\\WebSdk\\Web\\Tasks\\Microsoft.NET.Sdk.Web.Tasks.csproj", "src\\WebSdk\\Worker\\Tasks\\Microsoft.NET.Sdk.Worker.Tasks.csproj", "template_feed\\Microsoft.DotNet.Common.ItemTemplates\\Microsoft.DotNet.Common.ItemTemplates.csproj", - "template_feed\\Microsoft.DotNet.Common.ProjectTemplates.11.0\\Microsoft.DotNet.Common.ProjectTemplates.11.0.csproj" + "template_feed\\Microsoft.DotNet.Common.ProjectTemplates.11.0\\Microsoft.DotNet.Common.ProjectTemplates.11.0.csproj", + "template_feed\\Microsoft.TemplateEngine.Authoring.Templates\\Microsoft.TemplateEngine.Authoring.Templates.csproj" ] } } diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Microsoft.TemplateEngine.Cli.csproj b/src/Cli/Microsoft.TemplateEngine.Cli/Microsoft.TemplateEngine.Cli.csproj index d590b2d17add..cb8a7e0d1ef9 100644 --- a/src/Cli/Microsoft.TemplateEngine.Cli/Microsoft.TemplateEngine.Cli.csproj +++ b/src/Cli/Microsoft.TemplateEngine.Cli/Microsoft.TemplateEngine.Cli.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/src/Cli/dotnet/dotnet.csproj b/src/Cli/dotnet/dotnet.csproj index 9575f2af9494..a874b4d28697 100644 --- a/src/Cli/dotnet/dotnet.csproj +++ b/src/Cli/dotnet/dotnet.csproj @@ -83,7 +83,7 @@ - + diff --git a/src/TemplateEngine/.editorconfig b/src/TemplateEngine/.editorconfig new file mode 100644 index 000000000000..6302ad145f70 --- /dev/null +++ b/src/TemplateEngine/.editorconfig @@ -0,0 +1,59 @@ +# EditorConfig for TemplateEngine projects + +[*.cs] +# IDE0005: Unnecessary using - TE projects multi-target including net472 which +# doesn't support implicit usings, so many usings are needed for net472 but +# flagged as unnecessary for netcoreapp TFMs. +dotnet_diagnostic.IDE0005.severity = suggestion + +dotnet_diagnostic.SA0001.severity = none +dotnet_diagnostic.SA1005.severity = none +dotnet_diagnostic.SA1101.severity = none +dotnet_diagnostic.SA1108.severity = none +dotnet_diagnostic.SA1118.severity = none +dotnet_diagnostic.SA1119.severity = none +dotnet_diagnostic.SA1120.severity = none +dotnet_diagnostic.SA1123.severity = none +dotnet_diagnostic.SA1124.severity = none +dotnet_diagnostic.SA1127.severity = none +dotnet_diagnostic.SA1128.severity = none +dotnet_diagnostic.SA1141.severity = warning +dotnet_diagnostic.SA1142.severity = warning +dotnet_diagnostic.SA1200.severity = none +dotnet_diagnostic.SA1201.severity = none +dotnet_diagnostic.SA1202.severity = none +dotnet_diagnostic.SA1203.severity = none +dotnet_diagnostic.SA1204.severity = none +dotnet_diagnostic.SA1214.severity = none +dotnet_diagnostic.SA1308.severity = none +dotnet_diagnostic.SA1309.severity = none +dotnet_diagnostic.SA1316.severity = warning +dotnet_diagnostic.SA1400.severity = none +dotnet_diagnostic.SA1402.severity = none +dotnet_diagnostic.SA1405.severity = silent +dotnet_diagnostic.SA1413.severity = none +dotnet_diagnostic.SA1414.severity = none +dotnet_diagnostic.SA1501.severity = none +dotnet_diagnostic.SA1502.severity = none +dotnet_diagnostic.SA1504.severity = none +dotnet_diagnostic.SA1508.severity = none +dotnet_diagnostic.SA1509.severity = none +dotnet_diagnostic.SA1512.severity = none +dotnet_diagnostic.SA1513.severity = none +dotnet_diagnostic.SA1515.severity = none +dotnet_diagnostic.SA1518.severity = none +dotnet_diagnostic.SA1600.severity = none +dotnet_diagnostic.SA1601.severity = none +dotnet_diagnostic.SA1602.severity = none +dotnet_diagnostic.SA1611.severity = none +dotnet_diagnostic.SA1614.severity = none +dotnet_diagnostic.SA1615.severity = none +dotnet_diagnostic.SA1616.severity = none +dotnet_diagnostic.SA1618.severity = none +dotnet_diagnostic.SA1622.severity = none +dotnet_diagnostic.SA1623.severity = none +dotnet_diagnostic.SA1625.severity = none +dotnet_diagnostic.SA1627.severity = none +dotnet_diagnostic.SA1633.severity = none +dotnet_diagnostic.SA1642.severity = none +dotnet_diagnostic.SA1649.severity = none diff --git a/src/TemplateEngine/Directory.Build.props b/src/TemplateEngine/Directory.Build.props new file mode 100644 index 000000000000..c492ef908413 --- /dev/null +++ b/src/TemplateEngine/Directory.Build.props @@ -0,0 +1,50 @@ + + + + + + + + $(NoWarn);NU5105;NU5128;NU5100;NU5118;0419;0649;RS0016;RS0041 + + + false + + + net472 + + + MicrosoftAspNetCore + 0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb + 0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7 + + + true + + + true + + + true + false + + + + + + + + diff --git a/src/TemplateEngine/Directory.Build.targets b/src/TemplateEngine/Directory.Build.targets new file mode 100644 index 000000000000..9119f88e7667 --- /dev/null +++ b/src/TemplateEngine/Directory.Build.targets @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/TemplateEngine/Microsoft.TemplateEngine.Core.Contracts/Microsoft.TemplateEngine.Core.Contracts.csproj b/src/TemplateEngine/Microsoft.TemplateEngine.Core.Contracts/Microsoft.TemplateEngine.Core.Contracts.csproj index b63552193378..c1bf0f11f5b0 100644 --- a/src/TemplateEngine/Microsoft.TemplateEngine.Core.Contracts/Microsoft.TemplateEngine.Core.Contracts.csproj +++ b/src/TemplateEngine/Microsoft.TemplateEngine.Core.Contracts/Microsoft.TemplateEngine.Core.Contracts.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/TemplateEngine/Microsoft.TemplateEngine.Core/Microsoft.TemplateEngine.Core.csproj b/src/TemplateEngine/Microsoft.TemplateEngine.Core/Microsoft.TemplateEngine.Core.csproj index fc34c94724cc..9f6b89199982 100644 --- a/src/TemplateEngine/Microsoft.TemplateEngine.Core/Microsoft.TemplateEngine.Core.csproj +++ b/src/TemplateEngine/Microsoft.TemplateEngine.Core/Microsoft.TemplateEngine.Core.csproj @@ -19,9 +19,9 @@ - - - + + + diff --git a/src/TemplateEngine/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj b/src/TemplateEngine/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj index b6bd9226e0d2..2c61604c2880 100644 --- a/src/TemplateEngine/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj +++ b/src/TemplateEngine/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj @@ -24,15 +24,19 @@ - - + + - - - + + + + diff --git a/src/TemplateEngine/Microsoft.TemplateEngine.IDE/Microsoft.TemplateEngine.IDE.csproj b/src/TemplateEngine/Microsoft.TemplateEngine.IDE/Microsoft.TemplateEngine.IDE.csproj index 7c17ac1e4746..cfa34f756b93 100644 --- a/src/TemplateEngine/Microsoft.TemplateEngine.IDE/Microsoft.TemplateEngine.IDE.csproj +++ b/src/TemplateEngine/Microsoft.TemplateEngine.IDE/Microsoft.TemplateEngine.IDE.csproj @@ -14,10 +14,10 @@ - - - - + + + + diff --git a/src/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.csproj b/src/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.csproj index 537f201c6c3d..d38430d4d543 100644 --- a/src/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.csproj +++ b/src/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/TemplateEngine/Microsoft.TemplateEngine.Utils/Microsoft.TemplateEngine.Utils.csproj b/src/TemplateEngine/Microsoft.TemplateEngine.Utils/Microsoft.TemplateEngine.Utils.csproj index 59c4595003b9..4c1b5225976f 100644 --- a/src/TemplateEngine/Microsoft.TemplateEngine.Utils/Microsoft.TemplateEngine.Utils.csproj +++ b/src/TemplateEngine/Microsoft.TemplateEngine.Utils/Microsoft.TemplateEngine.Utils.csproj @@ -26,7 +26,7 @@ - + diff --git a/src/TemplateEngine/Microsoft.TemplateEngine.sln b/src/TemplateEngine/Microsoft.TemplateEngine.sln deleted file mode 100644 index fb6a5b8be009..000000000000 --- a/src/TemplateEngine/Microsoft.TemplateEngine.sln +++ /dev/null @@ -1,652 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31429.26 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7DAC892E-ADAE-4CEB-8A0C-EDC452A5826A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8B498D0C-F488-4B38-8A7D-B20BF9DB6F60}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Core", "src\Microsoft.TemplateEngine.Core\Microsoft.TemplateEngine.Core.csproj", "{72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Abstractions", "src\Microsoft.TemplateEngine.Abstractions\Microsoft.TemplateEngine.Abstractions.csproj", "{0C92EDA7-492F-4CBA-9F36-61932CA5C1F4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Orchestrator.RunnableProjects", "src\Microsoft.TemplateEngine.Orchestrator.RunnableProjects\Microsoft.TemplateEngine.Orchestrator.RunnableProjects.csproj", "{578CE255-E412-4CC7-9A03-1EDCA522DA27}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Core.UnitTests", "test\Microsoft.TemplateEngine.Core.UnitTests\Microsoft.TemplateEngine.Core.UnitTests.csproj", "{62BD1600-18A2-400E-94F5-C33BBD67CA97}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Edge", "src\Microsoft.TemplateEngine.Edge\Microsoft.TemplateEngine.Edge.csproj", "{E22B59BD-A658-4E32-9407-C8D9570B9FDF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Utils", "src\Microsoft.TemplateEngine.Utils\Microsoft.TemplateEngine.Utils.csproj", "{A86924AE-4B77-47A8-A690-EDA395F075A9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Core.Contracts", "src\Microsoft.TemplateEngine.Core.Contracts\Microsoft.TemplateEngine.Core.Contracts.csproj", "{9FCFAD2A-061E-4FC0-848E-F0E8AA03676D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Utils.UnitTests", "test\Microsoft.TemplateEngine.Utils.UnitTests\Microsoft.TemplateEngine.Utils.UnitTests.csproj", "{62BD1609-18A2-400E-94F5-C33BBD67CA97}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Mocks", "test\Microsoft.TemplateEngine.Mocks\Microsoft.TemplateEngine.Mocks.csproj", "{865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests", "test\Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests\Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj", "{D9B16B88-4B85-4208-8F1C-39DFB248250C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.TestHelper", "test\Microsoft.TemplateEngine.TestHelper\Microsoft.TemplateEngine.TestHelper.csproj", "{FCB1B0F2-3067-4FE8-8A98-5EC80F38D534}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.IDE", "src\Microsoft.TemplateEngine.IDE\Microsoft.TemplateEngine.IDE.csproj", "{D26D7FC1-3DCD-434C-8261-63FCCEF27278}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Edge.UnitTests", "test\Microsoft.TemplateEngine.Edge.UnitTests\Microsoft.TemplateEngine.Edge.UnitTests.csproj", "{C416006F-FAE9-4263-8290-81B2AA81E024}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateSearch.Common", "src\Microsoft.TemplateSearch.Common\Microsoft.TemplateSearch.Common.csproj", "{4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateSearch.TemplateDiscovery", "tools\Microsoft.TemplateSearch.TemplateDiscovery\Microsoft.TemplateSearch.TemplateDiscovery.csproj", "{FBEBB725-F645-40DC-856C-D1BC7FB52CF3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.TestTemplates", "test\Microsoft.TemplateEngine.TestTemplates\Microsoft.TemplateEngine.TestTemplates.csproj", "{FC7516FB-7F44-4786-ADF2-589EF06C2EDE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.IDE.IntegrationTests", "test\Microsoft.TemplateEngine.IDE.IntegrationTests\Microsoft.TemplateEngine.IDE.IntegrationTests.csproj", "{0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateSearch.Common.UnitTests", "test\Microsoft.TemplateSearch.Common.UnitTests\Microsoft.TemplateSearch.Common.UnitTests.csproj", "{15304624-1774-4990-A0CC-7B9DA27A8FF6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.CLI", "tools\Microsoft.TemplateEngine.Authoring.CLI\Microsoft.TemplateEngine.Authoring.CLI.csproj", "{F8C5BBAA-99E9-46BA-87C9-9FB7F388F403}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.TemplateLocalizer.Core", "tools\Microsoft.TemplateEngine.TemplateLocalizer.Core\Microsoft.TemplateEngine.TemplateLocalizer.Core.csproj", "{ED5D6873-220B-4F9D-A30B-B99E950F8E26}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests", "test\Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests\Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj", "{858B2E28-1FF8-4ED2-A356-B576BD793B71}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests", "test\Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests\Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj", "{BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests", "test\Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests\Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests.csproj", "{B0330A2C-3F10-4C46-97DF-13D187564F70}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.Tasks", "tools\Microsoft.TemplateEngine.Authoring.Tasks\Microsoft.TemplateEngine.Authoring.Tasks.csproj", "{BD758B10-A47F-4159-B9A1-997723AF7349}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests", "test\Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests\Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj", "{2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C5186341-2064-49AA-B398-CDF4302D2823}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - Directory.Build.props = Directory.Build.props - Directory.Build.targets = Directory.Build.targets - exclusion.dic = exclusion.dic - Directory.Packages.props = Directory.Packages.props - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{B794BF86-4185-4DCE-AC86-C27D5D966B9B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.TemplateVerifier", "tools\Microsoft.TemplateEngine.Authoring.TemplateVerifier\Microsoft.TemplateEngine.Authoring.TemplateVerifier.csproj", "{12764D81-61A7-437A-90B6-9F245E43F457}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3", "tools\Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3\Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3.csproj", "{CC3780CC-83CF-415C-A759-E5D0D4A64768}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests", "test\Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests\Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj", "{B1DDA327-F55E-466A-AF3E-7F039B9B51A9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3", "test\Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3\Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3.csproj", "{3C9F1344-E773-42FF-B98D-BD7277608903}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests", "test\Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests\Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj", "{D478568D-CA20-4331-9019-F585B564425E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3", "test\Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3\Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3.csproj", "{33D7A35E-A457-42FB-B849-3E752A372D23}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.CLI.UnitTests", "test\Microsoft.TemplateEngine.Authoring.CLI.UnitTests\Microsoft.TemplateEngine.Authoring.CLI.UnitTests.csproj", "{E8B9226E-879F-495A-BDAD-2607844D048C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "eng", "eng", "{D190251C-5649-4DD6-A158-16D119116352}" - ProjectSection(SolutionItems) = preProject - eng\Versions.props = eng\Versions.props - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{43053BC4-32B4-4404-B62D-410F367CE0CE}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.TemplateEngine.CommandUtils", "Microsoft.TemplateEngine.CommandUtils", "{EE8CD472-D8C4-4CD0-BC84-6C305F5971AE}" - ProjectSection(SolutionItems) = preProject - tools\Shared\Microsoft.TemplateEngine.CommandUtils\ArgumentEscaper.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\ArgumentEscaper.cs - tools\Shared\Microsoft.TemplateEngine.CommandUtils\BasicCommand.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\BasicCommand.cs - tools\Shared\Microsoft.TemplateEngine.CommandUtils\Command.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\Command.cs - tools\Shared\Microsoft.TemplateEngine.CommandUtils\CommandResult.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\CommandResult.cs - tools\Shared\Microsoft.TemplateEngine.CommandUtils\CommandResultAssertions.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\CommandResultAssertions.cs - tools\Shared\Microsoft.TemplateEngine.CommandUtils\CommandResultExtensions.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\CommandResultExtensions.cs - tools\Shared\Microsoft.TemplateEngine.CommandUtils\DotnetCommand.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\DotnetCommand.cs - tools\Shared\Microsoft.TemplateEngine.CommandUtils\DotnetNewCommand.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\DotnetNewCommand.cs - tools\Shared\Microsoft.TemplateEngine.CommandUtils\NativeMethods.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\NativeMethods.cs - tools\Shared\Microsoft.TemplateEngine.CommandUtils\ProcessReaper.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\ProcessReaper.cs - tools\Shared\Microsoft.TemplateEngine.CommandUtils\SdkCommandSpec.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\SdkCommandSpec.cs - tools\Shared\Microsoft.TemplateEngine.CommandUtils\StreamForwarder.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\StreamForwarder.cs - tools\Shared\Microsoft.TemplateEngine.CommandUtils\TestCommand.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\TestCommand.cs - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.TemplateApiVerifier", "tools\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj", "{449B9DDA-F18C-411E-9A74-3930652BB78A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3", "tools\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3.csproj", "{3F3F695B-537E-44DD-93FE-A1D1B88F4589}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "template-samples", "template-samples", "{3A2D12C2-0455-4471-9EBB-91749BA3A60F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Samples", "dotnet-template-samples\Microsoft.TemplateEngine.Samples.csproj", "{DFB06A25-719F-4C8B-B84D-55D2D601BEF6}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "template-feed", "template-feed", "{FF433F83-22C2-46E0-99B3-4FFCA5190A94}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.Templates", "template_feed\Microsoft.TemplateEngine.Authoring.Templates\Microsoft.TemplateEngine.Authoring.Templates.csproj", "{1F74F8F5-99E4-47AE-8608-6D470325E81C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests", "test\Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests\Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests.csproj", "{8651DEEB-0291-4E49-92AA-3B097DAF9D37}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TemplateEngine.TestHelper.XunitV3", "test\Microsoft.TemplateEngine.TestHelper.XunitV3\Microsoft.TemplateEngine.TestHelper.XunitV3.csproj", "{AB8ED04A-5EBA-42AD-9AB9-8514617B27C8}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TemplateEngine.Mocks.XunitV3", "test\Microsoft.TemplateEngine.Mocks.XunitV3\Microsoft.TemplateEngine.Mocks.XunitV3.csproj", "{F7C1932C-49E3-4869-A123-8184534AD1E2}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF}.Debug|x64.ActiveCfg = Debug|Any CPU - {72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF}.Debug|x64.Build.0 = Debug|Any CPU - {72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF}.Debug|x86.ActiveCfg = Debug|Any CPU - {72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF}.Debug|x86.Build.0 = Debug|Any CPU - {72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF}.Release|Any CPU.Build.0 = Release|Any CPU - {72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF}.Release|x64.ActiveCfg = Release|Any CPU - {72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF}.Release|x64.Build.0 = Release|Any CPU - {72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF}.Release|x86.ActiveCfg = Release|Any CPU - {72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF}.Release|x86.Build.0 = Release|Any CPU - {0C92EDA7-492F-4CBA-9F36-61932CA5C1F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C92EDA7-492F-4CBA-9F36-61932CA5C1F4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C92EDA7-492F-4CBA-9F36-61932CA5C1F4}.Debug|x64.ActiveCfg = Debug|Any CPU - {0C92EDA7-492F-4CBA-9F36-61932CA5C1F4}.Debug|x64.Build.0 = Debug|Any CPU - {0C92EDA7-492F-4CBA-9F36-61932CA5C1F4}.Debug|x86.ActiveCfg = Debug|Any CPU - {0C92EDA7-492F-4CBA-9F36-61932CA5C1F4}.Debug|x86.Build.0 = Debug|Any CPU - {0C92EDA7-492F-4CBA-9F36-61932CA5C1F4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C92EDA7-492F-4CBA-9F36-61932CA5C1F4}.Release|Any CPU.Build.0 = Release|Any CPU - {0C92EDA7-492F-4CBA-9F36-61932CA5C1F4}.Release|x64.ActiveCfg = Release|Any CPU - {0C92EDA7-492F-4CBA-9F36-61932CA5C1F4}.Release|x64.Build.0 = Release|Any CPU - {0C92EDA7-492F-4CBA-9F36-61932CA5C1F4}.Release|x86.ActiveCfg = Release|Any CPU - {0C92EDA7-492F-4CBA-9F36-61932CA5C1F4}.Release|x86.Build.0 = Release|Any CPU - {578CE255-E412-4CC7-9A03-1EDCA522DA27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {578CE255-E412-4CC7-9A03-1EDCA522DA27}.Debug|Any CPU.Build.0 = Debug|Any CPU - {578CE255-E412-4CC7-9A03-1EDCA522DA27}.Debug|x64.ActiveCfg = Debug|Any CPU - {578CE255-E412-4CC7-9A03-1EDCA522DA27}.Debug|x64.Build.0 = Debug|Any CPU - {578CE255-E412-4CC7-9A03-1EDCA522DA27}.Debug|x86.ActiveCfg = Debug|Any CPU - {578CE255-E412-4CC7-9A03-1EDCA522DA27}.Debug|x86.Build.0 = Debug|Any CPU - {578CE255-E412-4CC7-9A03-1EDCA522DA27}.Release|Any CPU.ActiveCfg = Release|Any CPU - {578CE255-E412-4CC7-9A03-1EDCA522DA27}.Release|Any CPU.Build.0 = Release|Any CPU - {578CE255-E412-4CC7-9A03-1EDCA522DA27}.Release|x64.ActiveCfg = Release|Any CPU - {578CE255-E412-4CC7-9A03-1EDCA522DA27}.Release|x64.Build.0 = Release|Any CPU - {578CE255-E412-4CC7-9A03-1EDCA522DA27}.Release|x86.ActiveCfg = Release|Any CPU - {578CE255-E412-4CC7-9A03-1EDCA522DA27}.Release|x86.Build.0 = Release|Any CPU - {62BD1600-18A2-400E-94F5-C33BBD67CA97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {62BD1600-18A2-400E-94F5-C33BBD67CA97}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62BD1600-18A2-400E-94F5-C33BBD67CA97}.Debug|x64.ActiveCfg = Debug|Any CPU - {62BD1600-18A2-400E-94F5-C33BBD67CA97}.Debug|x64.Build.0 = Debug|Any CPU - {62BD1600-18A2-400E-94F5-C33BBD67CA97}.Debug|x86.ActiveCfg = Debug|Any CPU - {62BD1600-18A2-400E-94F5-C33BBD67CA97}.Debug|x86.Build.0 = Debug|Any CPU - {62BD1600-18A2-400E-94F5-C33BBD67CA97}.Release|Any CPU.ActiveCfg = Release|Any CPU - {62BD1600-18A2-400E-94F5-C33BBD67CA97}.Release|Any CPU.Build.0 = Release|Any CPU - {62BD1600-18A2-400E-94F5-C33BBD67CA97}.Release|x64.ActiveCfg = Release|Any CPU - {62BD1600-18A2-400E-94F5-C33BBD67CA97}.Release|x64.Build.0 = Release|Any CPU - {62BD1600-18A2-400E-94F5-C33BBD67CA97}.Release|x86.ActiveCfg = Release|Any CPU - {62BD1600-18A2-400E-94F5-C33BBD67CA97}.Release|x86.Build.0 = Release|Any CPU - {E22B59BD-A658-4E32-9407-C8D9570B9FDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E22B59BD-A658-4E32-9407-C8D9570B9FDF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E22B59BD-A658-4E32-9407-C8D9570B9FDF}.Debug|x64.ActiveCfg = Debug|Any CPU - {E22B59BD-A658-4E32-9407-C8D9570B9FDF}.Debug|x64.Build.0 = Debug|Any CPU - {E22B59BD-A658-4E32-9407-C8D9570B9FDF}.Debug|x86.ActiveCfg = Debug|Any CPU - {E22B59BD-A658-4E32-9407-C8D9570B9FDF}.Debug|x86.Build.0 = Debug|Any CPU - {E22B59BD-A658-4E32-9407-C8D9570B9FDF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E22B59BD-A658-4E32-9407-C8D9570B9FDF}.Release|Any CPU.Build.0 = Release|Any CPU - {E22B59BD-A658-4E32-9407-C8D9570B9FDF}.Release|x64.ActiveCfg = Release|Any CPU - {E22B59BD-A658-4E32-9407-C8D9570B9FDF}.Release|x64.Build.0 = Release|Any CPU - {E22B59BD-A658-4E32-9407-C8D9570B9FDF}.Release|x86.ActiveCfg = Release|Any CPU - {E22B59BD-A658-4E32-9407-C8D9570B9FDF}.Release|x86.Build.0 = Release|Any CPU - {A86924AE-4B77-47A8-A690-EDA395F075A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A86924AE-4B77-47A8-A690-EDA395F075A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A86924AE-4B77-47A8-A690-EDA395F075A9}.Debug|x64.ActiveCfg = Debug|Any CPU - {A86924AE-4B77-47A8-A690-EDA395F075A9}.Debug|x64.Build.0 = Debug|Any CPU - {A86924AE-4B77-47A8-A690-EDA395F075A9}.Debug|x86.ActiveCfg = Debug|Any CPU - {A86924AE-4B77-47A8-A690-EDA395F075A9}.Debug|x86.Build.0 = Debug|Any CPU - {A86924AE-4B77-47A8-A690-EDA395F075A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A86924AE-4B77-47A8-A690-EDA395F075A9}.Release|Any CPU.Build.0 = Release|Any CPU - {A86924AE-4B77-47A8-A690-EDA395F075A9}.Release|x64.ActiveCfg = Release|Any CPU - {A86924AE-4B77-47A8-A690-EDA395F075A9}.Release|x64.Build.0 = Release|Any CPU - {A86924AE-4B77-47A8-A690-EDA395F075A9}.Release|x86.ActiveCfg = Release|Any CPU - {A86924AE-4B77-47A8-A690-EDA395F075A9}.Release|x86.Build.0 = Release|Any CPU - {9FCFAD2A-061E-4FC0-848E-F0E8AA03676D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9FCFAD2A-061E-4FC0-848E-F0E8AA03676D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9FCFAD2A-061E-4FC0-848E-F0E8AA03676D}.Debug|x64.ActiveCfg = Debug|Any CPU - {9FCFAD2A-061E-4FC0-848E-F0E8AA03676D}.Debug|x64.Build.0 = Debug|Any CPU - {9FCFAD2A-061E-4FC0-848E-F0E8AA03676D}.Debug|x86.ActiveCfg = Debug|Any CPU - {9FCFAD2A-061E-4FC0-848E-F0E8AA03676D}.Debug|x86.Build.0 = Debug|Any CPU - {9FCFAD2A-061E-4FC0-848E-F0E8AA03676D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9FCFAD2A-061E-4FC0-848E-F0E8AA03676D}.Release|Any CPU.Build.0 = Release|Any CPU - {9FCFAD2A-061E-4FC0-848E-F0E8AA03676D}.Release|x64.ActiveCfg = Release|Any CPU - {9FCFAD2A-061E-4FC0-848E-F0E8AA03676D}.Release|x64.Build.0 = Release|Any CPU - {9FCFAD2A-061E-4FC0-848E-F0E8AA03676D}.Release|x86.ActiveCfg = Release|Any CPU - {9FCFAD2A-061E-4FC0-848E-F0E8AA03676D}.Release|x86.Build.0 = Release|Any CPU - {62BD1609-18A2-400E-94F5-C33BBD67CA97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {62BD1609-18A2-400E-94F5-C33BBD67CA97}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62BD1609-18A2-400E-94F5-C33BBD67CA97}.Debug|x64.ActiveCfg = Debug|Any CPU - {62BD1609-18A2-400E-94F5-C33BBD67CA97}.Debug|x64.Build.0 = Debug|Any CPU - {62BD1609-18A2-400E-94F5-C33BBD67CA97}.Debug|x86.ActiveCfg = Debug|Any CPU - {62BD1609-18A2-400E-94F5-C33BBD67CA97}.Debug|x86.Build.0 = Debug|Any CPU - {62BD1609-18A2-400E-94F5-C33BBD67CA97}.Release|Any CPU.ActiveCfg = Release|Any CPU - {62BD1609-18A2-400E-94F5-C33BBD67CA97}.Release|Any CPU.Build.0 = Release|Any CPU - {62BD1609-18A2-400E-94F5-C33BBD67CA97}.Release|x64.ActiveCfg = Release|Any CPU - {62BD1609-18A2-400E-94F5-C33BBD67CA97}.Release|x64.Build.0 = Release|Any CPU - {62BD1609-18A2-400E-94F5-C33BBD67CA97}.Release|x86.ActiveCfg = Release|Any CPU - {62BD1609-18A2-400E-94F5-C33BBD67CA97}.Release|x86.Build.0 = Release|Any CPU - {865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56}.Debug|Any CPU.Build.0 = Debug|Any CPU - {865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56}.Debug|x64.ActiveCfg = Debug|Any CPU - {865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56}.Debug|x64.Build.0 = Debug|Any CPU - {865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56}.Debug|x86.ActiveCfg = Debug|Any CPU - {865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56}.Debug|x86.Build.0 = Debug|Any CPU - {865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56}.Release|Any CPU.ActiveCfg = Release|Any CPU - {865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56}.Release|Any CPU.Build.0 = Release|Any CPU - {865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56}.Release|x64.ActiveCfg = Release|Any CPU - {865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56}.Release|x64.Build.0 = Release|Any CPU - {865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56}.Release|x86.ActiveCfg = Release|Any CPU - {865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56}.Release|x86.Build.0 = Release|Any CPU - {D9B16B88-4B85-4208-8F1C-39DFB248250C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9B16B88-4B85-4208-8F1C-39DFB248250C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9B16B88-4B85-4208-8F1C-39DFB248250C}.Debug|x64.ActiveCfg = Debug|Any CPU - {D9B16B88-4B85-4208-8F1C-39DFB248250C}.Debug|x64.Build.0 = Debug|Any CPU - {D9B16B88-4B85-4208-8F1C-39DFB248250C}.Debug|x86.ActiveCfg = Debug|Any CPU - {D9B16B88-4B85-4208-8F1C-39DFB248250C}.Debug|x86.Build.0 = Debug|Any CPU - {D9B16B88-4B85-4208-8F1C-39DFB248250C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9B16B88-4B85-4208-8F1C-39DFB248250C}.Release|Any CPU.Build.0 = Release|Any CPU - {D9B16B88-4B85-4208-8F1C-39DFB248250C}.Release|x64.ActiveCfg = Release|Any CPU - {D9B16B88-4B85-4208-8F1C-39DFB248250C}.Release|x64.Build.0 = Release|Any CPU - {D9B16B88-4B85-4208-8F1C-39DFB248250C}.Release|x86.ActiveCfg = Release|Any CPU - {D9B16B88-4B85-4208-8F1C-39DFB248250C}.Release|x86.Build.0 = Release|Any CPU - {FCB1B0F2-3067-4FE8-8A98-5EC80F38D534}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FCB1B0F2-3067-4FE8-8A98-5EC80F38D534}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FCB1B0F2-3067-4FE8-8A98-5EC80F38D534}.Debug|x64.ActiveCfg = Debug|Any CPU - {FCB1B0F2-3067-4FE8-8A98-5EC80F38D534}.Debug|x64.Build.0 = Debug|Any CPU - {FCB1B0F2-3067-4FE8-8A98-5EC80F38D534}.Debug|x86.ActiveCfg = Debug|Any CPU - {FCB1B0F2-3067-4FE8-8A98-5EC80F38D534}.Debug|x86.Build.0 = Debug|Any CPU - {FCB1B0F2-3067-4FE8-8A98-5EC80F38D534}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FCB1B0F2-3067-4FE8-8A98-5EC80F38D534}.Release|Any CPU.Build.0 = Release|Any CPU - {FCB1B0F2-3067-4FE8-8A98-5EC80F38D534}.Release|x64.ActiveCfg = Release|Any CPU - {FCB1B0F2-3067-4FE8-8A98-5EC80F38D534}.Release|x64.Build.0 = Release|Any CPU - {FCB1B0F2-3067-4FE8-8A98-5EC80F38D534}.Release|x86.ActiveCfg = Release|Any CPU - {FCB1B0F2-3067-4FE8-8A98-5EC80F38D534}.Release|x86.Build.0 = Release|Any CPU - {D26D7FC1-3DCD-434C-8261-63FCCEF27278}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D26D7FC1-3DCD-434C-8261-63FCCEF27278}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D26D7FC1-3DCD-434C-8261-63FCCEF27278}.Debug|x64.ActiveCfg = Debug|Any CPU - {D26D7FC1-3DCD-434C-8261-63FCCEF27278}.Debug|x64.Build.0 = Debug|Any CPU - {D26D7FC1-3DCD-434C-8261-63FCCEF27278}.Debug|x86.ActiveCfg = Debug|Any CPU - {D26D7FC1-3DCD-434C-8261-63FCCEF27278}.Debug|x86.Build.0 = Debug|Any CPU - {D26D7FC1-3DCD-434C-8261-63FCCEF27278}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D26D7FC1-3DCD-434C-8261-63FCCEF27278}.Release|Any CPU.Build.0 = Release|Any CPU - {D26D7FC1-3DCD-434C-8261-63FCCEF27278}.Release|x64.ActiveCfg = Release|Any CPU - {D26D7FC1-3DCD-434C-8261-63FCCEF27278}.Release|x64.Build.0 = Release|Any CPU - {D26D7FC1-3DCD-434C-8261-63FCCEF27278}.Release|x86.ActiveCfg = Release|Any CPU - {D26D7FC1-3DCD-434C-8261-63FCCEF27278}.Release|x86.Build.0 = Release|Any CPU - {C416006F-FAE9-4263-8290-81B2AA81E024}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C416006F-FAE9-4263-8290-81B2AA81E024}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C416006F-FAE9-4263-8290-81B2AA81E024}.Debug|x64.ActiveCfg = Debug|Any CPU - {C416006F-FAE9-4263-8290-81B2AA81E024}.Debug|x64.Build.0 = Debug|Any CPU - {C416006F-FAE9-4263-8290-81B2AA81E024}.Debug|x86.ActiveCfg = Debug|Any CPU - {C416006F-FAE9-4263-8290-81B2AA81E024}.Debug|x86.Build.0 = Debug|Any CPU - {C416006F-FAE9-4263-8290-81B2AA81E024}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C416006F-FAE9-4263-8290-81B2AA81E024}.Release|Any CPU.Build.0 = Release|Any CPU - {C416006F-FAE9-4263-8290-81B2AA81E024}.Release|x64.ActiveCfg = Release|Any CPU - {C416006F-FAE9-4263-8290-81B2AA81E024}.Release|x64.Build.0 = Release|Any CPU - {C416006F-FAE9-4263-8290-81B2AA81E024}.Release|x86.ActiveCfg = Release|Any CPU - {C416006F-FAE9-4263-8290-81B2AA81E024}.Release|x86.Build.0 = Release|Any CPU - {4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B}.Debug|x64.ActiveCfg = Debug|Any CPU - {4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B}.Debug|x64.Build.0 = Debug|Any CPU - {4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B}.Debug|x86.ActiveCfg = Debug|Any CPU - {4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B}.Debug|x86.Build.0 = Debug|Any CPU - {4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B}.Release|Any CPU.Build.0 = Release|Any CPU - {4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B}.Release|x64.ActiveCfg = Release|Any CPU - {4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B}.Release|x64.Build.0 = Release|Any CPU - {4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B}.Release|x86.ActiveCfg = Release|Any CPU - {4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B}.Release|x86.Build.0 = Release|Any CPU - {FBEBB725-F645-40DC-856C-D1BC7FB52CF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBEBB725-F645-40DC-856C-D1BC7FB52CF3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBEBB725-F645-40DC-856C-D1BC7FB52CF3}.Debug|x64.ActiveCfg = Debug|Any CPU - {FBEBB725-F645-40DC-856C-D1BC7FB52CF3}.Debug|x64.Build.0 = Debug|Any CPU - {FBEBB725-F645-40DC-856C-D1BC7FB52CF3}.Debug|x86.ActiveCfg = Debug|Any CPU - {FBEBB725-F645-40DC-856C-D1BC7FB52CF3}.Debug|x86.Build.0 = Debug|Any CPU - {FBEBB725-F645-40DC-856C-D1BC7FB52CF3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBEBB725-F645-40DC-856C-D1BC7FB52CF3}.Release|Any CPU.Build.0 = Release|Any CPU - {FBEBB725-F645-40DC-856C-D1BC7FB52CF3}.Release|x64.ActiveCfg = Release|Any CPU - {FBEBB725-F645-40DC-856C-D1BC7FB52CF3}.Release|x64.Build.0 = Release|Any CPU - {FBEBB725-F645-40DC-856C-D1BC7FB52CF3}.Release|x86.ActiveCfg = Release|Any CPU - {FBEBB725-F645-40DC-856C-D1BC7FB52CF3}.Release|x86.Build.0 = Release|Any CPU - {FC7516FB-7F44-4786-ADF2-589EF06C2EDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC7516FB-7F44-4786-ADF2-589EF06C2EDE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC7516FB-7F44-4786-ADF2-589EF06C2EDE}.Debug|x64.ActiveCfg = Debug|Any CPU - {FC7516FB-7F44-4786-ADF2-589EF06C2EDE}.Debug|x64.Build.0 = Debug|Any CPU - {FC7516FB-7F44-4786-ADF2-589EF06C2EDE}.Debug|x86.ActiveCfg = Debug|Any CPU - {FC7516FB-7F44-4786-ADF2-589EF06C2EDE}.Debug|x86.Build.0 = Debug|Any CPU - {FC7516FB-7F44-4786-ADF2-589EF06C2EDE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC7516FB-7F44-4786-ADF2-589EF06C2EDE}.Release|Any CPU.Build.0 = Release|Any CPU - {FC7516FB-7F44-4786-ADF2-589EF06C2EDE}.Release|x64.ActiveCfg = Release|Any CPU - {FC7516FB-7F44-4786-ADF2-589EF06C2EDE}.Release|x64.Build.0 = Release|Any CPU - {FC7516FB-7F44-4786-ADF2-589EF06C2EDE}.Release|x86.ActiveCfg = Release|Any CPU - {FC7516FB-7F44-4786-ADF2-589EF06C2EDE}.Release|x86.Build.0 = Release|Any CPU - {0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78}.Debug|x64.ActiveCfg = Debug|Any CPU - {0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78}.Debug|x64.Build.0 = Debug|Any CPU - {0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78}.Debug|x86.ActiveCfg = Debug|Any CPU - {0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78}.Debug|x86.Build.0 = Debug|Any CPU - {0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78}.Release|Any CPU.Build.0 = Release|Any CPU - {0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78}.Release|x64.ActiveCfg = Release|Any CPU - {0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78}.Release|x64.Build.0 = Release|Any CPU - {0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78}.Release|x86.ActiveCfg = Release|Any CPU - {0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78}.Release|x86.Build.0 = Release|Any CPU - {15304624-1774-4990-A0CC-7B9DA27A8FF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15304624-1774-4990-A0CC-7B9DA27A8FF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15304624-1774-4990-A0CC-7B9DA27A8FF6}.Debug|x64.ActiveCfg = Debug|Any CPU - {15304624-1774-4990-A0CC-7B9DA27A8FF6}.Debug|x64.Build.0 = Debug|Any CPU - {15304624-1774-4990-A0CC-7B9DA27A8FF6}.Debug|x86.ActiveCfg = Debug|Any CPU - {15304624-1774-4990-A0CC-7B9DA27A8FF6}.Debug|x86.Build.0 = Debug|Any CPU - {15304624-1774-4990-A0CC-7B9DA27A8FF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15304624-1774-4990-A0CC-7B9DA27A8FF6}.Release|Any CPU.Build.0 = Release|Any CPU - {15304624-1774-4990-A0CC-7B9DA27A8FF6}.Release|x64.ActiveCfg = Release|Any CPU - {15304624-1774-4990-A0CC-7B9DA27A8FF6}.Release|x64.Build.0 = Release|Any CPU - {15304624-1774-4990-A0CC-7B9DA27A8FF6}.Release|x86.ActiveCfg = Release|Any CPU - {15304624-1774-4990-A0CC-7B9DA27A8FF6}.Release|x86.Build.0 = Release|Any CPU - {F8C5BBAA-99E9-46BA-87C9-9FB7F388F403}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F8C5BBAA-99E9-46BA-87C9-9FB7F388F403}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F8C5BBAA-99E9-46BA-87C9-9FB7F388F403}.Debug|x64.ActiveCfg = Debug|Any CPU - {F8C5BBAA-99E9-46BA-87C9-9FB7F388F403}.Debug|x64.Build.0 = Debug|Any CPU - {F8C5BBAA-99E9-46BA-87C9-9FB7F388F403}.Debug|x86.ActiveCfg = Debug|Any CPU - {F8C5BBAA-99E9-46BA-87C9-9FB7F388F403}.Debug|x86.Build.0 = Debug|Any CPU - {F8C5BBAA-99E9-46BA-87C9-9FB7F388F403}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F8C5BBAA-99E9-46BA-87C9-9FB7F388F403}.Release|Any CPU.Build.0 = Release|Any CPU - {F8C5BBAA-99E9-46BA-87C9-9FB7F388F403}.Release|x64.ActiveCfg = Release|Any CPU - {F8C5BBAA-99E9-46BA-87C9-9FB7F388F403}.Release|x64.Build.0 = Release|Any CPU - {F8C5BBAA-99E9-46BA-87C9-9FB7F388F403}.Release|x86.ActiveCfg = Release|Any CPU - {F8C5BBAA-99E9-46BA-87C9-9FB7F388F403}.Release|x86.Build.0 = Release|Any CPU - {ED5D6873-220B-4F9D-A30B-B99E950F8E26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED5D6873-220B-4F9D-A30B-B99E950F8E26}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED5D6873-220B-4F9D-A30B-B99E950F8E26}.Debug|x64.ActiveCfg = Debug|Any CPU - {ED5D6873-220B-4F9D-A30B-B99E950F8E26}.Debug|x64.Build.0 = Debug|Any CPU - {ED5D6873-220B-4F9D-A30B-B99E950F8E26}.Debug|x86.ActiveCfg = Debug|Any CPU - {ED5D6873-220B-4F9D-A30B-B99E950F8E26}.Debug|x86.Build.0 = Debug|Any CPU - {ED5D6873-220B-4F9D-A30B-B99E950F8E26}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED5D6873-220B-4F9D-A30B-B99E950F8E26}.Release|Any CPU.Build.0 = Release|Any CPU - {ED5D6873-220B-4F9D-A30B-B99E950F8E26}.Release|x64.ActiveCfg = Release|Any CPU - {ED5D6873-220B-4F9D-A30B-B99E950F8E26}.Release|x64.Build.0 = Release|Any CPU - {ED5D6873-220B-4F9D-A30B-B99E950F8E26}.Release|x86.ActiveCfg = Release|Any CPU - {ED5D6873-220B-4F9D-A30B-B99E950F8E26}.Release|x86.Build.0 = Release|Any CPU - {858B2E28-1FF8-4ED2-A356-B576BD793B71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {858B2E28-1FF8-4ED2-A356-B576BD793B71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {858B2E28-1FF8-4ED2-A356-B576BD793B71}.Debug|x64.ActiveCfg = Debug|Any CPU - {858B2E28-1FF8-4ED2-A356-B576BD793B71}.Debug|x64.Build.0 = Debug|Any CPU - {858B2E28-1FF8-4ED2-A356-B576BD793B71}.Debug|x86.ActiveCfg = Debug|Any CPU - {858B2E28-1FF8-4ED2-A356-B576BD793B71}.Debug|x86.Build.0 = Debug|Any CPU - {858B2E28-1FF8-4ED2-A356-B576BD793B71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {858B2E28-1FF8-4ED2-A356-B576BD793B71}.Release|Any CPU.Build.0 = Release|Any CPU - {858B2E28-1FF8-4ED2-A356-B576BD793B71}.Release|x64.ActiveCfg = Release|Any CPU - {858B2E28-1FF8-4ED2-A356-B576BD793B71}.Release|x64.Build.0 = Release|Any CPU - {858B2E28-1FF8-4ED2-A356-B576BD793B71}.Release|x86.ActiveCfg = Release|Any CPU - {858B2E28-1FF8-4ED2-A356-B576BD793B71}.Release|x86.Build.0 = Release|Any CPU - {BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5}.Debug|x64.ActiveCfg = Debug|Any CPU - {BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5}.Debug|x64.Build.0 = Debug|Any CPU - {BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5}.Debug|x86.ActiveCfg = Debug|Any CPU - {BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5}.Debug|x86.Build.0 = Debug|Any CPU - {BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5}.Release|Any CPU.Build.0 = Release|Any CPU - {BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5}.Release|x64.ActiveCfg = Release|Any CPU - {BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5}.Release|x64.Build.0 = Release|Any CPU - {BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5}.Release|x86.ActiveCfg = Release|Any CPU - {BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5}.Release|x86.Build.0 = Release|Any CPU - {B0330A2C-3F10-4C46-97DF-13D187564F70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0330A2C-3F10-4C46-97DF-13D187564F70}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0330A2C-3F10-4C46-97DF-13D187564F70}.Debug|x64.ActiveCfg = Debug|Any CPU - {B0330A2C-3F10-4C46-97DF-13D187564F70}.Debug|x64.Build.0 = Debug|Any CPU - {B0330A2C-3F10-4C46-97DF-13D187564F70}.Debug|x86.ActiveCfg = Debug|Any CPU - {B0330A2C-3F10-4C46-97DF-13D187564F70}.Debug|x86.Build.0 = Debug|Any CPU - {B0330A2C-3F10-4C46-97DF-13D187564F70}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0330A2C-3F10-4C46-97DF-13D187564F70}.Release|Any CPU.Build.0 = Release|Any CPU - {B0330A2C-3F10-4C46-97DF-13D187564F70}.Release|x64.ActiveCfg = Release|Any CPU - {B0330A2C-3F10-4C46-97DF-13D187564F70}.Release|x64.Build.0 = Release|Any CPU - {B0330A2C-3F10-4C46-97DF-13D187564F70}.Release|x86.ActiveCfg = Release|Any CPU - {B0330A2C-3F10-4C46-97DF-13D187564F70}.Release|x86.Build.0 = Release|Any CPU - {BD758B10-A47F-4159-B9A1-997723AF7349}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD758B10-A47F-4159-B9A1-997723AF7349}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD758B10-A47F-4159-B9A1-997723AF7349}.Debug|x64.ActiveCfg = Debug|Any CPU - {BD758B10-A47F-4159-B9A1-997723AF7349}.Debug|x64.Build.0 = Debug|Any CPU - {BD758B10-A47F-4159-B9A1-997723AF7349}.Debug|x86.ActiveCfg = Debug|Any CPU - {BD758B10-A47F-4159-B9A1-997723AF7349}.Debug|x86.Build.0 = Debug|Any CPU - {BD758B10-A47F-4159-B9A1-997723AF7349}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD758B10-A47F-4159-B9A1-997723AF7349}.Release|Any CPU.Build.0 = Release|Any CPU - {BD758B10-A47F-4159-B9A1-997723AF7349}.Release|x64.ActiveCfg = Release|Any CPU - {BD758B10-A47F-4159-B9A1-997723AF7349}.Release|x64.Build.0 = Release|Any CPU - {BD758B10-A47F-4159-B9A1-997723AF7349}.Release|x86.ActiveCfg = Release|Any CPU - {BD758B10-A47F-4159-B9A1-997723AF7349}.Release|x86.Build.0 = Release|Any CPU - {2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE}.Debug|x64.ActiveCfg = Debug|Any CPU - {2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE}.Debug|x64.Build.0 = Debug|Any CPU - {2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE}.Debug|x86.ActiveCfg = Debug|Any CPU - {2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE}.Debug|x86.Build.0 = Debug|Any CPU - {2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE}.Release|Any CPU.Build.0 = Release|Any CPU - {2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE}.Release|x64.ActiveCfg = Release|Any CPU - {2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE}.Release|x64.Build.0 = Release|Any CPU - {2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE}.Release|x86.ActiveCfg = Release|Any CPU - {2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE}.Release|x86.Build.0 = Release|Any CPU - {12764D81-61A7-437A-90B6-9F245E43F457}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {12764D81-61A7-437A-90B6-9F245E43F457}.Debug|Any CPU.Build.0 = Debug|Any CPU - {12764D81-61A7-437A-90B6-9F245E43F457}.Debug|x64.ActiveCfg = Debug|Any CPU - {12764D81-61A7-437A-90B6-9F245E43F457}.Debug|x64.Build.0 = Debug|Any CPU - {12764D81-61A7-437A-90B6-9F245E43F457}.Debug|x86.ActiveCfg = Debug|Any CPU - {12764D81-61A7-437A-90B6-9F245E43F457}.Debug|x86.Build.0 = Debug|Any CPU - {12764D81-61A7-437A-90B6-9F245E43F457}.Release|Any CPU.ActiveCfg = Release|Any CPU - {12764D81-61A7-437A-90B6-9F245E43F457}.Release|Any CPU.Build.0 = Release|Any CPU - {12764D81-61A7-437A-90B6-9F245E43F457}.Release|x64.ActiveCfg = Release|Any CPU - {12764D81-61A7-437A-90B6-9F245E43F457}.Release|x64.Build.0 = Release|Any CPU - {12764D81-61A7-437A-90B6-9F245E43F457}.Release|x86.ActiveCfg = Release|Any CPU - {12764D81-61A7-437A-90B6-9F245E43F457}.Release|x86.Build.0 = Release|Any CPU - {B1DDA327-F55E-466A-AF3E-7F039B9B51A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1DDA327-F55E-466A-AF3E-7F039B9B51A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1DDA327-F55E-466A-AF3E-7F039B9B51A9}.Debug|x64.ActiveCfg = Debug|Any CPU - {B1DDA327-F55E-466A-AF3E-7F039B9B51A9}.Debug|x64.Build.0 = Debug|Any CPU - {B1DDA327-F55E-466A-AF3E-7F039B9B51A9}.Debug|x86.ActiveCfg = Debug|Any CPU - {B1DDA327-F55E-466A-AF3E-7F039B9B51A9}.Debug|x86.Build.0 = Debug|Any CPU - {B1DDA327-F55E-466A-AF3E-7F039B9B51A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1DDA327-F55E-466A-AF3E-7F039B9B51A9}.Release|Any CPU.Build.0 = Release|Any CPU - {B1DDA327-F55E-466A-AF3E-7F039B9B51A9}.Release|x64.ActiveCfg = Release|Any CPU - {B1DDA327-F55E-466A-AF3E-7F039B9B51A9}.Release|x64.Build.0 = Release|Any CPU - {B1DDA327-F55E-466A-AF3E-7F039B9B51A9}.Release|x86.ActiveCfg = Release|Any CPU - {B1DDA327-F55E-466A-AF3E-7F039B9B51A9}.Release|x86.Build.0 = Release|Any CPU - {D478568D-CA20-4331-9019-F585B564425E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D478568D-CA20-4331-9019-F585B564425E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D478568D-CA20-4331-9019-F585B564425E}.Debug|x64.ActiveCfg = Debug|Any CPU - {D478568D-CA20-4331-9019-F585B564425E}.Debug|x64.Build.0 = Debug|Any CPU - {D478568D-CA20-4331-9019-F585B564425E}.Debug|x86.ActiveCfg = Debug|Any CPU - {D478568D-CA20-4331-9019-F585B564425E}.Debug|x86.Build.0 = Debug|Any CPU - {D478568D-CA20-4331-9019-F585B564425E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D478568D-CA20-4331-9019-F585B564425E}.Release|Any CPU.Build.0 = Release|Any CPU - {D478568D-CA20-4331-9019-F585B564425E}.Release|x64.ActiveCfg = Release|Any CPU - {D478568D-CA20-4331-9019-F585B564425E}.Release|x64.Build.0 = Release|Any CPU - {D478568D-CA20-4331-9019-F585B564425E}.Release|x86.ActiveCfg = Release|Any CPU - {D478568D-CA20-4331-9019-F585B564425E}.Release|x86.Build.0 = Release|Any CPU - {E8B9226E-879F-495A-BDAD-2607844D048C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8B9226E-879F-495A-BDAD-2607844D048C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8B9226E-879F-495A-BDAD-2607844D048C}.Debug|x64.ActiveCfg = Debug|Any CPU - {E8B9226E-879F-495A-BDAD-2607844D048C}.Debug|x64.Build.0 = Debug|Any CPU - {E8B9226E-879F-495A-BDAD-2607844D048C}.Debug|x86.ActiveCfg = Debug|Any CPU - {E8B9226E-879F-495A-BDAD-2607844D048C}.Debug|x86.Build.0 = Debug|Any CPU - {E8B9226E-879F-495A-BDAD-2607844D048C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8B9226E-879F-495A-BDAD-2607844D048C}.Release|Any CPU.Build.0 = Release|Any CPU - {E8B9226E-879F-495A-BDAD-2607844D048C}.Release|x64.ActiveCfg = Release|Any CPU - {E8B9226E-879F-495A-BDAD-2607844D048C}.Release|x64.Build.0 = Release|Any CPU - {E8B9226E-879F-495A-BDAD-2607844D048C}.Release|x86.ActiveCfg = Release|Any CPU - {E8B9226E-879F-495A-BDAD-2607844D048C}.Release|x86.Build.0 = Release|Any CPU - {449B9DDA-F18C-411E-9A74-3930652BB78A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {449B9DDA-F18C-411E-9A74-3930652BB78A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {449B9DDA-F18C-411E-9A74-3930652BB78A}.Debug|x64.ActiveCfg = Debug|Any CPU - {449B9DDA-F18C-411E-9A74-3930652BB78A}.Debug|x64.Build.0 = Debug|Any CPU - {449B9DDA-F18C-411E-9A74-3930652BB78A}.Debug|x86.ActiveCfg = Debug|Any CPU - {449B9DDA-F18C-411E-9A74-3930652BB78A}.Debug|x86.Build.0 = Debug|Any CPU - {449B9DDA-F18C-411E-9A74-3930652BB78A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {449B9DDA-F18C-411E-9A74-3930652BB78A}.Release|Any CPU.Build.0 = Release|Any CPU - {449B9DDA-F18C-411E-9A74-3930652BB78A}.Release|x64.ActiveCfg = Release|Any CPU - {449B9DDA-F18C-411E-9A74-3930652BB78A}.Release|x64.Build.0 = Release|Any CPU - {449B9DDA-F18C-411E-9A74-3930652BB78A}.Release|x86.ActiveCfg = Release|Any CPU - {449B9DDA-F18C-411E-9A74-3930652BB78A}.Release|x86.Build.0 = Release|Any CPU - {DFB06A25-719F-4C8B-B84D-55D2D601BEF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DFB06A25-719F-4C8B-B84D-55D2D601BEF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DFB06A25-719F-4C8B-B84D-55D2D601BEF6}.Debug|x64.ActiveCfg = Debug|Any CPU - {DFB06A25-719F-4C8B-B84D-55D2D601BEF6}.Debug|x64.Build.0 = Debug|Any CPU - {DFB06A25-719F-4C8B-B84D-55D2D601BEF6}.Debug|x86.ActiveCfg = Debug|Any CPU - {DFB06A25-719F-4C8B-B84D-55D2D601BEF6}.Debug|x86.Build.0 = Debug|Any CPU - {DFB06A25-719F-4C8B-B84D-55D2D601BEF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DFB06A25-719F-4C8B-B84D-55D2D601BEF6}.Release|Any CPU.Build.0 = Release|Any CPU - {DFB06A25-719F-4C8B-B84D-55D2D601BEF6}.Release|x64.ActiveCfg = Release|Any CPU - {DFB06A25-719F-4C8B-B84D-55D2D601BEF6}.Release|x64.Build.0 = Release|Any CPU - {DFB06A25-719F-4C8B-B84D-55D2D601BEF6}.Release|x86.ActiveCfg = Release|Any CPU - {DFB06A25-719F-4C8B-B84D-55D2D601BEF6}.Release|x86.Build.0 = Release|Any CPU - {1F74F8F5-99E4-47AE-8608-6D470325E81C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F74F8F5-99E4-47AE-8608-6D470325E81C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F74F8F5-99E4-47AE-8608-6D470325E81C}.Debug|x64.ActiveCfg = Debug|Any CPU - {1F74F8F5-99E4-47AE-8608-6D470325E81C}.Debug|x64.Build.0 = Debug|Any CPU - {1F74F8F5-99E4-47AE-8608-6D470325E81C}.Debug|x86.ActiveCfg = Debug|Any CPU - {1F74F8F5-99E4-47AE-8608-6D470325E81C}.Debug|x86.Build.0 = Debug|Any CPU - {1F74F8F5-99E4-47AE-8608-6D470325E81C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F74F8F5-99E4-47AE-8608-6D470325E81C}.Release|Any CPU.Build.0 = Release|Any CPU - {1F74F8F5-99E4-47AE-8608-6D470325E81C}.Release|x64.ActiveCfg = Release|Any CPU - {1F74F8F5-99E4-47AE-8608-6D470325E81C}.Release|x64.Build.0 = Release|Any CPU - {1F74F8F5-99E4-47AE-8608-6D470325E81C}.Release|x86.ActiveCfg = Release|Any CPU - {1F74F8F5-99E4-47AE-8608-6D470325E81C}.Release|x86.Build.0 = Release|Any CPU - {8651DEEB-0291-4E49-92AA-3B097DAF9D37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8651DEEB-0291-4E49-92AA-3B097DAF9D37}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8651DEEB-0291-4E49-92AA-3B097DAF9D37}.Debug|x64.ActiveCfg = Debug|Any CPU - {8651DEEB-0291-4E49-92AA-3B097DAF9D37}.Debug|x64.Build.0 = Debug|Any CPU - {8651DEEB-0291-4E49-92AA-3B097DAF9D37}.Debug|x86.ActiveCfg = Debug|Any CPU - {8651DEEB-0291-4E49-92AA-3B097DAF9D37}.Debug|x86.Build.0 = Debug|Any CPU - {8651DEEB-0291-4E49-92AA-3B097DAF9D37}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8651DEEB-0291-4E49-92AA-3B097DAF9D37}.Release|Any CPU.Build.0 = Release|Any CPU - {8651DEEB-0291-4E49-92AA-3B097DAF9D37}.Release|x64.ActiveCfg = Release|Any CPU - {8651DEEB-0291-4E49-92AA-3B097DAF9D37}.Release|x64.Build.0 = Release|Any CPU - {8651DEEB-0291-4E49-92AA-3B097DAF9D37}.Release|x86.ActiveCfg = Release|Any CPU - {8651DEEB-0291-4E49-92AA-3B097DAF9D37}.Release|x86.Build.0 = Release|Any CPU - {AB8ED04A-5EBA-42AD-9AB9-8514617B27C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB8ED04A-5EBA-42AD-9AB9-8514617B27C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB8ED04A-5EBA-42AD-9AB9-8514617B27C8}.Debug|x64.ActiveCfg = Debug|Any CPU - {AB8ED04A-5EBA-42AD-9AB9-8514617B27C8}.Debug|x64.Build.0 = Debug|Any CPU - {AB8ED04A-5EBA-42AD-9AB9-8514617B27C8}.Debug|x86.ActiveCfg = Debug|Any CPU - {AB8ED04A-5EBA-42AD-9AB9-8514617B27C8}.Debug|x86.Build.0 = Debug|Any CPU - {AB8ED04A-5EBA-42AD-9AB9-8514617B27C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB8ED04A-5EBA-42AD-9AB9-8514617B27C8}.Release|Any CPU.Build.0 = Release|Any CPU - {AB8ED04A-5EBA-42AD-9AB9-8514617B27C8}.Release|x64.ActiveCfg = Release|Any CPU - {AB8ED04A-5EBA-42AD-9AB9-8514617B27C8}.Release|x64.Build.0 = Release|Any CPU - {AB8ED04A-5EBA-42AD-9AB9-8514617B27C8}.Release|x86.ActiveCfg = Release|Any CPU - {AB8ED04A-5EBA-42AD-9AB9-8514617B27C8}.Release|x86.Build.0 = Release|Any CPU - {F7C1932C-49E3-4869-A123-8184534AD1E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F7C1932C-49E3-4869-A123-8184534AD1E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F7C1932C-49E3-4869-A123-8184534AD1E2}.Debug|x64.ActiveCfg = Debug|Any CPU - {F7C1932C-49E3-4869-A123-8184534AD1E2}.Debug|x64.Build.0 = Debug|Any CPU - {F7C1932C-49E3-4869-A123-8184534AD1E2}.Debug|x86.ActiveCfg = Debug|Any CPU - {F7C1932C-49E3-4869-A123-8184534AD1E2}.Debug|x86.Build.0 = Debug|Any CPU - {F7C1932C-49E3-4869-A123-8184534AD1E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F7C1932C-49E3-4869-A123-8184534AD1E2}.Release|Any CPU.Build.0 = Release|Any CPU - {F7C1932C-49E3-4869-A123-8184534AD1E2}.Release|x64.ActiveCfg = Release|Any CPU - {F7C1932C-49E3-4869-A123-8184534AD1E2}.Release|x64.Build.0 = Release|Any CPU - {F7C1932C-49E3-4869-A123-8184534AD1E2}.Release|x86.ActiveCfg = Release|Any CPU - {F7C1932C-49E3-4869-A123-8184534AD1E2}.Release|x86.Build.0 = Release|Any CPU - {CC3780CC-83CF-415C-A759-E5D0D4A64768}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC3780CC-83CF-415C-A759-E5D0D4A64768}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC3780CC-83CF-415C-A759-E5D0D4A64768}.Debug|x64.ActiveCfg = Debug|Any CPU - {CC3780CC-83CF-415C-A759-E5D0D4A64768}.Debug|x64.Build.0 = Debug|Any CPU - {CC3780CC-83CF-415C-A759-E5D0D4A64768}.Debug|x86.ActiveCfg = Debug|Any CPU - {CC3780CC-83CF-415C-A759-E5D0D4A64768}.Debug|x86.Build.0 = Debug|Any CPU - {CC3780CC-83CF-415C-A759-E5D0D4A64768}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC3780CC-83CF-415C-A759-E5D0D4A64768}.Release|Any CPU.Build.0 = Release|Any CPU - {CC3780CC-83CF-415C-A759-E5D0D4A64768}.Release|x64.ActiveCfg = Release|Any CPU - {CC3780CC-83CF-415C-A759-E5D0D4A64768}.Release|x64.Build.0 = Release|Any CPU - {CC3780CC-83CF-415C-A759-E5D0D4A64768}.Release|x86.ActiveCfg = Release|Any CPU - {CC3780CC-83CF-415C-A759-E5D0D4A64768}.Release|x86.Build.0 = Release|Any CPU - {3F3F695B-537E-44DD-93FE-A1D1B88F4589}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3F3F695B-537E-44DD-93FE-A1D1B88F4589}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3F3F695B-537E-44DD-93FE-A1D1B88F4589}.Debug|x64.ActiveCfg = Debug|Any CPU - {3F3F695B-537E-44DD-93FE-A1D1B88F4589}.Debug|x64.Build.0 = Debug|Any CPU - {3F3F695B-537E-44DD-93FE-A1D1B88F4589}.Debug|x86.ActiveCfg = Debug|Any CPU - {3F3F695B-537E-44DD-93FE-A1D1B88F4589}.Debug|x86.Build.0 = Debug|Any CPU - {3F3F695B-537E-44DD-93FE-A1D1B88F4589}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3F3F695B-537E-44DD-93FE-A1D1B88F4589}.Release|Any CPU.Build.0 = Release|Any CPU - {3F3F695B-537E-44DD-93FE-A1D1B88F4589}.Release|x64.ActiveCfg = Release|Any CPU - {3F3F695B-537E-44DD-93FE-A1D1B88F4589}.Release|x64.Build.0 = Release|Any CPU - {3F3F695B-537E-44DD-93FE-A1D1B88F4589}.Release|x86.ActiveCfg = Release|Any CPU - {3F3F695B-537E-44DD-93FE-A1D1B88F4589}.Release|x86.Build.0 = Release|Any CPU - {33D7A35E-A457-42FB-B849-3E752A372D23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {33D7A35E-A457-42FB-B849-3E752A372D23}.Debug|Any CPU.Build.0 = Debug|Any CPU - {33D7A35E-A457-42FB-B849-3E752A372D23}.Debug|x64.ActiveCfg = Debug|Any CPU - {33D7A35E-A457-42FB-B849-3E752A372D23}.Debug|x64.Build.0 = Debug|Any CPU - {33D7A35E-A457-42FB-B849-3E752A372D23}.Debug|x86.ActiveCfg = Debug|Any CPU - {33D7A35E-A457-42FB-B849-3E752A372D23}.Debug|x86.Build.0 = Debug|Any CPU - {33D7A35E-A457-42FB-B849-3E752A372D23}.Release|Any CPU.ActiveCfg = Release|Any CPU - {33D7A35E-A457-42FB-B849-3E752A372D23}.Release|Any CPU.Build.0 = Release|Any CPU - {33D7A35E-A457-42FB-B849-3E752A372D23}.Release|x64.ActiveCfg = Release|Any CPU - {33D7A35E-A457-42FB-B849-3E752A372D23}.Release|x64.Build.0 = Release|Any CPU - {33D7A35E-A457-42FB-B849-3E752A372D23}.Release|x86.ActiveCfg = Release|Any CPU - {33D7A35E-A457-42FB-B849-3E752A372D23}.Release|x86.Build.0 = Release|Any CPU - {3C9F1344-E773-42FF-B98D-BD7277608903}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C9F1344-E773-42FF-B98D-BD7277608903}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C9F1344-E773-42FF-B98D-BD7277608903}.Debug|x64.ActiveCfg = Debug|Any CPU - {3C9F1344-E773-42FF-B98D-BD7277608903}.Debug|x64.Build.0 = Debug|Any CPU - {3C9F1344-E773-42FF-B98D-BD7277608903}.Debug|x86.ActiveCfg = Debug|Any CPU - {3C9F1344-E773-42FF-B98D-BD7277608903}.Debug|x86.Build.0 = Debug|Any CPU - {3C9F1344-E773-42FF-B98D-BD7277608903}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C9F1344-E773-42FF-B98D-BD7277608903}.Release|Any CPU.Build.0 = Release|Any CPU - {3C9F1344-E773-42FF-B98D-BD7277608903}.Release|x64.ActiveCfg = Release|Any CPU - {3C9F1344-E773-42FF-B98D-BD7277608903}.Release|x64.Build.0 = Release|Any CPU - {3C9F1344-E773-42FF-B98D-BD7277608903}.Release|x86.ActiveCfg = Release|Any CPU - {3C9F1344-E773-42FF-B98D-BD7277608903}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {72213E25-DEA2-4A6F-9FA9-AC03F3DE7DCF} = {7DAC892E-ADAE-4CEB-8A0C-EDC452A5826A} - {0C92EDA7-492F-4CBA-9F36-61932CA5C1F4} = {7DAC892E-ADAE-4CEB-8A0C-EDC452A5826A} - {578CE255-E412-4CC7-9A03-1EDCA522DA27} = {7DAC892E-ADAE-4CEB-8A0C-EDC452A5826A} - {62BD1600-18A2-400E-94F5-C33BBD67CA97} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {E22B59BD-A658-4E32-9407-C8D9570B9FDF} = {7DAC892E-ADAE-4CEB-8A0C-EDC452A5826A} - {A86924AE-4B77-47A8-A690-EDA395F075A9} = {7DAC892E-ADAE-4CEB-8A0C-EDC452A5826A} - {9FCFAD2A-061E-4FC0-848E-F0E8AA03676D} = {7DAC892E-ADAE-4CEB-8A0C-EDC452A5826A} - {62BD1609-18A2-400E-94F5-C33BBD67CA97} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {865B29F0-BDBF-4CF6-A6F2-C41CD2F00A56} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {D9B16B88-4B85-4208-8F1C-39DFB248250C} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {FCB1B0F2-3067-4FE8-8A98-5EC80F38D534} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {D26D7FC1-3DCD-434C-8261-63FCCEF27278} = {7DAC892E-ADAE-4CEB-8A0C-EDC452A5826A} - {C416006F-FAE9-4263-8290-81B2AA81E024} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {4DF4A1B9-F31C-49D1-8FEB-8DB37AEBDC0B} = {7DAC892E-ADAE-4CEB-8A0C-EDC452A5826A} - {FBEBB725-F645-40DC-856C-D1BC7FB52CF3} = {B794BF86-4185-4DCE-AC86-C27D5D966B9B} - {FC7516FB-7F44-4786-ADF2-589EF06C2EDE} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {0A4EBB7D-E75B-4589-9FB3-0CD6A0B47C78} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {15304624-1774-4990-A0CC-7B9DA27A8FF6} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {F8C5BBAA-99E9-46BA-87C9-9FB7F388F403} = {B794BF86-4185-4DCE-AC86-C27D5D966B9B} - {ED5D6873-220B-4F9D-A30B-B99E950F8E26} = {B794BF86-4185-4DCE-AC86-C27D5D966B9B} - {858B2E28-1FF8-4ED2-A356-B576BD793B71} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {BB38681E-BBD1-4E77-BCD5-CDB6E532B2C5} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {B0330A2C-3F10-4C46-97DF-13D187564F70} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {BD758B10-A47F-4159-B9A1-997723AF7349} = {B794BF86-4185-4DCE-AC86-C27D5D966B9B} - {2FFDBB61-8AE8-468B-87D3-0D907D7C2FFE} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {12764D81-61A7-437A-90B6-9F245E43F457} = {B794BF86-4185-4DCE-AC86-C27D5D966B9B} - {B1DDA327-F55E-466A-AF3E-7F039B9B51A9} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {D478568D-CA20-4331-9019-F585B564425E} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {E8B9226E-879F-495A-BDAD-2607844D048C} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {D190251C-5649-4DD6-A158-16D119116352} = {C5186341-2064-49AA-B398-CDF4302D2823} - {43053BC4-32B4-4404-B62D-410F367CE0CE} = {B794BF86-4185-4DCE-AC86-C27D5D966B9B} - {EE8CD472-D8C4-4CD0-BC84-6C305F5971AE} = {43053BC4-32B4-4404-B62D-410F367CE0CE} - {449B9DDA-F18C-411E-9A74-3930652BB78A} = {B794BF86-4185-4DCE-AC86-C27D5D966B9B} - {DFB06A25-719F-4C8B-B84D-55D2D601BEF6} = {3A2D12C2-0455-4471-9EBB-91749BA3A60F} - {1F74F8F5-99E4-47AE-8608-6D470325E81C} = {FF433F83-22C2-46E0-99B3-4FFCA5190A94} - {8651DEEB-0291-4E49-92AA-3B097DAF9D37} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {AB8ED04A-5EBA-42AD-9AB9-8514617B27C8} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - {F7C1932C-49E3-4869-A123-8184534AD1E2} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {6EA1A508-6033-4538-BF98-7F71B4E297AD} - EndGlobalSection -EndGlobal diff --git a/src/TemplateEngine/Microsoft.TemplateSearch.Common/Microsoft.TemplateSearch.Common.csproj b/src/TemplateEngine/Microsoft.TemplateSearch.Common/Microsoft.TemplateSearch.Common.csproj index 670d6633b999..2b397d94c5d5 100644 --- a/src/TemplateEngine/Microsoft.TemplateSearch.Common/Microsoft.TemplateSearch.Common.csproj +++ b/src/TemplateEngine/Microsoft.TemplateSearch.Common/Microsoft.TemplateSearch.Common.csproj @@ -24,7 +24,7 @@ - + diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.CLI/Microsoft.TemplateEngine.Authoring.CLI.csproj b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.CLI/Microsoft.TemplateEngine.Authoring.CLI.csproj index 58ed25d6d231..645a16a8fa50 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.CLI/Microsoft.TemplateEngine.Authoring.CLI.csproj +++ b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.CLI/Microsoft.TemplateEngine.Authoring.CLI.csproj @@ -14,16 +14,16 @@ - + - - - - - + + + + + diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.Tasks/Microsoft.TemplateEngine.Authoring.Tasks.csproj b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.Tasks/Microsoft.TemplateEngine.Authoring.Tasks.csproj index f36611acab8b..265ab83163c7 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.Tasks/Microsoft.TemplateEngine.Authoring.Tasks.csproj +++ b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.Tasks/Microsoft.TemplateEngine.Authoring.Tasks.csproj @@ -23,9 +23,9 @@ - - - + + + diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3.csproj b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3.csproj deleted file mode 100644 index 2d4d285746ef..000000000000 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3.csproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - $(DefineConstants);XUNIT_V3 - Microsoft.TemplateEngine.Authoring.TemplateApiVerifier - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.Shared.props b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.Shared.props index f09e43958a25..28124900ce60 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.Shared.props +++ b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.Shared.props @@ -12,9 +12,9 @@ - - - + + + diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj index 8d392054d3f5..41411b59580c 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj +++ b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj @@ -3,8 +3,8 @@ - - + + diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3.csproj b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3.csproj deleted file mode 100644 index 9acff6595a3f..000000000000 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3.csproj +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - $(DefineConstants);XUNIT_V3 - Microsoft.TemplateEngine.Authoring.TemplateVerifier - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.Shared.props b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.Shared.props index e6a27cb882e9..5766eeb8868b 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.Shared.props +++ b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.Shared.props @@ -17,7 +17,7 @@ - + @@ -27,9 +27,7 @@ - - diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.csproj b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.csproj index e0b1be99203c..41dd844e8645 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.csproj +++ b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.csproj @@ -3,8 +3,9 @@ - - + + + diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/VerificationEngine.cs b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/VerificationEngine.cs index 037e151ac645..267d618419e5 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/VerificationEngine.cs +++ b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/VerificationEngine.cs @@ -1,9 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -#if !XUNIT_V3 -using System.Reflection; -#endif using System.Runtime.CompilerServices; using System.Text; using System.Text.RegularExpressions; @@ -371,9 +368,6 @@ private static IInstantiationResult RunDotnetNewCommand(TemplateVerifierOptions return result; } - private static void DummyMethod() - { } - private static async IAsyncEnumerable<(string FilePath, string ScrubbedContent)> GetVerificationContent( string contentDir, List includeMatchers, @@ -437,16 +431,6 @@ private static void DummyMethod() private async Task VerifyResult(TemplateVerifierOptions args, IInstantiationResult commandResultData, CallerInfo callerInfo) { -#if !XUNIT_V3 - UseVerifyAttribute a = new UseVerifyAttribute(); - - // https://github.com/VerifyTests/Verify/blob/d8cbe38f527d6788ecadd6205c82803bec3cdfa6/src/Verify.Xunit/Verifier.cs#L10 - // need to simulate execution from tests - var v = DummyMethod; - MethodInfo mi = v.Method; - a.Before(mi); -#endif - if (args.VerifyCommandOutput) { if (_fileSystem.DirectoryExists(Path.Combine(commandResultData.InstantiatedContentDirectory, SpecialFiles.StandardStreamsDir))) diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj b/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj index 3824b7cbca60..e4edd64ff65a 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj +++ b/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj @@ -10,8 +10,9 @@ - - + + + @@ -19,9 +20,9 @@ - - - + + + diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Test/TestLogger.cs b/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Test/TestLogger.cs index 3b20d743cd08..d4ad908e12f3 100644 --- a/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Test/TestLogger.cs +++ b/src/TemplateEngine/Tools/Microsoft.TemplateSearch.TemplateDiscovery/Test/TestLogger.cs @@ -1,7 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Xunit.Abstractions; +using System.Text; +using Xunit; namespace Microsoft.TemplateSearch.TemplateDiscovery.Test { @@ -9,8 +10,34 @@ internal class TestOutputLogger : ITestOutputHelper { public static readonly TestOutputLogger Instance = new TestOutputLogger(); - public void WriteLine(string message) => Console.WriteLine(message); + private readonly StringBuilder _output = new(); - public void WriteLine(string format, params object[] args) => Console.WriteLine(format, args); + public string Output => _output.ToString(); + + public void Write(string message) + { + _output.Append(message); + Console.Write(message); + } + + public void Write(string format, params object[] args) + { + string message = string.Format(format, args); + _output.Append(message); + Console.Write(message); + } + + public void WriteLine(string message) + { + _output.AppendLine(message); + Console.WriteLine(message); + } + + public void WriteLine(string format, params object[] args) + { + string message = string.Format(format, args); + _output.AppendLine(message); + Console.WriteLine(message); + } } } diff --git a/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/BasicCommand.cs b/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/BasicCommand.cs index 5b0179e8cdd2..5061864e224b 100644 --- a/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/BasicCommand.cs +++ b/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/BasicCommand.cs @@ -2,9 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Extensions.Logging; -#if !XUNIT_V3 -using Xunit.Abstractions; -#endif namespace Microsoft.TemplateEngine.CommandUtils { diff --git a/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/DotnetCommand.cs b/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/DotnetCommand.cs index 1f9984a0fae5..16f779943171 100644 --- a/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/DotnetCommand.cs +++ b/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/DotnetCommand.cs @@ -2,9 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Extensions.Logging; -#if !XUNIT_V3 -using Xunit.Abstractions; -#endif namespace Microsoft.TemplateEngine.CommandUtils { diff --git a/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/DotnetNewCommand.cs b/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/DotnetNewCommand.cs index ae71ad46be61..86195816545e 100644 --- a/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/DotnetNewCommand.cs +++ b/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/DotnetNewCommand.cs @@ -2,9 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Extensions.Logging; -#if !XUNIT_V3 -using Xunit.Abstractions; -#endif namespace Microsoft.TemplateEngine.CommandUtils { diff --git a/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/TestCommand.cs b/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/TestCommand.cs index 14682c46cfcd..905221e07d40 100644 --- a/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/TestCommand.cs +++ b/src/TemplateEngine/Tools/Shared/Microsoft.TemplateEngine.CommandUtils/TestCommand.cs @@ -4,9 +4,6 @@ using System.Diagnostics; using Microsoft.Extensions.Logging; using Microsoft.TemplateEngine.Utils; -#if !XUNIT_V3 -using Xunit.Abstractions; -#endif namespace Microsoft.TemplateEngine.CommandUtils { diff --git a/template_feed/Microsoft.TemplateEngine.Authoring.Templates/Microsoft.TemplateEngine.Authoring.Templates.csproj b/template_feed/Microsoft.TemplateEngine.Authoring.Templates/Microsoft.TemplateEngine.Authoring.Templates.csproj index 0ecf01b3fe44..838c066d57fd 100644 --- a/template_feed/Microsoft.TemplateEngine.Authoring.Templates/Microsoft.TemplateEngine.Authoring.Templates.csproj +++ b/template_feed/Microsoft.TemplateEngine.Authoring.Templates/Microsoft.TemplateEngine.Authoring.Templates.csproj @@ -17,7 +17,7 @@ Microsoft The templates for useful items and projects for template authoring. en-US - https://github.com/dotnet/templating + https://github.com/dotnet/sdk Template True true diff --git a/test/Microsoft.NET.TestFramework/BuildTestPackages.targets b/test/Microsoft.NET.TestFramework/BuildTestPackages.targets index a78de75f9f5f..21ae49a8b192 100644 --- a/test/Microsoft.NET.TestFramework/BuildTestPackages.targets +++ b/test/Microsoft.NET.TestFramework/BuildTestPackages.targets @@ -159,6 +159,16 @@ Microsoft.Net.Sdk.Compilers.Toolset.csproj $(Version) + + Microsoft.TemplateEngine.Authoring.Tasks + Microsoft.TemplateEngine.Authoring.Tasks.csproj + $(Version) + + + Microsoft.TemplateSearch.TemplateDiscovery + Microsoft.TemplateSearch.TemplateDiscovery.csproj + $(Version) + %(Name) diff --git a/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj b/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj index b1e1394cf095..9d1bdf113db8 100644 --- a/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj +++ b/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj @@ -18,9 +18,9 @@ - - - + + + diff --git a/test/TemplateEngine/Directory.Build.props b/test/TemplateEngine/Directory.Build.props index e4fe79a83479..b18027a80044 100644 --- a/test/TemplateEngine/Directory.Build.props +++ b/test/TemplateEngine/Directory.Build.props @@ -3,7 +3,22 @@ - true + + net472 + + + MicrosoftAspNetCore + + $(NoWarn);IDE0005;0649;CA2016;CA5394;CA1802 + + + + + diff --git a/test/TemplateEngine/Directory.Build.targets b/test/TemplateEngine/Directory.Build.targets new file mode 100644 index 000000000000..7ac0cbdc6799 --- /dev/null +++ b/test/TemplateEngine/Directory.Build.targets @@ -0,0 +1,13 @@ + + + + + + + + + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ExportCommandFailureTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ExportCommandFailureTests.cs index e2a94b9a7637..9a0ecf056a3c 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ExportCommandFailureTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ExportCommandFailureTests.cs @@ -3,7 +3,7 @@ using System.Globalization; using Microsoft.TemplateEngine.CommandUtils; -using Xunit.Abstractions; +using Xunit; namespace Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests { diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ExportCommandTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ExportCommandTests.cs index 4e945be749cf..55417747a05f 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ExportCommandTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ExportCommandTests.cs @@ -243,21 +243,11 @@ private static string GetTestTemplateInTempDir(string templateName) private static string GetTestTemplateJsonContent() { - string? thisDir = Path.GetDirectoryName(typeof(ExportCommandTests).Assembly.Location); - Assert.NotNull(thisDir); - string templateJsonPath = Path.GetFullPath(Path.Combine( - thisDir!, - "..", - "..", - "..", - "..", - "..", - "test", - "Microsoft.TemplateEngine.TestTemplates", - "test_templates", + string templateJsonPath = Path.Combine( + TestTemplatesLocation, "TemplateWithLocalization", ".template.config", - "template.json")); + "template.json"); return File.ReadAllText(templateJsonPath); } diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj index 257fabe0ffd2..927b21b3e958 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj @@ -5,9 +5,8 @@ - - - + + @@ -16,8 +15,7 @@ - - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ValidateCommandTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ValidateCommandTests.cs index 33309dd69823..9228a6bdb38f 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ValidateCommandTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ValidateCommandTests.cs @@ -5,7 +5,7 @@ using System.Text.RegularExpressions; using Microsoft.TemplateEngine.CommandUtils; using Microsoft.TemplateEngine.Tests; -using Xunit.Abstractions; +using Xunit; namespace Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests { diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/VerifyCommandTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/VerifyCommandTests.cs index 644cf2cddc2a..00d4e171d1d0 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/VerifyCommandTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/VerifyCommandTests.cs @@ -6,7 +6,7 @@ using Microsoft.TemplateEngine.CommandUtils; using Microsoft.TemplateEngine.TestHelper; using Microsoft.TemplateEngine.Tests; -using Xunit.Abstractions; +using Xunit; namespace Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests { @@ -19,7 +19,7 @@ public VerifyCommandTests(ITestOutputHelper log) _log = log; } - [Fact] + [Fact(Skip = "https://github.com/dotnet/sdk/issues/53889")] public void VerifyCommandFullDevLoop() { // dots issue https://github.com/VerifyTests/Verify/issues/658 @@ -121,7 +121,7 @@ public void VerifyCommandFullDevLoop() Directory.Delete(snapshotsDir, true); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/sdk/issues/53889")] public void VerifyCommandFullDevLoopWithNotInstalledTemplate() { // dots issue https://github.com/VerifyTests/Verify/issues/658 diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/VerifySettingsFixture.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/VerifySettingsFixture.cs index 79757a88da50..56a8d8b646f7 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/VerifySettingsFixture.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/VerifySettingsFixture.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.TemplateEngine.Tests; using VerifyTests.DiffPlex; namespace Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests @@ -18,7 +19,7 @@ public VerifySettingsFixture() s_called = true; DerivePathInfo( (_, _, type, method) => new( - directory: "Snapshots", + directory: TestBase.SnapshotsDirectory, typeName: type.Name, methodName: method.Name)); diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.UnitTests/Microsoft.TemplateEngine.Authoring.CLI.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.UnitTests/Microsoft.TemplateEngine.Authoring.CLI.UnitTests.csproj index 462969e7e66a..f847ee13990a 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.UnitTests/Microsoft.TemplateEngine.Authoring.CLI.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.CLI.UnitTests/Microsoft.TemplateEngine.Authoring.CLI.UnitTests.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/LocalizeTemplateTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/LocalizeTemplateTests.cs index 8d35ddab4964..21488c848eec 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/LocalizeTemplateTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/LocalizeTemplateTests.cs @@ -4,7 +4,7 @@ using Microsoft.TemplateEngine.CommandUtils; using Microsoft.TemplateEngine.TestHelper; using Microsoft.TemplateEngine.Tests; -using Xunit.Abstractions; +using Xunit; namespace Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests { @@ -22,7 +22,7 @@ public void CanRunTask() { string tmpDir = TestUtils.CreateTemporaryFolder(); TestUtils.DirectoryCopy("Resources/BasicTemplatePackage", tmpDir, true); - TestUtils.SetupNuGetConfigForPackagesLocation(tmpDir, ShippingPackagesLocation); + SetupNuGetConfigForPackagesLocation(tmpDir); new DotnetCommand(_log, "add", "TemplatePackage.csproj", "package", "Microsoft.TemplateEngine.Authoring.Tasks", "--prerelease") .WithoutTelemetry() @@ -52,7 +52,7 @@ public void CanRunTaskSelectedLangs() { string tmpDir = TestUtils.CreateTemporaryFolder(); TestUtils.DirectoryCopy("Resources/TemplatePackageEnDe", tmpDir, true); - TestUtils.SetupNuGetConfigForPackagesLocation(tmpDir, ShippingPackagesLocation); + SetupNuGetConfigForPackagesLocation(tmpDir); new DotnetCommand(_log, "add", "TemplatePackage.csproj", "package", "Microsoft.TemplateEngine.Authoring.Tasks", "--prerelease") .WithoutTelemetry() @@ -83,7 +83,7 @@ public void CanRunTaskSelectedTemplates() { string tmpDir = TestUtils.CreateTemporaryFolder(); TestUtils.DirectoryCopy("Resources/TemplatePackagePartiallyLocalized", tmpDir, true); - TestUtils.SetupNuGetConfigForPackagesLocation(tmpDir, ShippingPackagesLocation); + SetupNuGetConfigForPackagesLocation(tmpDir); new DotnetCommand(_log, "add", "TemplatePackage.csproj", "package", "Microsoft.TemplateEngine.Authoring.Tasks", "--prerelease") .WithoutTelemetry() @@ -115,7 +115,7 @@ public void CanRunTaskAndDetectError() { string tmpDir = TestUtils.CreateTemporaryFolder(); TestUtils.DirectoryCopy("Resources/InvalidTemplatePackage", tmpDir, true); - TestUtils.SetupNuGetConfigForPackagesLocation(tmpDir, ShippingPackagesLocation); + SetupNuGetConfigForPackagesLocation(tmpDir); new DotnetCommand(_log, "add", "TemplatePackage.csproj", "package", "Microsoft.TemplateEngine.Authoring.Tasks", "--prerelease") .WithoutTelemetry() diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj index d7e054333855..4175c1f8f032 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj @@ -10,14 +10,13 @@ - + - - - + + @@ -25,7 +24,7 @@ - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/ValidateTemplatesTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/ValidateTemplatesTests.cs index 5d76acf455c1..ba51860cb551 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/ValidateTemplatesTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/ValidateTemplatesTests.cs @@ -4,7 +4,7 @@ using Microsoft.TemplateEngine.CommandUtils; using Microsoft.TemplateEngine.TestHelper; using Microsoft.TemplateEngine.Tests; -using Xunit.Abstractions; +using Xunit; namespace Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests { @@ -22,7 +22,7 @@ public void CanRunValidateTask_OnError() { string tmpDir = TestUtils.CreateTemporaryFolder(); TestUtils.DirectoryCopy("Resources/InvalidTemplatePackage_MissingName", tmpDir, true); - TestUtils.SetupNuGetConfigForPackagesLocation(tmpDir, ShippingPackagesLocation); + SetupNuGetConfigForPackagesLocation(tmpDir); new DotnetCommand(_log, "add", "TemplatePackage.csproj", "package", "Microsoft.TemplateEngine.Authoring.Tasks", "--prerelease") .WithoutTelemetry() @@ -46,7 +46,7 @@ public void CanRunValidateTask_OnInfo() { string tmpDir = TestUtils.CreateTemporaryFolder(); TestUtils.DirectoryCopy("Resources/InvalidTemplatePackage_MissingOptionalData", tmpDir, true); - TestUtils.SetupNuGetConfigForPackagesLocation(tmpDir, ShippingPackagesLocation); + SetupNuGetConfigForPackagesLocation(tmpDir); new DotnetCommand(_log, "add", "TemplatePackage.csproj", "package", "Microsoft.TemplateEngine.Authoring.Tasks", "--prerelease") .WithoutTelemetry() diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3.csproj deleted file mode 100644 index 3112ec90ef5f..000000000000 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3.csproj +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - $(DefineConstants);XUNIT_V3 - - - - - - - - - - - - - - - - - - - - diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/ExampleTemplateTest.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/ExampleTemplateTest.cs index 118d215a55f7..337391bdf60f 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/ExampleTemplateTest.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/ExampleTemplateTest.cs @@ -5,9 +5,6 @@ using Microsoft.TemplateEngine.Authoring.TemplateApiVerifier; using Microsoft.TemplateEngine.TestHelper; using Microsoft.TemplateEngine.Tests; -#if !XUNIT_V3 -using Xunit.Abstractions; -#endif namespace Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests { @@ -37,7 +34,7 @@ public async Task VerificationEngineSampleDogfoodTest() { TemplateSpecificArgs = new string[] { "--paramB", "true" }, TemplatePath = templateLocation, - SnapshotsDirectory = "Snapshots", + SnapshotsDirectory = SnapshotsDirectory, OutputDirectory = workingDir, VerifyCommandOutput = true, DoNotPrependCallerMethodNameToScenarioName = true, @@ -73,7 +70,7 @@ public async Task VerificationEngineSampleDogfoodTest_ExecThroughApi() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = "Snapshots", + SnapshotsDirectory = SnapshotsDirectory, OutputDirectory = workingDir, VerifyCommandOutput = true, DoNotPrependCallerMethodNameToScenarioName = true, diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj index 41f44b6d2310..8abe84b45046 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj @@ -3,16 +3,14 @@ - - - - + + + - - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Snapshots/TestAssets.SampleTestTemplate.SampleDogfoodTest.arm64.verified/TestAssets.SampleTestTemplate/Test.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Snapshots/TestAssets.SampleTestTemplate.SampleDogfoodTest.arm64.verified/TestAssets.SampleTestTemplate/Test.cs new file mode 100644 index 000000000000..e68913f9bb42 --- /dev/null +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Snapshots/TestAssets.SampleTestTemplate.SampleDogfoodTest.arm64.verified/TestAssets.SampleTestTemplate/Test.cs @@ -0,0 +1,6 @@ + +// value of paramA: false +// value of paramB: true + + + // ******* diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Snapshots/TestAssets.SampleTestTemplate.SampleDogfoodTest.arm64.verified/std-streams/stderr.txt b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Snapshots/TestAssets.SampleTestTemplate.SampleDogfoodTest.arm64.verified/std-streams/stderr.txt new file mode 100644 index 000000000000..5f282702bb03 --- /dev/null +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Snapshots/TestAssets.SampleTestTemplate.SampleDogfoodTest.arm64.verified/std-streams/stderr.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Snapshots/TestAssets.SampleTestTemplate.SampleDogfoodTest.arm64.verified/std-streams/stdout.txt b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Snapshots/TestAssets.SampleTestTemplate.SampleDogfoodTest.arm64.verified/std-streams/stdout.txt new file mode 100644 index 000000000000..5a67fb40d407 --- /dev/null +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Snapshots/TestAssets.SampleTestTemplate.SampleDogfoodTest.arm64.verified/std-streams/stdout.txt @@ -0,0 +1 @@ +The template "%TEMPLATE%" was created successfully. \ No newline at end of file diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/TemplateEngineSamplesTest.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/TemplateEngineSamplesTest.cs index ff3d458cae85..ac042ff42648 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/TemplateEngineSamplesTest.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/TemplateEngineSamplesTest.cs @@ -6,9 +6,6 @@ using Microsoft.TemplateEngine.Authoring.TemplateApiVerifier; using Microsoft.TemplateEngine.TestHelper; using Microsoft.TemplateEngine.Tests; -#if !XUNIT_V3 -using Xunit.Abstractions; -#endif namespace Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests { @@ -53,6 +50,7 @@ public async Task TemplateEngineSamplesProjectTest( TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: shortName) { TemplatePath = templateLocation, + SnapshotsDirectory = SnapshotsDirectory, DoNotPrependCallerMethodNameToScenarioName = true, ScenarioName = $"{folderName.Substring(folderName.IndexOf('-') + 1)}{argsScenarioName}" } @@ -65,7 +63,7 @@ public async Task TemplateEngineSamplesProjectTest( await engine.Execute(options); } - private string GetSamplesTemplateLocation() => Path.Combine(CodeBaseRoot, "dotnet-template-samples", "content"); + private string GetSamplesTemplateLocation() => Path.Combine(SampleTemplatesLocation, "content"); private (Dictionary Args, string ArgsScenarioName) GetTemplateArgs(string[]? args) { diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/VerificationEngineTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/VerificationEngineTests.cs index 8bc7929e8623..5d262353db2b 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/VerificationEngineTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/VerificationEngineTests.cs @@ -4,9 +4,7 @@ using FluentAssertions; using Microsoft.Extensions.Logging; using Microsoft.TemplateEngine.TestHelper; -#if !XUNIT_V3 -using Xunit.Abstractions; -#endif +using Microsoft.TemplateEngine.Tests; namespace Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests { @@ -153,6 +151,7 @@ public async Task VerificationEngine_DotFile_EditorConfigTests() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: "editorconfig") { TemplateSpecificArgs = new[] { "--empty" }, + SnapshotsDirectory = TestBase.SnapshotsDirectory, VerifyCommandOutput = true, }; @@ -168,6 +167,7 @@ public async Task VerificationEngine_InstallsToCustomLocation_WithSettingsDirect TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: "editorconfig") { TemplateSpecificArgs = new[] { "--empty" }, + SnapshotsDirectory = TestBase.SnapshotsDirectory, VerifyCommandOutput = false, SettingsDirectory = settingsPath }; diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3.csproj deleted file mode 100644 index 7e966c33ead2..000000000000 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3.csproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - $(DefineConstants);XUNIT_V3 - - - - - - - - - - - - - - - - - - diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.Shared.props b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.Shared.props index 6fc088b56ec0..00bd80640834 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.Shared.props +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.Shared.props @@ -9,4 +9,8 @@ + + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj index 2e9d35f0d3ce..ebdc63884906 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj @@ -3,14 +3,13 @@ - - + + - - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/VerificationEngineTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/VerificationEngineTests.cs index 876ad080ff0e..e55d5a1a01a0 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/VerificationEngineTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/VerificationEngineTests.cs @@ -7,9 +7,7 @@ using Microsoft.TemplateEngine.Authoring.TemplateVerifier.Commands; using Microsoft.TemplateEngine.CommandUtils; using Microsoft.TemplateEngine.TestHelper; -#if !XUNIT_V3 -using Xunit.Abstractions; -#endif +using Microsoft.TemplateEngine.Tests; namespace Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests { @@ -114,7 +112,6 @@ await executeTask public async Task ExecuteSucceedsOnExpectedInstantiationFailure() { string workingDir = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName().Replace(".", string.Empty)); - string snapshotsDir = "Snapshots"; ICommandRunner commandRunner = A.Fake(); A.CallTo(() => commandRunner.RunCommand(A._)) @@ -124,7 +121,7 @@ public async Task ExecuteSucceedsOnExpectedInstantiationFailure() { TemplateSpecificArgs = new string[] { "--a", "-b", "c", "--d" }, //DisableDiffTool = true, - SnapshotsDirectory = snapshotsDir, + SnapshotsDirectory = TestBase.SnapshotsDirectory, IsCommandExpectedToFail = true, OutputDirectory = workingDir, VerifyCommandOutput = true, @@ -138,7 +135,6 @@ public async Task ExecuteSucceedsOnExpectedInstantiationFailure() public async Task ExecuteSucceedsOnExpectedInstantiationSuccess() { string workingDir = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName().Replace(".", string.Empty)); - string snapshotsDir = "Snapshots"; ICommandRunner commandRunner = A.Fake(); A.CallTo(() => commandRunner.RunCommand(A._)) @@ -148,7 +144,7 @@ public async Task ExecuteSucceedsOnExpectedInstantiationSuccess() { TemplateSpecificArgs = new string[] { "--x", "y", "-z" }, //DisableDiffTool = true, - SnapshotsDirectory = snapshotsDir, + SnapshotsDirectory = TestBase.SnapshotsDirectory, IsCommandExpectedToFail = false, OutputDirectory = workingDir, VerifyCommandOutput = true, diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/AuthoringTemplatesTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/AuthoringTemplatesTests.cs index f87a29467580..577c1d82370e 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/AuthoringTemplatesTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/AuthoringTemplatesTests.cs @@ -6,7 +6,7 @@ using Microsoft.TemplateEngine.Authoring.TemplateVerifier; using Microsoft.TemplateEngine.TestHelper; using Microsoft.TemplateEngine.Tests; -using Xunit.Abstractions; +using Xunit; namespace Microsoft.TemplateEngine.Authoring.Templates.Tests { @@ -31,7 +31,7 @@ public async Task TemplateJsonTest() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = "Snapshots", + SnapshotsDirectory = SnapshotsDirectory, OutputDirectory = workingDir, DoNotPrependCallerMethodNameToScenarioName = true, ScenarioName = "Basic", @@ -60,7 +60,7 @@ public async Task TemplateJsonTest_WithParameters() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = "Snapshots", + SnapshotsDirectory = SnapshotsDirectory, OutputDirectory = workingDir, DoNotPrependCallerMethodNameToScenarioName = true, ScenarioName = "WithParams", @@ -88,7 +88,7 @@ public async Task TemplateJsonTest_NoConfigFolder() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = "Snapshots", + SnapshotsDirectory = SnapshotsDirectory, OutputDirectory = workingDir, DoNotPrependCallerMethodNameToScenarioName = true, ScenarioName = "NoConfigFolder", @@ -111,7 +111,7 @@ public async Task TemplatePackageTest() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = "Snapshots", + SnapshotsDirectory = SnapshotsDirectory, OutputDirectory = workingDir, DoNotPrependCallerMethodNameToScenarioName = true, ScenarioName = "Basic", @@ -138,7 +138,7 @@ public async Task TemplatePackageTest_WithName() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = "Snapshots", + SnapshotsDirectory = SnapshotsDirectory, OutputDirectory = workingDir, DoNotPrependCallerMethodNameToScenarioName = true, ScenarioName = "WithName", @@ -166,7 +166,7 @@ public async Task TemplatePackageTest_NoMSBuildTasks() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = "Snapshots", + SnapshotsDirectory = SnapshotsDirectory, OutputDirectory = workingDir, DoNotPrependCallerMethodNameToScenarioName = true, ScenarioName = "NoMSBuildTasks", @@ -189,7 +189,7 @@ public async Task TemplateJsonTest_CLI() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = "Snapshots", + SnapshotsDirectory = SnapshotsDirectory, OutputDirectory = workingDir, DoNotPrependCallerMethodNameToScenarioName = true, VerifyCommandOutput = true, @@ -211,7 +211,7 @@ public async Task TemplatePackageTest_CLI() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = "Snapshots", + SnapshotsDirectory = SnapshotsDirectory, OutputDirectory = workingDir, DoNotPrependCallerMethodNameToScenarioName = true, VerifyCommandOutput = true, diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests.csproj index a6c2777544c2..70585e22bd2c 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests.csproj @@ -5,9 +5,9 @@ - - - + + + @@ -16,12 +16,7 @@ - - - - - - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Core.UnitTests/Microsoft.TemplateEngine.Core.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Core.UnitTests/Microsoft.TemplateEngine.Core.UnitTests.csproj index 24c1d04d7009..b01e18d0c00b 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Core.UnitTests/Microsoft.TemplateEngine.Core.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Core.UnitTests/Microsoft.TemplateEngine.Core.UnitTests.csproj @@ -9,11 +9,11 @@ - - - - - + + + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Edge.UnitTests/Microsoft.TemplateEngine.Edge.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Edge.UnitTests/Microsoft.TemplateEngine.Edge.UnitTests.csproj index 7b7f81c75763..5b0a26be8a93 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Edge.UnitTests/Microsoft.TemplateEngine.Edge.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Edge.UnitTests/Microsoft.TemplateEngine.Edge.UnitTests.csproj @@ -9,11 +9,11 @@ - - - - - + + + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/Microsoft.TemplateEngine.IDE.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/Microsoft.TemplateEngine.IDE.IntegrationTests.csproj index 3f2316d34148..a7276e8c8225 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/Microsoft.TemplateEngine.IDE.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/Microsoft.TemplateEngine.IDE.IntegrationTests.csproj @@ -6,21 +6,21 @@ - + - - - - - + + + + + - - + + @@ -29,8 +29,7 @@ - - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/SnapshotTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/SnapshotTests.cs index f6fcb86504f7..155cb88bc005 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/SnapshotTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/SnapshotTests.cs @@ -7,7 +7,7 @@ using Microsoft.TemplateEngine.Authoring.TemplateVerifier; using Microsoft.TemplateEngine.TestHelper; using Microsoft.TemplateEngine.Tests; -using Xunit.Abstractions; +using Xunit; namespace Microsoft.TemplateEngine.IDE.IntegrationTests { @@ -30,7 +30,7 @@ public Task PreferDefaultNameTest() new TemplateVerifierOptions(templateName: "TestAssets.TemplateWithPreferDefaultName") { TemplatePath = templateLocation, - SnapshotsDirectory = "Approvals", + SnapshotsDirectory = ApprovalsDirectory, DoNotPrependTemplateNameToScenarioName = true, DoNotAppendTemplateArgsToScenarioName = true, ScenarioName = "Basic" @@ -50,7 +50,7 @@ public Task TemplateWithOnlyIfStatementTest() new TemplateVerifierOptions(templateName: "TestAssets.TemplateWithOnlyIfStatement") { TemplatePath = templateLocation, - SnapshotsDirectory = "Approvals", + SnapshotsDirectory = ApprovalsDirectory, DoNotPrependTemplateNameToScenarioName = true, DoNotAppendTemplateArgsToScenarioName = true, ScenarioName = "Basic" @@ -70,7 +70,7 @@ public Task TemplateWithOnlyIfStatementTestForLocalhostTest() new TemplateVerifierOptions(templateName: "TestAssets.TemplateWithOnlyIfForLocalhost") { TemplatePath = templateLocation, - SnapshotsDirectory = "Approvals", + SnapshotsDirectory = ApprovalsDirectory, DoNotPrependTemplateNameToScenarioName = true, DoNotAppendTemplateArgsToScenarioName = true, ScenarioName = "Basic" @@ -99,7 +99,7 @@ public async Task BooleanConditionsTest(string testName, string?[]? parametersAr TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = "Approvals", + SnapshotsDirectory = ApprovalsDirectory, OutputDirectory = workingDirectory, DoNotPrependTemplateNameToScenarioName = true, DoNotAppendTemplateArgsToScenarioName = true, @@ -145,7 +145,7 @@ public async Task LegacyTests(string scenarioName, string templateFolderName, st TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName) { TemplatePath = templateLocation, - SnapshotsDirectory = "Approvals", + SnapshotsDirectory = ApprovalsDirectory, OutputDirectory = workingDirectory, DoNotPrependTemplateNameToScenarioName = true, DoNotAppendTemplateArgsToScenarioName = false, @@ -169,7 +169,7 @@ public async Task LegacyTest_PortsAndCoalesceRenames() TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: "TestAssets.TemplateWithPortsAndCoalesce") { TemplatePath = templateLocation, - SnapshotsDirectory = "Approvals", + SnapshotsDirectory = ApprovalsDirectory, OutputDirectory = workingDirectory, DoNotPrependTemplateNameToScenarioName = true, DoNotAppendTemplateArgsToScenarioName = false, diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/VerifySettingsFixture.cs b/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/VerifySettingsFixture.cs index f44508b1159d..30ced43aa3ec 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/VerifySettingsFixture.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.IDE.IntegrationTests/VerifySettingsFixture.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using VerifyTests.DiffPlex; +using Microsoft.TemplateEngine.Tests; namespace Microsoft.TemplateEngine.IDE.IntegrationTests { @@ -19,7 +20,7 @@ public VerifySettingsFixture() DerivePathInfo( (_, _, type, method) => new( - directory: "Approvals", + directory: TestBase.ApprovalsDirectory, typeName: type.Name, methodName: method.Name)); diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks.XunitV3/Microsoft.TemplateEngine.Mocks.XunitV3.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Mocks.XunitV3/Microsoft.TemplateEngine.Mocks.XunitV3.csproj deleted file mode 100644 index 568aa39c5231..000000000000 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks.XunitV3/Microsoft.TemplateEngine.Mocks.XunitV3.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - $(DefineConstants);XUNIT_V3 - - - - - - - - - - - diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/Microsoft.TemplateEngine.Mocks.Shared.props b/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/Microsoft.TemplateEngine.Mocks.Shared.props index e4e5ea4ba0fa..03d4b88c165c 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/Microsoft.TemplateEngine.Mocks.Shared.props +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/Microsoft.TemplateEngine.Mocks.Shared.props @@ -13,12 +13,12 @@ - - - - - - + + + + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/Microsoft.TemplateEngine.Mocks.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/Microsoft.TemplateEngine.Mocks.csproj index 80e835c4109f..4be42e62e119 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/Microsoft.TemplateEngine.Mocks.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/Microsoft.TemplateEngine.Mocks.csproj @@ -3,7 +3,7 @@ - + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockCreationEffects.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockCreationEffects.cs index 0e96d4e7e4f9..0db0211f3dfc 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockCreationEffects.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockCreationEffects.cs @@ -3,11 +3,7 @@ using System.Text; using Microsoft.TemplateEngine.Abstractions; -#if XUNIT_V3 using Xunit.Sdk; -#else -using Xunit.Abstractions; -#endif namespace Microsoft.TemplateEngine.Mocks { @@ -53,15 +49,9 @@ public MockCreationEffects Without(params string[] files) public void Deserialize(IXunitSerializationInfo info) { -#if XUNIT_V3 _primaryOutputs = info.GetValue("primaryOutputs")!; _mockFileChanges = info.GetValue("fileChanges")!; _absentFiles = info.GetValue("absentFiles")!; -#else - _primaryOutputs = info.GetValue("primaryOutputs"); - _mockFileChanges = info.GetValue("fileChanges"); - _absentFiles = info.GetValue("absentFiles"); -#endif } public void Serialize(IXunitSerializationInfo info) diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockFileChange.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockFileChange.cs index d6f3550460f5..3edb428a9feb 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockFileChange.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockFileChange.cs @@ -2,11 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.TemplateEngine.Abstractions; -#if XUNIT_V3 using Xunit.Sdk; -#else -using Xunit.Abstractions; -#endif namespace Microsoft.TemplateEngine.Mocks { diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockTemplateInfo.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockTemplateInfo.cs index 2b8ac3006918..b1a5104f61a7 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockTemplateInfo.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockTemplateInfo.cs @@ -7,11 +7,7 @@ using Microsoft.TemplateEngine.Abstractions.Constraints; using Microsoft.TemplateEngine.Abstractions.Parameters; using Microsoft.TemplateEngine.Utils; -#if XUNIT_V3 using Xunit.Sdk; -#else -using Xunit.Abstractions; -#endif namespace Microsoft.TemplateEngine.Mocks { @@ -245,7 +241,6 @@ public void Deserialize(IXunitSerializationInfo info) GroupIdentity = info.GetValue("template_group"); Description = info.GetValue("template_description"); Author = info.GetValue("template_author"); -#if XUNIT_V3 _tags = JsonSerializer.Deserialize>(info.GetValue("template_tags")!) ?? throw new Exception("Deserialiation failed"); _parameters = JsonSerializer.Deserialize>(info.GetValue("template_params")!) @@ -256,18 +251,6 @@ public void Deserialize(IXunitSerializationInfo info) ?? throw new Exception("Deserialiation failed"); _shortNameList = JsonSerializer.Deserialize(info.GetValue("template_shortname")!) ?? throw new Exception("Deserialiation failed"); -#else - _tags = JsonSerializer.Deserialize>(info.GetValue("template_tags")) - ?? throw new Exception("Deserialiation failed"); - _parameters = JsonSerializer.Deserialize>(info.GetValue("template_params")) - ?? throw new Exception("Deserialiation failed"); - _baselineInfo = JsonSerializer.Deserialize(info.GetValue("template_baseline")) - ?? throw new Exception("Deserialiation failed"); - _classifications = JsonSerializer.Deserialize(info.GetValue("template_classifications")) - ?? throw new Exception("Deserialiation failed"); - _shortNameList = JsonSerializer.Deserialize(info.GetValue("template_shortname")) - ?? throw new Exception("Deserialiation failed"); -#endif } public void Serialize(IXunitSerializationInfo info) diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj index 73604304db2b..b3eb05ee135a 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj @@ -11,7 +11,7 @@ - + @@ -20,17 +20,17 @@ - - - - - - + + + + + + - - + + @@ -39,11 +39,11 @@ - + - diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/SnapshotTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/SnapshotTests.cs index 002150d8ab5a..7925ffe88fae 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/SnapshotTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/SnapshotTests.cs @@ -8,7 +8,7 @@ using Microsoft.TemplateEngine.Authoring.TemplateVerifier; using Microsoft.TemplateEngine.TestHelper; using Microsoft.TemplateEngine.Tests; -using Xunit.Abstractions; +using Xunit; namespace Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests { @@ -39,7 +39,7 @@ public Task TestGeneratedSymbolWithRefToDerivedSymbol() OutputDirectory = workingDir, DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, - SnapshotsDirectory = "Approvals" + SnapshotsDirectory = ApprovalsDirectory } .WithInstantiationThroughTemplateCreatorApi(templateParams); @@ -64,7 +64,7 @@ public Task TestGeneratedSymbolWithRefToDerivedSymbol_DifferentOrder() OutputDirectory = workingDir, DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, - SnapshotsDirectory = "Approvals" + SnapshotsDirectory = ApprovalsDirectory } .WithInstantiationThroughTemplateCreatorApi(templateParams); @@ -89,7 +89,7 @@ public Task TestCoalesce_EmptyStringForMultiChoices() OutputDirectory = workingDir, DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, - SnapshotsDirectory = "Approvals" + SnapshotsDirectory = ApprovalsDirectory } .WithInstantiationThroughTemplateCreatorApi(templateParams); @@ -114,7 +114,7 @@ public Task TestSingleSelectionForMultiChoices() OutputDirectory = workingDir, DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, - SnapshotsDirectory = "Approvals" + SnapshotsDirectory = ApprovalsDirectory } .WithInstantiationThroughTemplateCreatorApi(templateParams); @@ -140,7 +140,7 @@ public Task TestTemplateWithBrokenGeneratedInComputed() DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, VerifyCommandOutput = true, - SnapshotsDirectory = "Approvals" + SnapshotsDirectory = ApprovalsDirectory } .WithInstantiationThroughTemplateCreatorApi(templateParams); @@ -162,7 +162,7 @@ public Task TestTemplateWithComputedInGenerated() DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, VerifyCommandOutput = true, - SnapshotsDirectory = "Approvals" + SnapshotsDirectory = ApprovalsDirectory } .WithInstantiationThroughTemplateCreatorApi( new Dictionary() @@ -188,7 +188,7 @@ public Task TestTemplateWithComputedInDerivedThroughGenerated() DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, VerifyCommandOutput = true, - SnapshotsDirectory = "Approvals" + SnapshotsDirectory = ApprovalsDirectory } .WithInstantiationThroughTemplateCreatorApi(new Dictionary()); @@ -210,7 +210,7 @@ public Task TestTemplateWithGeneratedInComputed() DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, VerifyCommandOutput = true, - SnapshotsDirectory = "Approvals" + SnapshotsDirectory = ApprovalsDirectory } .WithInstantiationThroughTemplateCreatorApi( new Dictionary() @@ -237,7 +237,7 @@ public Task TestTemplateWithGeneratedSwitchInComputed() DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, VerifyCommandOutput = true, - SnapshotsDirectory = "Approvals" + SnapshotsDirectory = ApprovalsDirectory } .WithInstantiationThroughTemplateCreatorApi( new Dictionary() @@ -266,7 +266,7 @@ public Task TestTemplateWithCircleDependencyInMacros() DoNotPrependTemplateNameToScenarioName = true, VerifyCommandOutput = true, IsCommandExpectedToFail = true, - SnapshotsDirectory = "Approvals" + SnapshotsDirectory = ApprovalsDirectory } .WithInstantiationThroughTemplateCreatorApi(new Dictionary()); @@ -295,7 +295,7 @@ public Task TestSelectionForMultiChoicesWhenThereAreMultiplePartialMatchesAndOne OutputDirectory = workingDir, DoNotAppendTemplateArgsToScenarioName = true, DoNotPrependTemplateNameToScenarioName = true, - SnapshotsDirectory = "Approvals" + SnapshotsDirectory = ApprovalsDirectory } .WithInstantiationThroughTemplateCreatorApi(templateParams); diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/VerifySettingsFixture.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/VerifySettingsFixture.cs index 9c4277648512..a40f32e04fb6 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/VerifySettingsFixture.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/VerifySettingsFixture.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.TemplateEngine.Tests; using VerifyTests.DiffPlex; namespace Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests @@ -18,7 +19,7 @@ public VerifySettingsFixture() s_called = true; DerivePathInfo( (_, _, type, method) => new( - directory: "Approvals", + directory: TestBase.ApprovalsDirectory, typeName: type.Name, methodName: method.Name)); diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj index b218c68a6be8..89e7e38b5b64 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj @@ -5,8 +5,12 @@ - - + + + + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/StringExtractorTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/StringExtractorTests.cs index 00c12ef9ea91..aef74263278c 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/StringExtractorTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests/StringExtractorTests.cs @@ -3,6 +3,7 @@ using System.Text.Json; using Microsoft.TemplateEngine.TemplateLocalizer.Core.Exceptions; +using Microsoft.TemplateEngine.Tests; using Xunit; namespace Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests @@ -187,21 +188,11 @@ private static IReadOnlyList ExtractStrings(string json, out str private static string GetTestTemplateJsonContent() { - string thisDir = Path.GetDirectoryName(typeof(StringExtractorTests).Assembly.Location) - ?? throw new Exception("Failed to get assembly location, which is required to access test templates."); - string templateJsonPath = Path.GetFullPath(Path.Combine( - thisDir, - "..", - "..", - "..", - "..", - "..", - "test", - "Microsoft.TemplateEngine.TestTemplates", - "test_templates", + string templateJsonPath = Path.Combine( + TestBase.TestTemplatesLocation, "TemplateWithLocalization", ".template.config", - "template.json")); + "template.json"); return File.ReadAllText(templateJsonPath); } diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper.XunitV3/Microsoft.TemplateEngine.TestHelper.XunitV3.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper.XunitV3/Microsoft.TemplateEngine.TestHelper.XunitV3.csproj deleted file mode 100644 index f5c135afa69a..000000000000 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper.XunitV3/Microsoft.TemplateEngine.TestHelper.XunitV3.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - $(DefineConstants);XUNIT_V3 - - - - - - - - - - - diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper.XunitV3/PublicAPI.Shipped.txt b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper.XunitV3/PublicAPI.Shipped.txt deleted file mode 100644 index 91b0e1a43b98..000000000000 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper.XunitV3/PublicAPI.Shipped.txt +++ /dev/null @@ -1 +0,0 @@ -#nullable enable \ No newline at end of file diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper.XunitV3/PublicAPI.Unshipped.txt b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper.XunitV3/PublicAPI.Unshipped.txt deleted file mode 100644 index 36c9270c3c4e..000000000000 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper.XunitV3/PublicAPI.Unshipped.txt +++ /dev/null @@ -1,106 +0,0 @@ -Microsoft.TemplateEngine.TestHelper.AssemblyComponentCatalog -Microsoft.TemplateEngine.TestHelper.AssemblyComponentCatalog.AssemblyComponentCatalog(System.Collections.Generic.IReadOnlyList! assemblies) -> void -Microsoft.TemplateEngine.TestHelper.AssemblyComponentCatalog.Count.get -> int -Microsoft.TemplateEngine.TestHelper.AssemblyComponentCatalog.GetEnumerator() -> System.Collections.Generic.IEnumerator<(System.Type!, Microsoft.TemplateEngine.Abstractions.IIdentifiedComponent!)>! -Microsoft.TemplateEngine.TestHelper.AssemblyComponentCatalog.this[int index].get -> (System.Type!, Microsoft.TemplateEngine.Abstractions.IIdentifiedComponent!) -Microsoft.TemplateEngine.TestHelper.BuiltInTemplatePackagesProviderFactory -Microsoft.TemplateEngine.TestHelper.BuiltInTemplatePackagesProviderFactory.BuiltInTemplatePackagesProviderFactory(params string![]! pathsToProbe) -> void -Microsoft.TemplateEngine.TestHelper.BuiltInTemplatePackagesProviderFactory.CreateProvider(Microsoft.TemplateEngine.Abstractions.IEngineEnvironmentSettings! settings) -> Microsoft.TemplateEngine.Abstractions.TemplatePackage.ITemplatePackageProvider! -Microsoft.TemplateEngine.TestHelper.BuiltInTemplatePackagesProviderFactory.DisplayName.get -> string! -Microsoft.TemplateEngine.TestHelper.BuiltInTemplatePackagesProviderFactory.Id.get -> System.Guid -Microsoft.TemplateEngine.TestHelper.EnvironmentSettingsHelper -Microsoft.TemplateEngine.TestHelper.EnvironmentSettingsHelper.CreateEnvironment(string? locale = null, bool virtualize = false, string! hostIdentifier = "", bool loadDefaultGenerator = true, Microsoft.TemplateEngine.Abstractions.IEnvironment? environment = null, System.Collections.Generic.IReadOnlyList<(System.Type!, Microsoft.TemplateEngine.Abstractions.IIdentifiedComponent!)>? additionalComponents = null, System.Collections.Generic.IEnumerable? addLoggerProviders = null) -> Microsoft.TemplateEngine.Abstractions.IEngineEnvironmentSettings! -Microsoft.TemplateEngine.TestHelper.EnvironmentSettingsHelper.CreateTemporaryFolder(string! name = "") -> string! -Microsoft.TemplateEngine.TestHelper.EnvironmentSettingsHelper.Dispose() -> void -Microsoft.TemplateEngine.TestHelper.EnvironmentSettingsHelper.EnvironmentSettingsHelper(Xunit.Sdk.IMessageSink! messageSink) -> void -Microsoft.TemplateEngine.TestHelper.InMemoryLoggerProvider -Microsoft.TemplateEngine.TestHelper.InMemoryLoggerProvider.CreateLogger(string! categoryName) -> Microsoft.Extensions.Logging.ILogger! -Microsoft.TemplateEngine.TestHelper.InMemoryLoggerProvider.Dispose() -> void -Microsoft.TemplateEngine.TestHelper.InMemoryLoggerProvider.InMemoryLoggerProvider(System.Collections.Generic.List<(Microsoft.Extensions.Logging.LogLevel, string!)>! messagesCollection) -> void -Microsoft.TemplateEngine.TestHelper.LongRunningConstraintFactory -Microsoft.TemplateEngine.TestHelper.LongRunningConstraintFactory.CreateTemplateConstraintAsync(Microsoft.TemplateEngine.Abstractions.IEngineEnvironmentSettings! environmentSettings, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task! -Microsoft.TemplateEngine.TestHelper.LongRunningConstraintFactory.Id.get -> System.Guid -Microsoft.TemplateEngine.TestHelper.LongRunningConstraintFactory.LongRunningConstraintFactory(string! type, int msDelay) -> void -Microsoft.TemplateEngine.TestHelper.LongRunningConstraintFactory.Type.get -> string! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.CreateDirectory(string! path) -> void -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.CreateFile(string! path) -> System.IO.Stream! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.DirectoriesScanned.get -> System.Collections.Generic.IReadOnlyList! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.DirectoryDelete(string! path, bool recursive) -> void -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.DirectoryExists(string! directory) -> bool -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.DirectoryScanParameters -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.DirectoryScanParameters.DirectoryName.get -> string! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.DirectoryScanParameters.DirectoryScanParameters(string! directoryName, string! pattern, System.IO.SearchOption searchOption) -> void -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.DirectoryScanParameters.Pattern.get -> string! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.DirectoryScanParameters.SearchOption.get -> System.IO.SearchOption -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.EnumerateDirectories(string! path, string! pattern, System.IO.SearchOption searchOption) -> System.Collections.Generic.IEnumerable! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.EnumerateFiles(string! path, string! pattern, System.IO.SearchOption searchOption) -> System.Collections.Generic.IEnumerable! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.EnumerateFileSystemEntries(string! directoryName, string! pattern, System.IO.SearchOption searchOption) -> System.Collections.Generic.IEnumerable! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.FileCopy(string! sourcePath, string! targetPath, bool overwrite) -> void -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.FileDelete(string! path) -> void -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.FileExists(string! file) -> bool -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.FilesOpened.get -> System.Collections.Generic.IEnumerable! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.FilesWatched.get -> System.Collections.Generic.IEnumerable! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.GetCurrentDirectory() -> string! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.GetFileAttributes(string! file) -> System.IO.FileAttributes -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.GetLastWriteTimeUtc(string! file) -> System.DateTime -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.MonitoredFileSystem(Microsoft.TemplateEngine.Abstractions.PhysicalFileSystem.IPhysicalFileSystem! baseFileSystem) -> void -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.OpenRead(string! path) -> System.IO.Stream! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.PathRelativeTo(string! target, string! relativeTo) -> string! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.ReadAllBytes(string! path) -> byte[]! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.ReadAllText(string! path) -> string! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.Reset() -> void -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.SetFileAttributes(string! file, System.IO.FileAttributes attributes) -> void -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.SetLastWriteTimeUtc(string! file, System.DateTime lastWriteTimeUtc) -> void -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.WatchFileChanges(string! filepath, System.IO.FileSystemEventHandler! fileChanged) -> System.IDisposable! -Microsoft.TemplateEngine.TestHelper.MonitoredFileSystem.WriteAllText(string! path, string! value) -> void -Microsoft.TemplateEngine.TestHelper.PackageManager -Microsoft.TemplateEngine.TestHelper.PackageManager.Dispose() -> void -Microsoft.TemplateEngine.TestHelper.PackageManager.GetNuGetPackage(string! templatePackName, string? version = null, NuGet.Versioning.NuGetVersion? minimumVersion = null, NuGet.Common.ILogger? logger = null, string? downloadDirectory = null) -> System.Threading.Tasks.Task! -Microsoft.TemplateEngine.TestHelper.PackageManager.PackageManager() -> void -Microsoft.TemplateEngine.TestHelper.PackageManager.PackNuGetPackage(string! projectPath, NuGet.Common.ILogger? logger = null) -> string! -Microsoft.TemplateEngine.TestHelper.SharedTestOutputHelper -Microsoft.TemplateEngine.TestHelper.SharedTestOutputHelper.Output.get -> string! -Microsoft.TemplateEngine.TestHelper.SharedTestOutputHelper.SharedTestOutputHelper(Xunit.Sdk.IMessageSink! sink) -> void -Microsoft.TemplateEngine.TestHelper.SharedTestOutputHelper.Write(string! format, params object![]! args) -> void -Microsoft.TemplateEngine.TestHelper.SharedTestOutputHelper.Write(string! message) -> void -Microsoft.TemplateEngine.TestHelper.SharedTestOutputHelper.WriteLine(string! format, params object![]! args) -> void -Microsoft.TemplateEngine.TestHelper.SharedTestOutputHelper.WriteLine(string! message) -> void -Microsoft.TemplateEngine.TestHelper.StringExtensions -Microsoft.TemplateEngine.TestHelper.TestConstraintFactory -Microsoft.TemplateEngine.TestHelper.TestConstraintFactory.CreateTemplateConstraintAsync(Microsoft.TemplateEngine.Abstractions.IEngineEnvironmentSettings! environmentSettings, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task! -Microsoft.TemplateEngine.TestHelper.TestConstraintFactory.Id.get -> System.Guid -Microsoft.TemplateEngine.TestHelper.TestConstraintFactory.TestConstraintFactory(string! type) -> void -Microsoft.TemplateEngine.TestHelper.TestConstraintFactory.Type.get -> string! -Microsoft.TemplateEngine.TestHelper.TestFileSystemUtils -Microsoft.TemplateEngine.TestHelper.TestHost -Microsoft.TemplateEngine.TestHelper.TestHost.Dispose() -> void -Microsoft.TemplateEngine.TestHelper.TestHost.HostParamDefaults.get -> System.Collections.Generic.Dictionary! -Microsoft.TemplateEngine.TestHelper.TestHost.HostParamDefaults.set -> void -Microsoft.TemplateEngine.TestHelper.TestLoggerFactory -Microsoft.TemplateEngine.TestHelper.TestLoggerFactory.AddProvider(Microsoft.Extensions.Logging.ILoggerProvider! provider) -> void -Microsoft.TemplateEngine.TestHelper.TestLoggerFactory.CreateLogger() -> Microsoft.Extensions.Logging.ILogger! -Microsoft.TemplateEngine.TestHelper.TestLoggerFactory.CreateLogger(string! categoryName) -> Microsoft.Extensions.Logging.ILogger! -Microsoft.TemplateEngine.TestHelper.TestLoggerFactory.Dispose() -> void -Microsoft.TemplateEngine.TestHelper.TestLoggerFactory.TestLoggerFactory(Xunit.Sdk.IMessageSink? messageSink = null) -> void -Microsoft.TemplateEngine.TestHelper.TestUtils -Microsoft.TemplateEngine.TestHelper.XunitLoggerProvider -Microsoft.TemplateEngine.TestHelper.XunitLoggerProvider.CreateLogger(string! categoryName) -> Microsoft.Extensions.Logging.ILogger! -Microsoft.TemplateEngine.TestHelper.XunitLoggerProvider.Dispose() -> void -Microsoft.TemplateEngine.TestHelper.XunitLoggerProvider.XunitLoggerProvider(Xunit.ITestOutputHelper! output) -> void -Microsoft.TemplateEngine.TestHelper.XunitLoggerProvider.XunitLoggerProvider(Xunit.ITestOutputHelper! output, Microsoft.Extensions.Logging.LogLevel minLevel) -> void -Microsoft.TemplateEngine.TestHelper.XunitLoggerProvider.XunitLoggerProvider(Xunit.ITestOutputHelper! output, Microsoft.Extensions.Logging.LogLevel minLevel, System.DateTimeOffset? logStart) -> void -static Microsoft.TemplateEngine.TestHelper.BuiltInTemplatePackagesProviderFactory.GetComponents(params string![]! pathsToProbe) -> System.Collections.Generic.List<(System.Type!, Microsoft.TemplateEngine.Abstractions.IIdentifiedComponent!)>! -static Microsoft.TemplateEngine.TestHelper.StringExtensions.UnixifyLineBreaks(this string! input) -> string! -static Microsoft.TemplateEngine.TestHelper.TestFileSystemUtils.GetTempVirtualizedPath(this Microsoft.TemplateEngine.Abstractions.IEngineEnvironmentSettings! environmentSettings) -> string! -static Microsoft.TemplateEngine.TestHelper.TestFileSystemUtils.MountPath(this Microsoft.TemplateEngine.Abstractions.IEngineEnvironmentSettings! environmentSettings, string! sourceBasePath) -> Microsoft.TemplateEngine.Abstractions.Mount.IMountPoint! -static Microsoft.TemplateEngine.TestHelper.TestFileSystemUtils.WriteFile(this Microsoft.TemplateEngine.Abstractions.IEngineEnvironmentSettings! environmentSettings, string! filePath, string? fileContent) -> void -static Microsoft.TemplateEngine.TestHelper.TestFileSystemUtils.WriteTemplateSource(this Microsoft.TemplateEngine.Abstractions.IEngineEnvironmentSettings! environmentSettings, string! sourceBasePath, System.Collections.Generic.IDictionary! templateSourceFileNamesWithContent) -> void -static Microsoft.TemplateEngine.TestHelper.TestHost.GetVirtualHost(string! hostIdentifier = "", Microsoft.TemplateEngine.Abstractions.IEnvironment? environment = null, System.Collections.Generic.IReadOnlyList<(System.Type!, Microsoft.TemplateEngine.Abstractions.IIdentifiedComponent!)>? additionalComponents = null, System.Collections.Generic.IReadOnlyDictionary? defaultParameters = null) -> Microsoft.TemplateEngine.Abstractions.ITemplateEngineHost! -static Microsoft.TemplateEngine.TestHelper.TestUtils.AttemptSearch(int count, System.TimeSpan interval, System.Func!>! execute) -> System.Threading.Tasks.Task! -static Microsoft.TemplateEngine.TestHelper.TestUtils.CompareFiles(string! file1, string! file2) -> bool -static Microsoft.TemplateEngine.TestHelper.TestUtils.CreateTemporaryFolder(string! name = "") -> string! -static Microsoft.TemplateEngine.TestHelper.TestUtils.DirectoryCopy(string! sourceDirName, string! destDirName, bool copySubDirs) -> void -static Microsoft.TemplateEngine.TestHelper.TestUtils.SetupNuGetConfigForPackagesLocation(string! projectDirectory, string! packagesLocation) -> void -static readonly Microsoft.TemplateEngine.TestHelper.BuiltInTemplatePackagesProviderFactory.FactoryId -> System.Guid -static readonly Microsoft.TemplateEngine.TestHelper.TestFileSystemUtils.DefaultConfigRelativePath -> string! \ No newline at end of file diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/EnvironmentSettingsHelper.cs b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/EnvironmentSettingsHelper.cs index 49a1270957d4..0374ca18a8f6 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/EnvironmentSettingsHelper.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/EnvironmentSettingsHelper.cs @@ -7,11 +7,7 @@ using Microsoft.TemplateEngine.Abstractions; using Microsoft.TemplateEngine.Edge; using Microsoft.TemplateEngine.Utils; -#if XUNIT_V3 using Xunit.Sdk; -#else -using Xunit.Abstractions; -#endif namespace Microsoft.TemplateEngine.TestHelper { diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/Microsoft.TemplateEngine.TestHelper.Shared.props b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/Microsoft.TemplateEngine.TestHelper.Shared.props index 97fada325741..3d343942de0c 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/Microsoft.TemplateEngine.TestHelper.Shared.props +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/Microsoft.TemplateEngine.TestHelper.Shared.props @@ -10,9 +10,9 @@ - - - + + + diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/Microsoft.TemplateEngine.TestHelper.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/Microsoft.TemplateEngine.TestHelper.csproj index ee0310b7d8b4..83b05eba351f 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/Microsoft.TemplateEngine.TestHelper.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/Microsoft.TemplateEngine.TestHelper.csproj @@ -3,8 +3,7 @@ - - + \ No newline at end of file diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/SharedTestOutputHelper.cs b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/SharedTestOutputHelper.cs index 52347e1d906e..7e48984fea72 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/SharedTestOutputHelper.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/SharedTestOutputHelper.cs @@ -1,15 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -#if XUNIT_V3 using System.Text; using Xunit; using Xunit.Sdk; using Xunit.v3; -#else -using Xunit.Abstractions; -using Xunit.Sdk; -#endif namespace Microsoft.TemplateEngine.TestHelper { @@ -20,16 +15,13 @@ namespace Microsoft.TemplateEngine.TestHelper public class SharedTestOutputHelper : ITestOutputHelper { private readonly IMessageSink _sink; -#if XUNIT_V3 private readonly StringBuilder _output = new(); -#endif public SharedTestOutputHelper(IMessageSink sink) { this._sink = sink; } -#if XUNIT_V3 public string Output => _output.ToString(); public void Write(string message) @@ -57,16 +49,5 @@ public void WriteLine(string format, params object[] args) _output.AppendLine(message); _sink.OnMessage(new DiagnosticMessage(message)); } -#else - public void WriteLine(string message) - { - _sink.OnMessage(new DiagnosticMessage(message)); - } - - public void WriteLine(string format, params object[] args) - { - _sink.OnMessage(new DiagnosticMessage(format, args)); - } -#endif } } diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/TestLoggerFactory.cs b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/TestLoggerFactory.cs index c344f39eebc1..ac3260424343 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/TestLoggerFactory.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/TestLoggerFactory.cs @@ -2,11 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Extensions.Logging; -#if XUNIT_V3 using Xunit.Sdk; -#else -using Xunit.Abstractions; -#endif namespace Microsoft.TemplateEngine.TestHelper { diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/TestUtils.cs b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/TestUtils.cs index 2cac468dd2cf..ad8f6b1a80f8 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/TestUtils.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/TestUtils.cs @@ -14,6 +14,15 @@ public static string CreateTemporaryFolder(string name = "") public static void SetupNuGetConfigForPackagesLocation(string projectDirectory, string packagesLocation) { + SetupNuGetConfigForPackagesLocation(projectDirectory, new[] { packagesLocation }); + } + + public static void SetupNuGetConfigForPackagesLocation(string projectDirectory, IEnumerable packagesLocations) + { + var sources = string.Join( + Environment.NewLine, + packagesLocations.Select((loc, i) => $@" ")); + string nugetConfigShim = $@" @@ -22,7 +31,7 @@ public static void SetupNuGetConfigForPackagesLocation(string projectDirectory, - +{sources} "; diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/XunitLoggerProvider.cs b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/XunitLoggerProvider.cs index 9f1130d0360a..527773c383d9 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/XunitLoggerProvider.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.TestHelper/XunitLoggerProvider.cs @@ -3,11 +3,7 @@ using System.Text; using Microsoft.Extensions.Logging; -#if XUNIT_V3 using Xunit; -#else -using Xunit.Abstractions; -#endif namespace Microsoft.TemplateEngine.TestHelper { diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/DefaultTemplatePackageProviderTests.cs b/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/DefaultTemplatePackageProviderTests.cs index a759217f79a9..7eb0018115f4 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/DefaultTemplatePackageProviderTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/DefaultTemplatePackageProviderTests.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.NET.TestFramework; using Microsoft.TemplateEngine.Abstractions; using Microsoft.TemplateEngine.TestHelper; using Xunit; @@ -19,11 +20,13 @@ public DefaultTemplatePackageProviderTests(EnvironmentSettingsHelper environment [Fact] public async Task ReturnsFoldersAndNuPkgs() { - var thisDir = Path.GetDirectoryName(typeof(DefaultTemplatePackageProviderTests).Assembly.Location); + string testAssetsDir = SdkTestContext.Current.TestAssetsDirectory; + string templateEngineTestAssets = Path.Combine(testAssetsDir, "TestPackages", "TemplateEngine"); + //Pass in 5 folders - var folders = Directory.GetDirectories(Path.Combine(thisDir!, "..", "..", "..", "..", "..", "test", "Microsoft.TemplateEngine.TestTemplates", "test_templates")).Take(5); + var folders = Directory.GetDirectories(Path.Combine(templateEngineTestAssets, "test_templates")).Take(5); //And one *.nupkg, but that folder contains 2 .nupkg files - var nupkgs = new[] { Path.Combine(thisDir!, "..", "..", "..", "..", "..", "test", "Microsoft.TemplateEngine.TestTemplates", "nupkg_templates", "*.nupkg") }; + var nupkgs = new[] { Path.Combine(templateEngineTestAssets, "nupkg_templates", "*.nupkg") }; var provider = new DefaultTemplatePackageProvider(null!, _engineEnvironmentSettings, nupkgs, folders); var sources = await provider.GetAllTemplatePackagesAsync(default); diff --git a/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/Microsoft.TemplateEngine.Utils.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/Microsoft.TemplateEngine.Utils.UnitTests.csproj index d530d5d99d24..f98adba4e2f7 100644 --- a/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/Microsoft.TemplateEngine.Utils.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateEngine.Utils.UnitTests/Microsoft.TemplateEngine.Utils.UnitTests.csproj @@ -5,13 +5,13 @@ - - - + + + - + diff --git a/test/TemplateEngine/Microsoft.TemplateSearch.Common.UnitTests/Microsoft.TemplateSearch.Common.UnitTests.csproj b/test/TemplateEngine/Microsoft.TemplateSearch.Common.UnitTests/Microsoft.TemplateSearch.Common.UnitTests.csproj index d7f1c7b705d5..37e315a05067 100644 --- a/test/TemplateEngine/Microsoft.TemplateSearch.Common.UnitTests/Microsoft.TemplateSearch.Common.UnitTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateSearch.Common.UnitTests/Microsoft.TemplateSearch.Common.UnitTests.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/test/TemplateEngine/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests.csproj b/test/TemplateEngine/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests.csproj index 3707971ea1ac..60bd92f41d7a 100644 --- a/test/TemplateEngine/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests.csproj +++ b/test/TemplateEngine/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/test/TemplateEngine/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/TemplateDiscoveryTests.cs b/test/TemplateEngine/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/TemplateDiscoveryTests.cs index f31041934d24..c73eb1342c9b 100644 --- a/test/TemplateEngine/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/TemplateDiscoveryTests.cs +++ b/test/TemplateEngine/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/TemplateDiscoveryTests.cs @@ -5,7 +5,7 @@ using Microsoft.TemplateEngine.CommandUtils; using Microsoft.TemplateEngine.TestHelper; using Microsoft.TemplateEngine.Tests; -using Xunit.Abstractions; +using Xunit; namespace Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests { diff --git a/test/TemplateEngine/Shared/TestBase.cs b/test/TemplateEngine/Shared/TestBase.cs index b833b1ab4ea0..cac23d7f0f92 100644 --- a/test/TemplateEngine/Shared/TestBase.cs +++ b/test/TemplateEngine/Shared/TestBase.cs @@ -1,48 +1,68 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.NET.TestFramework; using Microsoft.TemplateEngine.TestHelper; namespace Microsoft.TemplateEngine.Tests { /// /// The class contains the utils for unit and integration tests. + /// Paths are resolved via which handles both + /// local (repo-rooted) and Helix (environment variable) environments. /// public abstract class TestBase { - internal static string CodeBaseRoot { get; } = GetCodeBaseRoot(); + private static readonly Lazy s_codeBaseRoot = new(() => + SdkTestContext.GetRepoRoot() + ?? throw new InvalidOperationException( + "Could not determine the repo root. Ensure .git exists in the directory tree or set the required DOTNET_SDK_TEST_* environment variables.")); + + internal static string CodeBaseRoot => s_codeBaseRoot.Value; internal static string ShippingPackagesLocation { get { -#if DEBUG - string configuration = "Debug"; -#elif RELEASE - string configuration = "Release"; -#else - throw new NotSupportedException("The configuration is not supported"); -#endif - - string packagesLocation = Path.Combine(CodeBaseRoot, "artifacts", "packages", configuration, "Shipping"); - - if (!Directory.Exists(packagesLocation)) + string? location = SdkTestContext.Current.ShippingPackagesDirectory; + if (string.IsNullOrEmpty(location) || !Directory.Exists(location)) { - throw new Exception($"{packagesLocation} does not exist"); + throw new InvalidOperationException( + $"ShippingPackagesDirectory '{location}' does not exist. " + + "Set the DOTNET_SDK_ARTIFACTS_DIR environment variable or run from the repo root."); } - return Path.GetFullPath(packagesLocation); + return Path.GetFullPath(location); } } - internal static string TemplateFeedLocation { get; } = Path.Combine(CodeBaseRoot, "template_feed"); + internal static string TemplateFeedLocation { get; } = SdkTestContext.Current.RepoTemplatePackages; + + internal static string ApprovalsDirectory { get; } = Path.Combine(AppContext.BaseDirectory, "Approvals"); + + internal static string SnapshotsDirectory { get; } = Path.Combine(AppContext.BaseDirectory, "Snapshots"); - internal static string TestTemplatesLocation { get; } = Path.Combine(CodeBaseRoot, "test", "Microsoft.TemplateEngine.TestTemplates", "test_templates"); + internal static string TestTemplatesLocation { get; } = + Path.Combine(SdkTestContext.Current.TestAssetsDirectory, "TestPackages", "TemplateEngine", "test_templates"); + + internal static string SampleTemplatesLocation + { + get + { + string? envSamplesDir = Environment.GetEnvironmentVariable("DOTNET_SDK_TEST_TEMPLATE_SAMPLES_DIR"); + if (!string.IsNullOrEmpty(envSamplesDir) && Directory.Exists(envSamplesDir)) + { + return envSamplesDir; + } - internal static string SampleTemplatesLocation { get; } = Path.Combine(CodeBaseRoot, "dotnet-template-samples"); + return Path.Combine(CodeBaseRoot, "documentation", "TemplateEngine", "Samples"); + } + } - internal static string TestTemplatePackagesLocation { get; } = Path.Combine(CodeBaseRoot, "test", "Microsoft.TemplateEngine.TestTemplates", "nupkg_templates"); + internal static string TestTemplatePackagesLocation { get; } = + Path.Combine(SdkTestContext.Current.TestAssetsDirectory, "TestPackages", "TemplateEngine", "nupkg_templates"); - internal static string TestPackageProjectPath { get; } = Path.Combine(CodeBaseRoot, "test", "Microsoft.TemplateEngine.TestTemplates", "Microsoft.TemplateEngine.TestTemplates.csproj"); + internal static string TestPackageProjectPath { get; } = + Path.Combine(SdkTestContext.Current.TestAssetsDirectory, "TestPackages", "TemplateEngine", "Microsoft.TemplateEngine.TestTemplates.csproj"); internal static string PackTestTemplatesNuGetPackage(PackageManager packageManager) { @@ -60,24 +80,15 @@ internal static string GetTestTemplateLocation(string templateName) return Path.GetFullPath(templateLocation); } - private static string GetCodeBaseRoot() + /// + /// Creates a NuGet.config in the specified directory with sources for both + /// shipping packages and locally-built test packages. + /// + internal static void SetupNuGetConfigForPackagesLocation(string projectDirectory) { - string codebase = typeof(TestBase).Assembly.Location; - string? codeBaseRoot = new FileInfo(codebase).Directory?.Parent?.Parent?.Parent?.Parent?.Parent?.FullName; - - if (string.IsNullOrEmpty(codeBaseRoot)) - { - throw new InvalidOperationException("The codebase root was not found"); - } - if (!File.Exists(Path.Combine(codeBaseRoot!, "Microsoft.TemplateEngine.sln"))) - { - throw new InvalidOperationException("Microsoft.TemplateEngine.sln was not found in codebase root"); - } - if (!Directory.Exists(Path.Combine(codeBaseRoot!, "test", "Microsoft.TemplateEngine.TestTemplates"))) - { - throw new InvalidOperationException("Microsoft.TemplateEngine.TestTemplates was not found in test/"); - } - return codeBaseRoot!; + TestUtils.SetupNuGetConfigForPackagesLocation( + projectDirectory, + new[] { ShippingPackagesLocation, SdkTestContext.Current.TestPackages }); } } } diff --git a/test/UnitTests.proj b/test/UnitTests.proj index 0920f1672a93..da7824c8048d 100644 --- a/test/UnitTests.proj +++ b/test/UnitTests.proj @@ -19,11 +19,11 @@ - + - + @@ -96,6 +96,9 @@ + + + @@ -134,6 +137,7 @@ + diff --git a/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj b/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj index e87d35c501b9..2bb58a031841 100644 --- a/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj +++ b/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj @@ -15,8 +15,8 @@ - - + + @@ -66,7 +66,7 @@ namespace Microsoft.DotNet.Cli.New.IntegrationTests internal class TemplatePackageVersion { - public const string MicrosoftTemplateSearchTemplateDiscoveryPackageVersion = "$(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion)"%3B + public const string MicrosoftTemplateSearchTemplateDiscoveryPackageVersion = "TEMPLATE_DISCOVERY_VERSION_PLACEHOLDER"%3B } } ]]> @@ -91,12 +91,14 @@ namespace Microsoft.DotNet.Cli.New.IntegrationTests $(IntermediateOutputPath)TemplatePackagesPaths.cs + + $(GeneratedText.Replace('TEMPLATE_DISCOVERY_VERSION_PLACEHOLDER', '$(Version)')) - + diff --git a/test/dotnet.Tests/dotnet.Tests.csproj b/test/dotnet.Tests/dotnet.Tests.csproj index 658735a93ee6..876cf9bd4b57 100644 --- a/test/dotnet.Tests/dotnet.Tests.csproj +++ b/test/dotnet.Tests/dotnet.Tests.csproj @@ -89,8 +89,8 @@ - - + +