@joebigelow / wix-1 / commits / 7a86b33a

Centralize test project configuration with IsWixTestProject

Rob Mensching committed Sep 3, 2022 at 10:44 UTC 7a86b33a38f29b315e8f08759eba42e8fe296fd7
37 files changed +45 -268
src/Directory.Build.targets
-1
@@ -11,7 +11,6 @@
11
12 <PropertyGroup Condition=" '$(IsWixTestSupportProject)'=='true' ">
13 <IsTestProject>false</IsTestProject>
14 - <IsWixTestProject>true</IsWixTestProject>
14 </PropertyGroup>
15
16 <ItemGroup Condition=" '$(IsWixTestSupportProject)'=='true' ">
src/Directory.csproj.targets
+12 -1
@@ -12,7 +12,18 @@
12
13 <Target Name="__SetAssemblyInfoFromGit" DependsOnTargets="__SetPropertiesFromGit" BeforeTargets="GetAssemblyVersion" />
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' ">
27 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
28 <PackageReference Include="GitInfo" PrivateAssets="All" />
29 </ItemGroup>
src/Directory.vcxproj.targets
+1 -1
@@ -50,7 +50,7 @@
50 </PropertyGroup>
51
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)" />
55 </Target>
56 </Project>
src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
-8
@@ -4,9 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 - <IsPackable>false</IsPackable>
7 <RuntimeIdentifier>win-x86</RuntimeIdentifier>
9 - <SignOutput>false</SignOutput>
8 <RollForward>Major</RollForward>
9 <IsWixTestProject>true</IsWixTestProject>
10 </PropertyGroup>
@@ -18,10 +16,4 @@
16 <ItemGroup>
17 <PackageReference Include="WixBuildTools.TestSupport" />
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>
19 </Project>
src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj
+1 -8
@@ -4,8 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 - <IsPackable>false</IsPackable>
8 - <SignOutput>false</SignOutput>
7 + <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
10 <ItemGroup>
@@ -15,10 +14,4 @@
14 <ItemGroup>
15 <PackageReference Include="WixBuildTools.TestSupport" />
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>
17 </Project>
src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj
+1 -8
@@ -4,8 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 - <IsPackable>false</IsPackable>
8 - <SignOutput>false</SignOutput>
7 + <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
10 <ItemGroup>
@@ -23,10 +22,4 @@
22 <ItemGroup>
23 <PackageReference Include="WixToolset.Core.TestPackage" />
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>
25 </Project>
src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/WixToolsetTest.Dnc.HostGenerator.csproj
+1 -5
@@ -4,8 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 - <IsPackable>false</IsPackable>
8 - <SignOutput>false</SignOutput>
7 + <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
10 <ItemGroup>
@@ -20,8 +19,5 @@
19 <ItemGroup>
20 <PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" />
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" />
22 </ItemGroup>
23 </Project>
src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
+1 -8
@@ -4,8 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 - <IsPackable>false</IsPackable>
8 - <SignOutput>false</SignOutput>
7 + <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
10 <ItemGroup>
@@ -15,10 +14,4 @@
14 <ItemGroup>
15 <PackageReference Include="WixToolset.Core.TestPackage" />
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>
17 </Project>
src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
-5
@@ -17,9 +17,4 @@
17 <ItemGroup>
18 <PackageReference Include="WixToolset.Mba.Core" />
19 </ItemGroup>
20 -
21 - <ItemGroup>
22 - <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
23 - <PackageReference Include="GitInfo" PrivateAssets="All" />
24 - </ItemGroup>
20 </Project>
src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj
+1 -8
@@ -4,8 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 - <IsPackable>false</IsPackable>
8 - <SignOutput>false</SignOutput>
7 + <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
10 <ItemGroup>
@@ -19,10 +18,4 @@
18 <ItemGroup>
19 <PackageReference Include="WixToolset.Core.TestPackage" />
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>
21 </Project>
src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj
+1 -9
@@ -4,9 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 - <DebugType>embedded</DebugType>
8 - <IsPackable>false</IsPackable>
9 - <SignOutput>false</SignOutput>
7 + <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
10 <ItemGroup>
@@ -20,10 +18,4 @@
18 <ItemGroup>
19 <PackageReference Include="WixToolset.Core.TestPackage" />
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>
21 </Project>
src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj
+1 -8
@@ -4,8 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 - <IsPackable>false</IsPackable>
8 - <SignOutput>false</SignOutput>
7 + <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
10 <ItemGroup>
@@ -22,10 +21,4 @@
21 <ItemGroup>
22 <PackageReference Include="WixToolset.Core.TestPackage" />
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>
24 </Project>
src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj
+1 -8
@@ -4,8 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 - <IsPackable>false</IsPackable>
8 - <SignOutput>false</SignOutput>
7 + <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
10 <ItemGroup>
@@ -22,10 +21,4 @@
21 <ItemGroup>
22 <PackageReference Include="WixToolset.Core.TestPackage" />
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>
24 </Project>
src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj
+1 -8
@@ -4,8 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 - <IsPackable>false</IsPackable>
8 - <SignOutput>false</SignOutput>
7 + <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
10 <ItemGroup>
@@ -19,10 +18,4 @@
18 <ItemGroup>
19 <PackageReference Include="WixToolset.Core.TestPackage" />
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>
21 </Project>
src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj
+1 -8
@@ -4,8 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 - <IsPackable>false</IsPackable>
8 - <SignOutput>false</SignOutput>
7 + <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
10 <ItemGroup>
@@ -19,10 +18,4 @@
18 <ItemGroup>
19 <PackageReference Include="WixToolset.Core.TestPackage" />
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>
21 </Project>
src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj
+1 -8
@@ -4,8 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 - <IsPackable>false</IsPackable>
8 - <SignOutput>false</SignOutput>
7 + <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
10 <ItemGroup>
@@ -22,10 +21,4 @@
21 <ItemGroup>
22 <PackageReference Include="WixToolset.Core.TestPackage" />
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>
24 </Project>
src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj
+1 -8
@@ -4,8 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 - <IsPackable>false</IsPackable>
8 - <SignOutput>false</SignOutput>
7 + <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
10 <ItemGroup>
@@ -22,10 +21,4 @@
21 <ItemGroup>
22 <PackageReference Include="WixToolset.Core.TestPackage" />
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>
24 </Project>
src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
+1 -9
@@ -4,9 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 - <DebugType>embedded</DebugType>
8 - <IsPackable>false</IsPackable>
9 - <SignOutput>false</SignOutput>
7 + <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
10 <ItemGroup>
@@ -22,12 +20,6 @@
20 <PackageReference Include="WixToolset.Core.TestPackage" />
21 </ItemGroup>
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 -
23 <Target Name="CopyExtensions" AfterTargets="Build">
24 <Copy DestinationFolder="$(OutputPath)" SourceFiles="@(WixExtension)" />
25 </Target>
src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj
+1 -8
@@ -4,8 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 - <IsPackable>false</IsPackable>
8 - <SignOutput>false</SignOutput>
7 + <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
10 <ItemGroup>
@@ -19,10 +18,4 @@
18 <ItemGroup>
19 <PackageReference Include="WixToolset.Core.TestPackage" />
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>
21 </Project>
src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj
+1 -8
@@ -4,8 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 - <IsPackable>false</IsPackable>
8 - <SignOutput>false</SignOutput>
7 + <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
10 <ItemGroup>
@@ -19,10 +18,4 @@
18 <ItemGroup>
19 <PackageReference Include="WixToolset.Core.TestPackage" />
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>
21 </Project>
src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj
+1 -8
@@ -4,8 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 - <IsPackable>false</IsPackable>
8 - <SignOutput>false</SignOutput>
7 + <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
10 <ItemGroup>
@@ -19,10 +18,4 @@
18 <ItemGroup>
19 <PackageReference Include="WixToolset.Core.TestPackage" />
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>
21 </Project>
src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj
+1 -8
@@ -4,8 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 - <IsPackable>false</IsPackable>
8 - <SignOutput>false</SignOutput>
7 + <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
10 <ItemGroup>
@@ -19,10 +18,4 @@
18 <ItemGroup>
19 <PackageReference Include="WixToolset.Core.TestPackage" />
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>
21 </Project>
src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj
+1 -8
@@ -4,8 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 - <IsPackable>false</IsPackable>
8 - <SignOutput>false</SignOutput>
7 + <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
10 <ItemGroup>
@@ -19,10 +18,4 @@
18 <ItemGroup>
19 <PackageReference Include="WixToolset.Core.TestPackage" />
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>
21 </Project>
src/internal/SetBuildNumber/Directory.Packages.props.pp
+1 -1
@@ -73,7 +73,7 @@
73
74 <ItemGroup>
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>
78
79 <ItemGroup>
src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
+1 -6
@@ -6,6 +6,7 @@
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <PlatformTarget>x64</PlatformTarget>
8 <RollForward>Major</RollForward>
9 + <IsWixTestProject>true</IsWixTestProject>
10 </PropertyGroup>
11
12 <ItemGroup>
@@ -24,10 +25,4 @@
25 <PackageReference Include="WixToolset.Data" />
26 <PackageReference Include="WixToolset.Mba.Core" />
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>
28 </Project>
src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj
+1 -6
@@ -6,6 +6,7 @@
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <PlatformTarget>x64</PlatformTarget>
8 <RollForward>Major</RollForward>
9 + <IsWixTestProject>true</IsWixTestProject>
10 </PropertyGroup>
11
12 <ItemGroup>
@@ -22,10 +23,4 @@
23 <PackageReference Include="WixBuildTools.TestSupport" />
24 <PackageReference Include="WixToolset.Data" />
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>
26 </Project>
src/test/wix/WixE2E/WixE2E.csproj
+1 -9
@@ -4,9 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>net472</TargetFramework>
7 - <IsPackable>false</IsPackable>
8 - <DebugType>embedded</DebugType>
9 - <SignOutput>false</SignOutput>
7 + <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
10 <ItemGroup>
@@ -16,10 +14,4 @@
14 <ItemGroup>
15 <PackageReference Include="WixBuildTools.TestSupport" />
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>
17 </Project>
src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj
+1 -9
@@ -4,10 +4,8 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>net472</TargetFramework>
7 - <IsPackable>false</IsPackable>
8 - <DebugType>embedded</DebugType>
7 <DefaultItemExcludes>TestData\**;$(DefaultItemExcludes)</DefaultItemExcludes>
10 - <SignOutput>false</SignOutput>
8 + <IsWixTestProject>true</IsWixTestProject>
9 </PropertyGroup>
10
11 <ItemGroup>
@@ -21,10 +19,4 @@
19 <ItemGroup>
20 <PackageReference Include="WixToolset.Core.TestPackage" />
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>
22 </Project>
src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.csproj
+1 -9
@@ -4,10 +4,8 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>net472</TargetFramework>
7 - <IsPackable>false</IsPackable>
8 - <DebugType>embedded</DebugType>
7 <DefaultItemExcludes>TestData\**;$(DefaultItemExcludes)</DefaultItemExcludes>
10 - <SignOutput>false</SignOutput>
8 + <IsWixTestProject>true</IsWixTestProject>
9 </PropertyGroup>
10
11 <ItemGroup>
@@ -19,10 +17,4 @@
17 <PackageReference Include="WixBuildTools.TestSupport" />
18 <PackageReference Include="WixToolset.Core.TestPackage" />
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>
20 </Project>
src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+1 -9
@@ -4,11 +4,9 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>net472</TargetFramework>
7 - <IsPackable>false</IsPackable>
8 - <DebugType>embedded</DebugType>
7 <RuntimeIdentifier>win-x64</RuntimeIdentifier>
10 - <SignOutput>false</SignOutput>
8 <RequiresNativeWixAssets>true</RequiresNativeWixAssets>
9 + <IsWixTestProject>true</IsWixTestProject>
10 </PropertyGroup>
11
12 <ItemGroup>
@@ -27,10 +25,4 @@
25 <PackageReference Include="Microsoft.Build.Tasks.Core" />
26 <PackageReference Include="WixBuildTools.TestSupport" />
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>
28 </Project>
src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj
+1 -8
@@ -4,8 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>net472</TargetFramework>
7 - <IsPackable>false</IsPackable>
8 - <SignOutput>false</SignOutput>
7 + <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
10 <ItemGroup>
@@ -24,10 +23,4 @@
23 <ItemGroup>
24 <Reference Include="wix" HintPath="..\..\deps\wix.dll" />
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>
26 </Project>
src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj
+1 -8
@@ -4,8 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 - <IsPackable>false</IsPackable>
8 - <SignOutput>false</SignOutput>
7 + <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
10 <ItemGroup>
@@ -26,10 +25,4 @@
25 <ItemGroup>
26 <PackageReference Include="WixBuildTools.TestSupport" />
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>
28 </Project>
src/wix/test/WixToolsetTest.Core.Burn/WixToolsetTest.Core.Burn.csproj
+1 -9
@@ -4,9 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 - <IsPackable>false</IsPackable>
8 - <DebugType>embedded</DebugType>
9 - <SignOutput>false</SignOutput>
7 + <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
10 <ItemGroup>
@@ -16,10 +14,4 @@
14 <ItemGroup>
15 <PackageReference Include="WixBuildTools.TestSupport" />
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>
17 </Project>
src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj
+1 -8
@@ -4,10 +4,9 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 - <IsPackable>false</IsPackable>
7 <RuntimeIdentifier>win-x64</RuntimeIdentifier>
9 - <SignOutput>false</SignOutput>
8 <RequiresNativeWixAssets>true</RequiresNativeWixAssets>
9 + <IsWixTestProject>true</IsWixTestProject>
10 </PropertyGroup>
11
12 <ItemGroup>
@@ -21,10 +20,4 @@
20 <ItemGroup>
21 <PackageReference Include="WixBuildTools.TestSupport" />
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>
23 </Project>
src/wix/test/WixToolsetTest.Core/WixToolsetTest.Core.csproj
+1 -9
@@ -4,9 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 - <IsPackable>false</IsPackable>
8 - <DebugType>embedded</DebugType>
9 - <SignOutput>false</SignOutput>
7 + <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
10 <ItemGroup>
@@ -16,10 +14,4 @@
14 <ItemGroup>
15 <PackageReference Include="WixBuildTools.TestSupport" />
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>
17 </Project>
src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
+1 -9
@@ -4,10 +4,8 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 - <IsPackable>false</IsPackable>
8 - <DebugType>embedded</DebugType>
9 - <SignOutput>false</SignOutput>
7 <RequiresNativeWixAssets>true</RequiresNativeWixAssets>
8 + <IsWixTestProject>true</IsWixTestProject>
9 </PropertyGroup>
10
11 <ItemGroup>
@@ -25,10 +23,4 @@
23 <ItemGroup>
24 <PackageReference Include="WixBuildTools.TestSupport" />
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>
26 </Project>
src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj
+1 -9
@@ -4,11 +4,9 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>net472</TargetFramework>
7 - <IsPackable>false</IsPackable>
8 - <DebugType>embedded</DebugType>
7 <DefaultItemExcludes>TestData\**;$(DefaultItemExcludes)</DefaultItemExcludes>
10 - <SignOutput>false</SignOutput>
8 <RequiresNativeWixAssets>true</RequiresNativeWixAssets>
9 + <IsWixTestProject>true</IsWixTestProject>
10 </PropertyGroup>
11
12 <ItemGroup>
@@ -22,10 +20,4 @@
20 <ItemGroup>
21 <PackageReference Include="WixBuildTools.TestSupport" />
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>
23 </Project>