Add xUnit V3 project variants for shared tests/tools other repos consume.

Directory.Packages.props

@@ -45,10 +45,13 @@
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
     <PackageVersion Include="Verify.DiffPlex" Version="3.0.0" />
     <PackageVersion Include="Verify.XUnit" Version="25.0.2" />
+    <PackageVersion Include="Verify.XunitV3" Version="28.12.0" />
     <PackageVersion Include="XUnit" Version="$(XUnitVersion)" />
     <PackageVersion Include="xunit.abstractions" Version="2.0.3" />
     <!-- Xunit version is managed by Arcade. -->
     <PackageVersion Include="xunit.extensibility.execution" Version="$(XUnitVersion)" />
+    <PackageVersion Include="xunit.v3.assert" Version="$(XUnitV3Version)" />
+    <PackageVersion Include="xunit.v3.extensibility.core" Version="$(XUnitV3Version)" />
   </ItemGroup>
 
   <!-- Overrides needed until https://github.com/dotnet/source-build/issues/4467 is implemented. -->

Microsoft.TemplateEngine.sln

@@ -70,10 +70,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{B794BF86
 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}"
@@ -102,6 +108,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.TemplateEngine.Co
 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}"
@@ -112,6 +120,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.Au
 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
@@ -518,6 +530,78 @@ Global
 		{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
@@ -559,6 +643,8 @@ Global
 		{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}

test/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.XunitV3.csproj

@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests\Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.Shared.props" />
+
+  <PropertyGroup>
+    <DefineConstants>$(DefineConstants);XUNIT_V3</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)"
+             Exclude="..\Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests\Snapshots\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(ToolsDir)Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3\Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3.csproj" />
+    <ProjectReference Include="$(TestDir)Microsoft.TemplateEngine.TestHelper.XunitV3\Microsoft.TemplateEngine.TestHelper.XunitV3.csproj" />
+    <ProjectReference Include="$(TestDir)Microsoft.TemplateEngine.TestTemplates\Microsoft.TemplateEngine.TestTemplates.csproj" />
+    <ProjectReference Include="$(ToolsDir)Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.XunitV3.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Remove="Snapshots\**\*" />
+    <Content Include="..\Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests\Snapshots\**\*" Link="Snapshots\%(RecursiveDir)%(Filename)%(Extension)" />
+    <None Include="..\Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests\Snapshots\**\*" Link="Snapshots\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="Never" />
+  </ItemGroup>
+
+</Project>

test/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/ExampleTemplateTest.cs

@@ -5,7 +5,9 @@
 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
 {

test/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.Shared.props

@@ -0,0 +1,11 @@
+<Project>
+
+  <PropertyGroup>
+    <TargetFramework>$(NetCurrent)</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
+  </ItemGroup>
+
+</Project>

test/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj

@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>$(NetCurrent)</TargetFramework>
-  </PropertyGroup>
+  <Import Project="Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.Shared.props" />
 
   <ItemGroup>
     <ProjectReference Include="$(ToolsDir)Microsoft.TemplateEngine.Authoring.TemplateVerifier\Microsoft.TemplateEngine.Authoring.TemplateVerifier.csproj" />
@@ -17,8 +15,4 @@
     <None Include="Snapshots\**\*" CopyToOutputDirectory="Never" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="..\Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
-  </ItemGroup>
-
 </Project>

test/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/TemplateEngineSamplesTest.cs

@@ -6,7 +6,9 @@
 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
 {

test/Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests/VerificationEngineTests.cs

@@ -4,7 +4,9 @@
 using FluentAssertions;
 using Microsoft.Extensions.Logging;
 using Microsoft.TemplateEngine.TestHelper;
+#if !XUNIT_V3
 using Xunit.Abstractions;
+#endif
 
 namespace Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests
 {

test/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.XunitV3.csproj

@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests\Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.Shared.props" />
+
+  <PropertyGroup>
+    <DefineConstants>$(DefineConstants);XUNIT_V3</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)"
+             Exclude="..\Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests\Snapshots\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(ToolsDir)Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3\Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3.csproj" />
+    <ProjectReference Include="$(TestDir)Microsoft.TemplateEngine.TestHelper.XunitV3\Microsoft.TemplateEngine.TestHelper.XunitV3.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Remove="Snapshots\**\*" />
+    <Content Include="..\Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests\Snapshots\**\*" Link="Snapshots\%(RecursiveDir)%(Filename)%(Extension)" />
+    <None Include="..\Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests\Snapshots\**\*" Link="Snapshots\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="Never" />
+  </ItemGroup>
+
+</Project>

test/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.Shared.props

@@ -0,0 +1,12 @@
+<Project>
+
+  <PropertyGroup>
+    <TargetFramework>$(NetCurrent)</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="FakeItEasy" />
+  </ItemGroup>
+
+</Project>

test/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj

@@ -1,19 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>$(NetCurrent)</TargetFramework>
-  </PropertyGroup>
+  <Import Project="Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.Shared.props" />
 
   <ItemGroup>
     <ProjectReference Include="$(ToolsDir)Microsoft.TemplateEngine.Authoring.TemplateVerifier\Microsoft.TemplateEngine.Authoring.TemplateVerifier.csproj" />
     <ProjectReference Include="$(TestDir)Microsoft.TemplateEngine.TestHelper\Microsoft.TemplateEngine.TestHelper.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="AwesomeAssertions" />
-    <PackageReference Include="FakeItEasy" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Remove="Snapshots\**\*" />
     <Content Include="Snapshots\**\*" />

test/Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests/VerificationEngineTests.cs

@@ -7,7 +7,9 @@
 using Microsoft.TemplateEngine.Authoring.TemplateVerifier.Commands;
 using Microsoft.TemplateEngine.CommandUtils;
 using Microsoft.TemplateEngine.TestHelper;
+#if !XUNIT_V3
 using Xunit.Abstractions;
+#endif
 
 namespace Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests
 {

test/Microsoft.TemplateEngine.Mocks.XunitV3/Microsoft.TemplateEngine.Mocks.XunitV3.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\Microsoft.TemplateEngine.Mocks\Microsoft.TemplateEngine.Mocks.Shared.props" />
+
+  <PropertyGroup>
+    <DefineConstants>$(DefineConstants);XUNIT_V3</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\Microsoft.TemplateEngine.Mocks\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="xunit.v3.extensibility.core" />
+  </ItemGroup>
+
+</Project>

test/Microsoft.TemplateEngine.Mocks/Microsoft.TemplateEngine.Mocks.Shared.props

@@ -0,0 +1,24 @@
+<Project>
+
+  <PropertyGroup>
+    <TargetFrameworks>$(NetCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+    <IsPackable>true</IsPackable>
+    <IsTestUtilityProject>true</IsTestUtilityProject>
+  </PropertyGroup>
+
+  <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
+  <PropertyGroup Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETCoreApp'">
+    <!-- TODO: Resolve nullable errors and remove this block: https://github.com/dotnet/templating/issues/8100. -->
+    <Nullable>annotations</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SrcDir)Microsoft.TemplateEngine.Abstractions\Microsoft.TemplateEngine.Abstractions.csproj" />
+    <ProjectReference Include="$(SrcDir)Microsoft.TemplateEngine.Core.Contracts\Microsoft.TemplateEngine.Core.Contracts.csproj" />
+    <ProjectReference Include="$(SrcDir)Microsoft.TemplateEngine.Core\Microsoft.TemplateEngine.Core.csproj" />
+    <ProjectReference Include="$(SrcDir)Microsoft.TemplateEngine.Edge\Microsoft.TemplateEngine.Edge.csproj" />
+    <ProjectReference Include="$(SrcDir)Microsoft.TemplateEngine.Utils\Microsoft.TemplateEngine.Utils.csproj" />
+    <ProjectReference Include="$(SrcDir)Microsoft.TemplateSearch.Common\Microsoft.TemplateSearch.Common.csproj" />
+  </ItemGroup>
+
+</Project>