aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2022-09-03 10:44:33 -0700
committerRob Mensching <rob@firegiant.com>2022-09-23 09:50:52 -0700
commit7a86b33a38f29b315e8f08759eba42e8fe296fd7 (patch)
tree58a6ac547b25127daa4a4053ef250afb0b2e9d83
parent002dc6077477c6a7762f1fca225c2577913a2c82 (diff)
downloadwix-7a86b33a38f29b315e8f08759eba42e8fe296fd7.tar.gz
wix-7a86b33a38f29b315e8f08759eba42e8fe296fd7.tar.bz2
wix-7a86b33a38f29b315e8f08759eba42e8fe296fd7.zip
Centralize test project configuration with IsWixTestProject
-rw-r--r--src/Directory.Build.targets1
-rw-r--r--src/Directory.csproj.targets13
-rw-r--r--src/Directory.vcxproj.targets2
-rw-r--r--src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj8
-rw-r--r--src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj9
-rw-r--r--src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj9
-rw-r--r--src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/WixToolsetTest.Dnc.HostGenerator.csproj6
-rw-r--r--src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj9
-rw-r--r--src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj5
-rw-r--r--src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj9
-rw-r--r--src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj10
-rw-r--r--src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj9
-rw-r--r--src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj9
-rw-r--r--src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj9
-rw-r--r--src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj9
-rw-r--r--src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj9
-rw-r--r--src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj9
-rw-r--r--src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj10
-rw-r--r--src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj9
-rw-r--r--src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj9
-rw-r--r--src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj9
-rw-r--r--src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj9
-rw-r--r--src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj9
-rw-r--r--src/internal/SetBuildNumber/Directory.Packages.props.pp2
-rw-r--r--src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj7
-rw-r--r--src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj7
-rw-r--r--src/test/wix/WixE2E/WixE2E.csproj10
-rw-r--r--src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj10
-rw-r--r--src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.csproj10
-rw-r--r--src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj10
-rw-r--r--src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj9
-rw-r--r--src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj9
-rw-r--r--src/wix/test/WixToolsetTest.Core.Burn/WixToolsetTest.Core.Burn.csproj10
-rw-r--r--src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj9
-rw-r--r--src/wix/test/WixToolsetTest.Core/WixToolsetTest.Core.csproj10
-rw-r--r--src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj10
-rw-r--r--src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj10
37 files changed, 45 insertions, 268 deletions
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index efad8cd5..5a8ef429 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -11,7 +11,6 @@
11 11
12 <PropertyGroup Condition=" '$(IsWixTestSupportProject)'=='true' "> 12 <PropertyGroup Condition=" '$(IsWixTestSupportProject)'=='true' ">
13 <IsTestProject>false</IsTestProject> 13 <IsTestProject>false</IsTestProject>
14 <IsWixTestProject>true</IsWixTestProject>
15 </PropertyGroup> 14 </PropertyGroup>
16 15
17 <ItemGroup Condition=" '$(IsWixTestSupportProject)'=='true' "> 16 <ItemGroup Condition=" '$(IsWixTestSupportProject)'=='true' ">
diff --git a/src/Directory.csproj.targets b/src/Directory.csproj.targets
index b131565c..4ec71cf1 100644
--- a/src/Directory.csproj.targets
+++ b/src/Directory.csproj.targets
@@ -12,7 +12,18 @@
12 12
13 <Target Name="__SetAssemblyInfoFromGit" DependsOnTargets="__SetPropertiesFromGit" BeforeTargets="GetAssemblyVersion" /> 13 <Target Name="__SetAssemblyInfoFromGit" DependsOnTargets="__SetPropertiesFromGit" BeforeTargets="GetAssemblyVersion" />
14 14
15 <ItemGroup> 15 <PropertyGroup Condition=" '$(IsWixTestProject)'=='true' ">
16 <IsPackable>false</IsPackable>
17 <SignOutput>false</SignOutput>
18 </PropertyGroup>
19
20 <ItemGroup Condition=" '$(IsWixTestProject)'=='true' ">
21 <PackageReference Include="Microsoft.NET.Test.Sdk" />
22 <PackageReference Include="xunit" />
23 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
24 </ItemGroup>
25
26 <ItemGroup Condition=" '$(IsWixTestProject)'!='true' ">
16 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> 27 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
17 <PackageReference Include="GitInfo" PrivateAssets="All" /> 28 <PackageReference Include="GitInfo" PrivateAssets="All" />
18 </ItemGroup> 29 </ItemGroup>
diff --git a/src/Directory.vcxproj.targets b/src/Directory.vcxproj.targets
index 041db031..97f65b4c 100644
--- a/src/Directory.vcxproj.targets
+++ b/src/Directory.vcxproj.targets
@@ -50,7 +50,7 @@
50 </PropertyGroup> 50 </PropertyGroup>
51 51
52 <Target Name="PublicizeNativePdb" 52 <Target Name="PublicizeNativePdb"
53 Condition=" '@(Link)' != '' and '$(IsWixTestProject)' != 'true' and '$(IsWixSampleProject)' != 'true' "> 53 Condition=" '@(Link)' != '' and '$(IsWixTestSupportProject)' != 'true' and '$(IsWixTestProject)' != 'true' and '$(IsWixSampleProject)' != 'true' ">
54 <Copy SourceFiles="%(Link.ProgramDatabaseFile)" DestinationFolder="$(PdbsFolder)$(PlatformFolder)" /> 54 <Copy SourceFiles="%(Link.ProgramDatabaseFile)" DestinationFolder="$(PdbsFolder)$(PlatformFolder)" />
55 </Target> 55 </Target>
56</Project> 56</Project>
diff --git a/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj b/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
index a6899d1e..02cd24b1 100644
--- a/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
+++ b/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
@@ -4,9 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <IsPackable>false</IsPackable>
8 <RuntimeIdentifier>win-x86</RuntimeIdentifier> 7 <RuntimeIdentifier>win-x86</RuntimeIdentifier>
9 <SignOutput>false</SignOutput>
10 <RollForward>Major</RollForward> 8 <RollForward>Major</RollForward>
11 <IsWixTestProject>true</IsWixTestProject> 9 <IsWixTestProject>true</IsWixTestProject>
12 </PropertyGroup> 10 </PropertyGroup>
@@ -18,10 +16,4 @@
18 <ItemGroup> 16 <ItemGroup>
19 <PackageReference Include="WixBuildTools.TestSupport" /> 17 <PackageReference Include="WixBuildTools.TestSupport" />
20 </ItemGroup> 18 </ItemGroup>
21
22 <ItemGroup>
23 <PackageReference Include="Microsoft.NET.Test.Sdk" />
24 <PackageReference Include="xunit" />
25 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
26 </ItemGroup>
27</Project> 19</Project>
diff --git a/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj b/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj
index 4400d799..18054f67 100644
--- a/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj
+++ b/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj
@@ -4,8 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <IsPackable>false</IsPackable> 7 <IsWixTestProject>true</IsWixTestProject>
8 <SignOutput>false</SignOutput>
9 </PropertyGroup> 8 </PropertyGroup>
10 9
11 <ItemGroup> 10 <ItemGroup>
@@ -15,10 +14,4 @@
15 <ItemGroup> 14 <ItemGroup>
16 <PackageReference Include="WixBuildTools.TestSupport" /> 15 <PackageReference Include="WixBuildTools.TestSupport" />
17 </ItemGroup> 16 </ItemGroup>
18
19 <ItemGroup>
20 <PackageReference Include="Microsoft.NET.Test.Sdk" />
21 <PackageReference Include="xunit" />
22 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
23 </ItemGroup>
24</Project> 17</Project>
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj b/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj
index a59a4707..65ac84dc 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj
+++ b/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj
@@ -4,8 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <IsPackable>false</IsPackable> 7 <IsWixTestProject>true</IsWixTestProject>
8 <SignOutput>false</SignOutput>
9 </PropertyGroup> 8 </PropertyGroup>
10 9
11 <ItemGroup> 10 <ItemGroup>
@@ -23,10 +22,4 @@
23 <ItemGroup> 22 <ItemGroup>
24 <PackageReference Include="WixToolset.Core.TestPackage" /> 23 <PackageReference Include="WixToolset.Core.TestPackage" />
25 </ItemGroup> 24 </ItemGroup>
26
27 <ItemGroup>
28 <PackageReference Include="Microsoft.NET.Test.Sdk" />
29 <PackageReference Include="xunit" />
30 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
31 </ItemGroup>
32</Project> 25</Project>
diff --git a/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/WixToolsetTest.Dnc.HostGenerator.csproj b/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/WixToolsetTest.Dnc.HostGenerator.csproj
index 0c2b33fd..3da896a9 100644
--- a/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/WixToolsetTest.Dnc.HostGenerator.csproj
+++ b/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/WixToolsetTest.Dnc.HostGenerator.csproj
@@ -4,8 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <IsPackable>false</IsPackable> 7 <IsWixTestProject>true</IsWixTestProject>
8 <SignOutput>false</SignOutput>
9 </PropertyGroup> 8 </PropertyGroup>
10 9
11 <ItemGroup> 10 <ItemGroup>
@@ -20,8 +19,5 @@
20 <ItemGroup> 19 <ItemGroup>
21 <PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" /> 20 <PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" />
22 <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" /> 21 <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
23 <PackageReference Include="Microsoft.NET.Test.Sdk" />
24 <PackageReference Include="xunit" />
25 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
26 </ItemGroup> 22 </ItemGroup>
27</Project> 23</Project>
diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
index a55beac7..bcadc112 100644
--- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
+++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
@@ -4,8 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <IsPackable>false</IsPackable> 7 <IsWixTestProject>true</IsWixTestProject>
8 <SignOutput>false</SignOutput>
9 </PropertyGroup> 8 </PropertyGroup>
10 9
11 <ItemGroup> 10 <ItemGroup>
@@ -15,10 +14,4 @@
15 <ItemGroup> 14 <ItemGroup>
16 <PackageReference Include="WixToolset.Core.TestPackage" /> 15 <PackageReference Include="WixToolset.Core.TestPackage" />
17 </ItemGroup> 16 </ItemGroup>
18
19 <ItemGroup>
20 <PackageReference Include="Microsoft.NET.Test.Sdk" />
21 <PackageReference Include="xunit" />
22 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
23 </ItemGroup>
24</Project> 17</Project>
diff --git a/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
index e396e41f..2076f0b4 100644
--- a/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
+++ b/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
@@ -17,9 +17,4 @@
17 <ItemGroup> 17 <ItemGroup>
18 <PackageReference Include="WixToolset.Mba.Core" /> 18 <PackageReference Include="WixToolset.Mba.Core" />
19 </ItemGroup> 19 </ItemGroup>
20
21 <ItemGroup>
22 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
23 <PackageReference Include="GitInfo" PrivateAssets="All" />
24 </ItemGroup>
25</Project> 20</Project>
diff --git a/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj
index b440f273..d423ffeb 100644
--- a/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj
+++ b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj
@@ -4,8 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <IsPackable>false</IsPackable> 7 <IsWixTestProject>true</IsWixTestProject>
8 <SignOutput>false</SignOutput>
9 </PropertyGroup> 8 </PropertyGroup>
10 9
11 <ItemGroup> 10 <ItemGroup>
@@ -19,10 +18,4 @@
19 <ItemGroup> 18 <ItemGroup>
20 <PackageReference Include="WixToolset.Core.TestPackage" /> 19 <PackageReference Include="WixToolset.Core.TestPackage" />
21 </ItemGroup> 20 </ItemGroup>
22
23 <ItemGroup>
24 <PackageReference Include="Microsoft.NET.Test.Sdk" />
25 <PackageReference Include="xunit" />
26 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
27 </ItemGroup>
28</Project> 21</Project>
diff --git a/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj b/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj
index f1067f3f..101eee58 100644
--- a/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj
+++ b/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj
@@ -4,9 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <DebugType>embedded</DebugType> 7 <IsWixTestProject>true</IsWixTestProject>
8 <IsPackable>false</IsPackable>
9 <SignOutput>false</SignOutput>
10 </PropertyGroup> 8 </PropertyGroup>
11 9
12 <ItemGroup> 10 <ItemGroup>
@@ -20,10 +18,4 @@
20 <ItemGroup> 18 <ItemGroup>
21 <PackageReference Include="WixToolset.Core.TestPackage" /> 19 <PackageReference Include="WixToolset.Core.TestPackage" />
22 </ItemGroup> 20 </ItemGroup>
23
24 <ItemGroup>
25 <PackageReference Include="Microsoft.NET.Test.Sdk" />
26 <PackageReference Include="xunit" />
27 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
28 </ItemGroup>
29</Project> 21</Project>
diff --git a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj b/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj
index 28496a2e..bc348261 100644
--- a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj
+++ b/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj
@@ -4,8 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <IsPackable>false</IsPackable> 7 <IsWixTestProject>true</IsWixTestProject>
8 <SignOutput>false</SignOutput>
9 </PropertyGroup> 8 </PropertyGroup>
10 9
11 <ItemGroup> 10 <ItemGroup>
@@ -22,10 +21,4 @@
22 <ItemGroup> 21 <ItemGroup>
23 <PackageReference Include="WixToolset.Core.TestPackage" /> 22 <PackageReference Include="WixToolset.Core.TestPackage" />
24 </ItemGroup> 23 </ItemGroup>
25
26 <ItemGroup>
27 <PackageReference Include="Microsoft.NET.Test.Sdk" />
28 <PackageReference Include="xunit" />
29 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
30 </ItemGroup>
31</Project> 24</Project>
diff --git a/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj b/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj
index f0eab3bd..d524cb7d 100644
--- a/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj
+++ b/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj
@@ -4,8 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <IsPackable>false</IsPackable> 7 <IsWixTestProject>true</IsWixTestProject>
8 <SignOutput>false</SignOutput>
9 </PropertyGroup> 8 </PropertyGroup>
10 9
11 <ItemGroup> 10 <ItemGroup>
@@ -22,10 +21,4 @@
22 <ItemGroup> 21 <ItemGroup>
23 <PackageReference Include="WixToolset.Core.TestPackage" /> 22 <PackageReference Include="WixToolset.Core.TestPackage" />
24 </ItemGroup> 23 </ItemGroup>
25
26 <ItemGroup>
27 <PackageReference Include="Microsoft.NET.Test.Sdk" />
28 <PackageReference Include="xunit" />
29 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
30 </ItemGroup>
31</Project> 24</Project>
diff --git a/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj b/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj
index 684fa4a5..be8e7f2a 100644
--- a/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj
+++ b/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj
@@ -4,8 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <IsPackable>false</IsPackable> 7 <IsWixTestProject>true</IsWixTestProject>
8 <SignOutput>false</SignOutput>
9 </PropertyGroup> 8 </PropertyGroup>
10 9
11 <ItemGroup> 10 <ItemGroup>
@@ -19,10 +18,4 @@
19 <ItemGroup> 18 <ItemGroup>
20 <PackageReference Include="WixToolset.Core.TestPackage" /> 19 <PackageReference Include="WixToolset.Core.TestPackage" />
21 </ItemGroup> 20 </ItemGroup>
22
23 <ItemGroup>
24 <PackageReference Include="Microsoft.NET.Test.Sdk" />
25 <PackageReference Include="xunit" />
26 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
27 </ItemGroup>
28</Project> 21</Project>
diff --git a/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj b/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj
index 052b96b4..62c477ed 100644
--- a/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj
+++ b/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj
@@ -4,8 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <IsPackable>false</IsPackable> 7 <IsWixTestProject>true</IsWixTestProject>
8 <SignOutput>false</SignOutput>
9 </PropertyGroup> 8 </PropertyGroup>
10 9
11 <ItemGroup> 10 <ItemGroup>
@@ -19,10 +18,4 @@
19 <ItemGroup> 18 <ItemGroup>
20 <PackageReference Include="WixToolset.Core.TestPackage" /> 19 <PackageReference Include="WixToolset.Core.TestPackage" />
21 </ItemGroup> 20 </ItemGroup>
22
23 <ItemGroup>
24 <PackageReference Include="Microsoft.NET.Test.Sdk" />
25 <PackageReference Include="xunit" />
26 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
27 </ItemGroup>
28</Project> 21</Project>
diff --git a/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj b/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj
index 07d1a9ba..3f59e352 100644
--- a/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj
+++ b/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj
@@ -4,8 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <IsPackable>false</IsPackable> 7 <IsWixTestProject>true</IsWixTestProject>
8 <SignOutput>false</SignOutput>
9 </PropertyGroup> 8 </PropertyGroup>
10 9
11 <ItemGroup> 10 <ItemGroup>
@@ -22,10 +21,4 @@
22 <ItemGroup> 21 <ItemGroup>
23 <PackageReference Include="WixToolset.Core.TestPackage" /> 22 <PackageReference Include="WixToolset.Core.TestPackage" />
24 </ItemGroup> 23 </ItemGroup>
25
26 <ItemGroup>
27 <PackageReference Include="Microsoft.NET.Test.Sdk" />
28 <PackageReference Include="xunit" />
29 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
30 </ItemGroup>
31</Project> 24</Project>
diff --git a/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj b/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj
index 9b3d00ca..5acf0cf7 100644
--- a/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj
+++ b/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj
@@ -4,8 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <IsPackable>false</IsPackable> 7 <IsWixTestProject>true</IsWixTestProject>
8 <SignOutput>false</SignOutput>
9 </PropertyGroup> 8 </PropertyGroup>
10 9
11 <ItemGroup> 10 <ItemGroup>
@@ -22,10 +21,4 @@
22 <ItemGroup> 21 <ItemGroup>
23 <PackageReference Include="WixToolset.Core.TestPackage" /> 22 <PackageReference Include="WixToolset.Core.TestPackage" />
24 </ItemGroup> 23 </ItemGroup>
25
26 <ItemGroup>
27 <PackageReference Include="Microsoft.NET.Test.Sdk" />
28 <PackageReference Include="xunit" />
29 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
30 </ItemGroup>
31</Project> 24</Project>
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
index 24f807eb..71cf532f 100644
--- a/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
+++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
@@ -4,9 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <DebugType>embedded</DebugType> 7 <IsWixTestProject>true</IsWixTestProject>
8 <IsPackable>false</IsPackable>
9 <SignOutput>false</SignOutput>
10 </PropertyGroup> 8 </PropertyGroup>
11 9
12 <ItemGroup> 10 <ItemGroup>
@@ -22,12 +20,6 @@
22 <PackageReference Include="WixToolset.Core.TestPackage" /> 20 <PackageReference Include="WixToolset.Core.TestPackage" />
23 </ItemGroup> 21 </ItemGroup>
24 22
25 <ItemGroup>
26 <PackageReference Include="Microsoft.NET.Test.Sdk" />
27 <PackageReference Include="xunit" />
28 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
29 </ItemGroup>
30
31 <Target Name="CopyExtensions" AfterTargets="Build"> 23 <Target Name="CopyExtensions" AfterTargets="Build">
32 <Copy DestinationFolder="$(OutputPath)" SourceFiles="@(WixExtension)" /> 24 <Copy DestinationFolder="$(OutputPath)" SourceFiles="@(WixExtension)" />
33 </Target> 25 </Target>
diff --git a/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj
index bd834200..595629ed 100644
--- a/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj
+++ b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj
@@ -4,8 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <IsPackable>false</IsPackable> 7 <IsWixTestProject>true</IsWixTestProject>
8 <SignOutput>false</SignOutput>
9 </PropertyGroup> 8 </PropertyGroup>
10 9
11 <ItemGroup> 10 <ItemGroup>
@@ -19,10 +18,4 @@
19 <ItemGroup> 18 <ItemGroup>
20 <PackageReference Include="WixToolset.Core.TestPackage" /> 19 <PackageReference Include="WixToolset.Core.TestPackage" />
21 </ItemGroup> 20 </ItemGroup>
22
23 <ItemGroup>
24 <PackageReference Include="Microsoft.NET.Test.Sdk" />
25 <PackageReference Include="xunit" />
26 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
27 </ItemGroup>
28</Project> 21</Project>
diff --git a/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj b/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj
index df560060..39949409 100644
--- a/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj
+++ b/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj
@@ -4,8 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <IsPackable>false</IsPackable> 7 <IsWixTestProject>true</IsWixTestProject>
8 <SignOutput>false</SignOutput>
9 </PropertyGroup> 8 </PropertyGroup>
10 9
11 <ItemGroup> 10 <ItemGroup>
@@ -19,10 +18,4 @@
19 <ItemGroup> 18 <ItemGroup>
20 <PackageReference Include="WixToolset.Core.TestPackage" /> 19 <PackageReference Include="WixToolset.Core.TestPackage" />
21 </ItemGroup> 20 </ItemGroup>
22
23 <ItemGroup>
24 <PackageReference Include="Microsoft.NET.Test.Sdk" />
25 <PackageReference Include="xunit" />
26 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
27 </ItemGroup>
28</Project> 21</Project>
diff --git a/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj b/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj
index 211c02a6..5f2da23f 100644
--- a/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj
+++ b/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj
@@ -4,8 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <IsPackable>false</IsPackable> 7 <IsWixTestProject>true</IsWixTestProject>
8 <SignOutput>false</SignOutput>
9 </PropertyGroup> 8 </PropertyGroup>
10 9
11 <ItemGroup> 10 <ItemGroup>
@@ -19,10 +18,4 @@
19 <ItemGroup> 18 <ItemGroup>
20 <PackageReference Include="WixToolset.Core.TestPackage" /> 19 <PackageReference Include="WixToolset.Core.TestPackage" />
21 </ItemGroup> 20 </ItemGroup>
22
23 <ItemGroup>
24 <PackageReference Include="Microsoft.NET.Test.Sdk" />
25 <PackageReference Include="xunit" />
26 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
27 </ItemGroup>
28</Project> 21</Project>
diff --git a/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj
index fdb21557..e607f9cf 100644
--- a/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj
+++ b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj
@@ -4,8 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <IsPackable>false</IsPackable> 7 <IsWixTestProject>true</IsWixTestProject>
8 <SignOutput>false</SignOutput>
9 </PropertyGroup> 8 </PropertyGroup>
10 9
11 <ItemGroup> 10 <ItemGroup>
@@ -19,10 +18,4 @@
19 <ItemGroup> 18 <ItemGroup>
20 <PackageReference Include="WixToolset.Core.TestPackage" /> 19 <PackageReference Include="WixToolset.Core.TestPackage" />
21 </ItemGroup> 20 </ItemGroup>
22
23 <ItemGroup>
24 <PackageReference Include="Microsoft.NET.Test.Sdk" />
25 <PackageReference Include="xunit" />
26 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
27 </ItemGroup>
28</Project> 21</Project>
diff --git a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj
index f480d365..d39e1528 100644
--- a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj
+++ b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj
@@ -4,8 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <IsPackable>false</IsPackable> 7 <IsWixTestProject>true</IsWixTestProject>
8 <SignOutput>false</SignOutput>
9 </PropertyGroup> 8 </PropertyGroup>
10 9
11 <ItemGroup> 10 <ItemGroup>
@@ -19,10 +18,4 @@
19 <ItemGroup> 18 <ItemGroup>
20 <PackageReference Include="WixToolset.Core.TestPackage" /> 19 <PackageReference Include="WixToolset.Core.TestPackage" />
21 </ItemGroup> 20 </ItemGroup>
22
23 <ItemGroup>
24 <PackageReference Include="Microsoft.NET.Test.Sdk" />
25 <PackageReference Include="xunit" />
26 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
27 </ItemGroup>
28</Project> 21</Project>
diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp
index 6fc9594c..f77fcffa 100644
--- a/src/internal/SetBuildNumber/Directory.Packages.props.pp
+++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp
@@ -73,7 +73,7 @@
73 73
74 <ItemGroup> 74 <ItemGroup>
75 <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" /> 75 <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
76 <PackageVersion Include="GitInfo" Version="2.1.2" /> 76 <PackageVersion Include="GitInfo" Version="2.2.0" />
77 </ItemGroup> 77 </ItemGroup>
78 78
79 <ItemGroup> 79 <ItemGroup>
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj b/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
index 88b8dcb0..1bedb34b 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
+++ b/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
@@ -6,6 +6,7 @@
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <PlatformTarget>x64</PlatformTarget> 7 <PlatformTarget>x64</PlatformTarget>
8 <RollForward>Major</RollForward> 8 <RollForward>Major</RollForward>
9 <IsWixTestProject>true</IsWixTestProject>
9 </PropertyGroup> 10 </PropertyGroup>
10 11
11 <ItemGroup> 12 <ItemGroup>
@@ -24,10 +25,4 @@
24 <PackageReference Include="WixToolset.Data" /> 25 <PackageReference Include="WixToolset.Data" />
25 <PackageReference Include="WixToolset.Mba.Core" /> 26 <PackageReference Include="WixToolset.Mba.Core" />
26 </ItemGroup> 27 </ItemGroup>
27
28 <ItemGroup>
29 <PackageReference Include="Microsoft.NET.Test.Sdk" />
30 <PackageReference Include="xunit" />
31 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
32 </ItemGroup>
33</Project> 28</Project>
diff --git a/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj b/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj
index ccf98042..348d97ad 100644
--- a/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj
+++ b/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj
@@ -6,6 +6,7 @@
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <PlatformTarget>x64</PlatformTarget> 7 <PlatformTarget>x64</PlatformTarget>
8 <RollForward>Major</RollForward> 8 <RollForward>Major</RollForward>
9 <IsWixTestProject>true</IsWixTestProject>
9 </PropertyGroup> 10 </PropertyGroup>
10 11
11 <ItemGroup> 12 <ItemGroup>
@@ -22,10 +23,4 @@
22 <PackageReference Include="WixBuildTools.TestSupport" /> 23 <PackageReference Include="WixBuildTools.TestSupport" />
23 <PackageReference Include="WixToolset.Data" /> 24 <PackageReference Include="WixToolset.Data" />
24 </ItemGroup> 25 </ItemGroup>
25
26 <ItemGroup>
27 <PackageReference Include="Microsoft.NET.Test.Sdk" />
28 <PackageReference Include="xunit" />
29 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
30 </ItemGroup>
31</Project> 26</Project>
diff --git a/src/test/wix/WixE2E/WixE2E.csproj b/src/test/wix/WixE2E/WixE2E.csproj
index 031979b6..d85cc152 100644
--- a/src/test/wix/WixE2E/WixE2E.csproj
+++ b/src/test/wix/WixE2E/WixE2E.csproj
@@ -4,9 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>net472</TargetFramework> 6 <TargetFramework>net472</TargetFramework>
7 <IsPackable>false</IsPackable> 7 <IsWixTestProject>true</IsWixTestProject>
8 <DebugType>embedded</DebugType>
9 <SignOutput>false</SignOutput>
10 </PropertyGroup> 8 </PropertyGroup>
11 9
12 <ItemGroup> 10 <ItemGroup>
@@ -16,10 +14,4 @@
16 <ItemGroup> 14 <ItemGroup>
17 <PackageReference Include="WixBuildTools.TestSupport" /> 15 <PackageReference Include="WixBuildTools.TestSupport" />
18 </ItemGroup> 16 </ItemGroup>
19
20 <ItemGroup>
21 <PackageReference Include="Microsoft.NET.Test.Sdk" />
22 <PackageReference Include="xunit" />
23 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
24 </ItemGroup>
25</Project> 17</Project>
diff --git a/src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj b/src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj
index c887297b..cb4deae1 100644
--- a/src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj
+++ b/src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj
@@ -4,10 +4,8 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>net472</TargetFramework> 6 <TargetFramework>net472</TargetFramework>
7 <IsPackable>false</IsPackable>
8 <DebugType>embedded</DebugType>
9 <DefaultItemExcludes>TestData\**;$(DefaultItemExcludes)</DefaultItemExcludes> 7 <DefaultItemExcludes>TestData\**;$(DefaultItemExcludes)</DefaultItemExcludes>
10 <SignOutput>false</SignOutput> 8 <IsWixTestProject>true</IsWixTestProject>
11 </PropertyGroup> 9 </PropertyGroup>
12 10
13 <ItemGroup> 11 <ItemGroup>
@@ -21,10 +19,4 @@
21 <ItemGroup> 19 <ItemGroup>
22 <PackageReference Include="WixToolset.Core.TestPackage" /> 20 <PackageReference Include="WixToolset.Core.TestPackage" />
23 </ItemGroup> 21 </ItemGroup>
24
25 <ItemGroup>
26 <PackageReference Include="Microsoft.NET.Test.Sdk" />
27 <PackageReference Include="xunit" />
28 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
29 </ItemGroup>
30</Project> 22</Project>
diff --git a/src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.csproj b/src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.csproj
index c0c7c903..03b7cb88 100644
--- a/src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.csproj
+++ b/src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.csproj
@@ -4,10 +4,8 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>net472</TargetFramework> 6 <TargetFramework>net472</TargetFramework>
7 <IsPackable>false</IsPackable>
8 <DebugType>embedded</DebugType>
9 <DefaultItemExcludes>TestData\**;$(DefaultItemExcludes)</DefaultItemExcludes> 7 <DefaultItemExcludes>TestData\**;$(DefaultItemExcludes)</DefaultItemExcludes>
10 <SignOutput>false</SignOutput> 8 <IsWixTestProject>true</IsWixTestProject>
11 </PropertyGroup> 9 </PropertyGroup>
12 10
13 <ItemGroup> 11 <ItemGroup>
@@ -19,10 +17,4 @@
19 <PackageReference Include="WixBuildTools.TestSupport" /> 17 <PackageReference Include="WixBuildTools.TestSupport" />
20 <PackageReference Include="WixToolset.Core.TestPackage" /> 18 <PackageReference Include="WixToolset.Core.TestPackage" />
21 </ItemGroup> 19 </ItemGroup>
22
23 <ItemGroup>
24 <PackageReference Include="Microsoft.NET.Test.Sdk" />
25 <PackageReference Include="xunit" />
26 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
27 </ItemGroup>
28</Project> 20</Project>
diff --git a/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj b/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
index fe8a78e9..f8bb4438 100644
--- a/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+++ b/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
@@ -4,11 +4,9 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>net472</TargetFramework> 6 <TargetFramework>net472</TargetFramework>
7 <IsPackable>false</IsPackable>
8 <DebugType>embedded</DebugType>
9 <RuntimeIdentifier>win-x64</RuntimeIdentifier> 7 <RuntimeIdentifier>win-x64</RuntimeIdentifier>
10 <SignOutput>false</SignOutput>
11 <RequiresNativeWixAssets>true</RequiresNativeWixAssets> 8 <RequiresNativeWixAssets>true</RequiresNativeWixAssets>
9 <IsWixTestProject>true</IsWixTestProject>
12 </PropertyGroup> 10 </PropertyGroup>
13 11
14 <ItemGroup> 12 <ItemGroup>
@@ -27,10 +25,4 @@
27 <PackageReference Include="Microsoft.Build.Tasks.Core" /> 25 <PackageReference Include="Microsoft.Build.Tasks.Core" />
28 <PackageReference Include="WixBuildTools.TestSupport" /> 26 <PackageReference Include="WixBuildTools.TestSupport" />
29 </ItemGroup> 27 </ItemGroup>
30
31 <ItemGroup>
32 <PackageReference Include="Microsoft.NET.Test.Sdk" />
33 <PackageReference Include="xunit" />
34 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
35 </ItemGroup>
36</Project> 28</Project>
diff --git a/src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj b/src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj
index 8be39179..5e246624 100644
--- a/src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj
+++ b/src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj
@@ -4,8 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>net472</TargetFramework> 6 <TargetFramework>net472</TargetFramework>
7 <IsPackable>false</IsPackable> 7 <IsWixTestProject>true</IsWixTestProject>
8 <SignOutput>false</SignOutput>
9 </PropertyGroup> 8 </PropertyGroup>
10 9
11 <ItemGroup> 10 <ItemGroup>
@@ -24,10 +23,4 @@
24 <ItemGroup> 23 <ItemGroup>
25 <Reference Include="wix" HintPath="..\..\deps\wix.dll" /> 24 <Reference Include="wix" HintPath="..\..\deps\wix.dll" />
26 </ItemGroup> 25 </ItemGroup>
27
28 <ItemGroup>
29 <PackageReference Include="Microsoft.NET.Test.Sdk" />
30 <PackageReference Include="xunit" />
31 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
32 </ItemGroup>
33</Project> 26</Project>
diff --git a/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj b/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj
index 2d7da5ad..cf374060 100644
--- a/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj
+++ b/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj
@@ -4,8 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <IsPackable>false</IsPackable> 7 <IsWixTestProject>true</IsWixTestProject>
8 <SignOutput>false</SignOutput>
9 </PropertyGroup> 8 </PropertyGroup>
10 9
11 <ItemGroup> 10 <ItemGroup>
@@ -26,10 +25,4 @@
26 <ItemGroup> 25 <ItemGroup>
27 <PackageReference Include="WixBuildTools.TestSupport" /> 26 <PackageReference Include="WixBuildTools.TestSupport" />
28 </ItemGroup> 27 </ItemGroup>
29
30 <ItemGroup>
31 <PackageReference Include="Microsoft.NET.Test.Sdk" />
32 <PackageReference Include="xunit" />
33 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
34 </ItemGroup>
35</Project> 28</Project>
diff --git a/src/wix/test/WixToolsetTest.Core.Burn/WixToolsetTest.Core.Burn.csproj b/src/wix/test/WixToolsetTest.Core.Burn/WixToolsetTest.Core.Burn.csproj
index fd1e9ccb..36dfa4b3 100644
--- a/src/wix/test/WixToolsetTest.Core.Burn/WixToolsetTest.Core.Burn.csproj
+++ b/src/wix/test/WixToolsetTest.Core.Burn/WixToolsetTest.Core.Burn.csproj
@@ -4,9 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <IsPackable>false</IsPackable> 7 <IsWixTestProject>true</IsWixTestProject>
8 <DebugType>embedded</DebugType>
9 <SignOutput>false</SignOutput>
10 </PropertyGroup> 8 </PropertyGroup>
11 9
12 <ItemGroup> 10 <ItemGroup>
@@ -16,10 +14,4 @@
16 <ItemGroup> 14 <ItemGroup>
17 <PackageReference Include="WixBuildTools.TestSupport" /> 15 <PackageReference Include="WixBuildTools.TestSupport" />
18 </ItemGroup> 16 </ItemGroup>
19
20 <ItemGroup>
21 <PackageReference Include="Microsoft.NET.Test.Sdk" />
22 <PackageReference Include="xunit" />
23 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
24 </ItemGroup>
25</Project> 17</Project>
diff --git a/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj b/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj
index e3ad52df..f702efe1 100644
--- a/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj
+++ b/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj
@@ -4,10 +4,9 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <IsPackable>false</IsPackable>
8 <RuntimeIdentifier>win-x64</RuntimeIdentifier> 7 <RuntimeIdentifier>win-x64</RuntimeIdentifier>
9 <SignOutput>false</SignOutput>
10 <RequiresNativeWixAssets>true</RequiresNativeWixAssets> 8 <RequiresNativeWixAssets>true</RequiresNativeWixAssets>
9 <IsWixTestProject>true</IsWixTestProject>
11 </PropertyGroup> 10 </PropertyGroup>
12 11
13 <ItemGroup> 12 <ItemGroup>
@@ -21,10 +20,4 @@
21 <ItemGroup> 20 <ItemGroup>
22 <PackageReference Include="WixBuildTools.TestSupport" /> 21 <PackageReference Include="WixBuildTools.TestSupport" />
23 </ItemGroup> 22 </ItemGroup>
24
25 <ItemGroup>
26 <PackageReference Include="Microsoft.NET.Test.Sdk" />
27 <PackageReference Include="xunit" />
28 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
29 </ItemGroup>
30</Project> 23</Project>
diff --git a/src/wix/test/WixToolsetTest.Core/WixToolsetTest.Core.csproj b/src/wix/test/WixToolsetTest.Core/WixToolsetTest.Core.csproj
index 3b0259cb..65af0da5 100644
--- a/src/wix/test/WixToolsetTest.Core/WixToolsetTest.Core.csproj
+++ b/src/wix/test/WixToolsetTest.Core/WixToolsetTest.Core.csproj
@@ -4,9 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <IsPackable>false</IsPackable> 7 <IsWixTestProject>true</IsWixTestProject>
8 <DebugType>embedded</DebugType>
9 <SignOutput>false</SignOutput>
10 </PropertyGroup> 8 </PropertyGroup>
11 9
12 <ItemGroup> 10 <ItemGroup>
@@ -16,10 +14,4 @@
16 <ItemGroup> 14 <ItemGroup>
17 <PackageReference Include="WixBuildTools.TestSupport" /> 15 <PackageReference Include="WixBuildTools.TestSupport" />
18 </ItemGroup> 16 </ItemGroup>
19
20 <ItemGroup>
21 <PackageReference Include="Microsoft.NET.Test.Sdk" />
22 <PackageReference Include="xunit" />
23 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
24 </ItemGroup>
25</Project> 17</Project>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj b/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
index 996858d1..16e6f73a 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
@@ -4,10 +4,8 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <IsPackable>false</IsPackable>
8 <DebugType>embedded</DebugType>
9 <SignOutput>false</SignOutput>
10 <RequiresNativeWixAssets>true</RequiresNativeWixAssets> 7 <RequiresNativeWixAssets>true</RequiresNativeWixAssets>
8 <IsWixTestProject>true</IsWixTestProject>
11 </PropertyGroup> 9 </PropertyGroup>
12 10
13 <ItemGroup> 11 <ItemGroup>
@@ -25,10 +23,4 @@
25 <ItemGroup> 23 <ItemGroup>
26 <PackageReference Include="WixBuildTools.TestSupport" /> 24 <PackageReference Include="WixBuildTools.TestSupport" />
27 </ItemGroup> 25 </ItemGroup>
28
29 <ItemGroup>
30 <PackageReference Include="Microsoft.NET.Test.Sdk" />
31 <PackageReference Include="xunit" />
32 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
33 </ItemGroup>
34</Project> 26</Project>
diff --git a/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj b/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj
index 5a6f6ad1..3ec0eeaf 100644
--- a/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj
+++ b/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj
@@ -4,11 +4,9 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>net472</TargetFramework> 6 <TargetFramework>net472</TargetFramework>
7 <IsPackable>false</IsPackable>
8 <DebugType>embedded</DebugType>
9 <DefaultItemExcludes>TestData\**;$(DefaultItemExcludes)</DefaultItemExcludes> 7 <DefaultItemExcludes>TestData\**;$(DefaultItemExcludes)</DefaultItemExcludes>
10 <SignOutput>false</SignOutput>
11 <RequiresNativeWixAssets>true</RequiresNativeWixAssets> 8 <RequiresNativeWixAssets>true</RequiresNativeWixAssets>
9 <IsWixTestProject>true</IsWixTestProject>
12 </PropertyGroup> 10 </PropertyGroup>
13 11
14 <ItemGroup> 12 <ItemGroup>
@@ -22,10 +20,4 @@
22 <ItemGroup> 20 <ItemGroup>
23 <PackageReference Include="WixBuildTools.TestSupport" /> 21 <PackageReference Include="WixBuildTools.TestSupport" />
24 </ItemGroup> 22 </ItemGroup>
25
26 <ItemGroup>
27 <PackageReference Include="Microsoft.NET.Test.Sdk" />
28 <PackageReference Include="xunit" />
29 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
30 </ItemGroup>
31</Project> 23</Project>