Move most tests into the new WixToolsetTest.MSBuild project.
This project relies on all of the projects being published in order to properly test wix.targets.
Sean Hall committed
May 30, 2020 at 18:55 UTC
64fe8bccc329ac5dc0d510bfbd73054d478ddc37
36 files changed
+100
-66
Tools.sln
+10
@@ -28,6 +28,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "thmviewer", "src\thmviewer\
28
EndProject
29
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "heat", "src\heat\heat.csproj", "{B1F18B6F-FBD8-4911-B3BF-40D801DA77D7}"
30
EndProject
31
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.MSBuild", "src\test\WixToolsetTest.MSBuild\WixToolsetTest.MSBuild.csproj", "{7B610B7B-C69D-4A4C-9D65-F304C44479E7}"
32
+EndProject
33
Global
34
GlobalSection(SolutionConfigurationPlatforms) = preSolution
35
Debug|Any CPU = Debug|Any CPU
@@ -114,6 +116,14 @@ Global
116
{B1F18B6F-FBD8-4911-B3BF-40D801DA77D7}.Release|Any CPU.Build.0 = Release|Any CPU
117
{B1F18B6F-FBD8-4911-B3BF-40D801DA77D7}.Release|x86.ActiveCfg = Release|Any CPU
118
{B1F18B6F-FBD8-4911-B3BF-40D801DA77D7}.Release|x86.Build.0 = Release|Any CPU
119
+ {7B610B7B-C69D-4A4C-9D65-F304C44479E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
120
+ {7B610B7B-C69D-4A4C-9D65-F304C44479E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
121
+ {7B610B7B-C69D-4A4C-9D65-F304C44479E7}.Debug|x86.ActiveCfg = Debug|Any CPU
122
+ {7B610B7B-C69D-4A4C-9D65-F304C44479E7}.Debug|x86.Build.0 = Debug|Any CPU
123
+ {7B610B7B-C69D-4A4C-9D65-F304C44479E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
124
+ {7B610B7B-C69D-4A4C-9D65-F304C44479E7}.Release|Any CPU.Build.0 = Release|Any CPU
125
+ {7B610B7B-C69D-4A4C-9D65-F304C44479E7}.Release|x86.ActiveCfg = Release|Any CPU
126
+ {7B610B7B-C69D-4A4C-9D65-F304C44479E7}.Release|x86.Build.0 = Release|Any CPU
127
EndGlobalSection
128
GlobalSection(SolutionProperties) = preSolution
129
HideSolutionNode = FALSE
appveyor.cmd
+15
-15
@@ -1,27 +1,27 @@
1
@setlocal
2
@pushd %~dp0
3
-@set _P=%~dp0build\Release\publish
3
+@set _C=Release
4
+@set _P=%~dp0build\%_C%\publish
5
6
nuget restore
7
7
-dotnet test -c Release src\test\WixToolsetTest.BuildTasks
8
-dotnet test -c Release src\test\WixToolsetTest.WixCop
8
+dotnet test -c %_C% src\test\WixToolsetTest.BuildTasks
9
+dotnet test -c %_C% src\test\WixToolsetTest.WixCop
10
10
-dotnet publish -c Release -o %_P%\dotnet-wix\ -f netcoreapp2.1 src\wix
11
-@rem dotnet publish -c Release -o %_P%\netfx-heat\ -f net461 src\heat
12
-@rem dotnet publish -c Release -o %_P%\netfx-wix\ -f net461 src\wix
13
-@rem dotnet publish -c Release -o %_P%\netfx-wixcop\ -f net461 src\wixcop
14
-dotnet publish -c Release -o %_P%\WixToolset.MSBuild\net461\ -f net461 src\WixToolset.BuildTasks
15
-dotnet publish -c Release -o %_P%\WixToolset.MSBuild\netcoreapp2.1\ -f netcoreapp2.1 src\WixToolset.BuildTasks
11
+dotnet publish -c %_C% -o %_P%\dotnet-wix\ -f netcoreapp2.1 src\wix
12
+@rem dotnet publish -c %_C% -o %_P%\netfx-heat\ -f net461 src\heat
13
+@rem dotnet publish -c %_C% -o %_P%\netfx-wix\ -f net461 src\wix
14
+@rem dotnet publish -c %_C% -o %_P%\netfx-wixcop\ -f net461 src\wixcop
15
+dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\tools\net461\ -f net461 src\WixToolset.BuildTasks
16
+dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\tools\netcoreapp2.1\ -f netcoreapp2.1 src\WixToolset.BuildTasks
17
+dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\ src\WixToolset.MSBuild
18
17
-@rem dotnet publish -c Release -o %_P%\netcoreapp2.1 -r win-x86 src\wix
18
-@rem dotnet publish -c Release -o %_P%\net461 -r win-x86 src\light
19
-@rem dotnet publish -c Release -o %_P%\net461 -r win-x86 src\WixToolset.BuildTasks
19
+dotnet pack -c %_C% src\dotnet-wix
20
+dotnet pack -c %_C% src\WixToolset.MSBuild
21
21
-dotnet pack -c Release src\dotnet-wix
22
-dotnet pack -c Release src\WixToolset.MSBuild
22
+dotnet test -c %_C% src\test\WixToolsetTest.MSBuild
23
24
-msbuild -p:Configuration=Release .\src\ThmViewerPackage\ThmViewerPackage.wixproj
24
+msbuild -p:Configuration=%_C% .\src\ThmViewerPackage\ThmViewerPackage.wixproj
25
26
@popd
27
@endlocal
src/ThmViewerPackage/ThmViewerPackage.wixproj
+1
-2
@@ -6,7 +6,6 @@
6
<ProjectGuid>59c4b122-5167-445b-8fc4-09dcd4eced89</ProjectGuid>
7
<OutputName>thmviewer</OutputName>
8
<OutputType>Package</OutputType>
9
- <WixBinDir>$(OutputPath)\net461\win-x86\</WixBinDir>
9
</PropertyGroup>
10
11
<ItemGroup>
@@ -24,7 +23,7 @@
23
</ProjectReference>
24
</ItemGroup>
25
27
- <Import Project="..\WixToolset.MSBuild\wix.targets" />
26
+ <Import Project="$(OutputPath)\publish\WixToolset.MSBuild\tools\wix.targets" />
27
28
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
29
<PropertyGroup>
src/WixToolset.MSBuild/WixToolset.MSBuild.csproj
+7
@@ -11,6 +11,13 @@
11
<NuspecProperties>Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description)</NuspecProperties>
12
</PropertyGroup>
13
14
+ <ItemGroup>
15
+ <Content Include="tools\wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
16
+ <Content Include="tools\wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" />
17
+ <Content Include="tools\wix.signing.targets" CopyToOutputDirectory="PreserveNewest" />
18
+ <Content Include="tools\wix.targets" CopyToOutputDirectory="PreserveNewest" />
19
+ </ItemGroup>
20
+
21
<ItemGroup>
22
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
23
</ItemGroup>
src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
+1
-6
@@ -12,11 +12,6 @@
12
13
<files>
14
<file src="$projectFolder$$id$.props" target="build" />
15
- <file src="$projectFolder$wix.ca.targets" target="tools" />
16
- <file src="$projectFolder$wix.harvest.targets" target="tools" />
17
- <file src="$projectFolder$wix.signing.targets" target="tools" />
18
- <file src="$projectFolder$wix.targets" target="tools" />
19
- <file src="net461\**\*" target="tools\net461" />
20
- <file src="netcoreapp2.1\**\*" target="tools\netcoreapp2.1" />
15
+ <file src="tools\**\*" target="tools" />
16
</files>
17
</package>
src/WixToolset.MSBuild/tools/wix.ca.targets
renamed
src/WixToolset.MSBuild/tools/wix.harvest.targets
renamed
src/WixToolset.MSBuild/tools/wix.signing.targets
renamed
src/WixToolset.MSBuild/tools/wix.targets
renamed
src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+7
-22
@@ -10,31 +10,16 @@
10
</PropertyGroup>
11
12
<ItemGroup>
13
- <Content Include="TestData\HeatFilePackage\HeatFilePackage.wixproj" CopyToOutputDirectory="PreserveNewest" />
14
- <Content Include="TestData\HeatFilePackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
15
- <Content Include="TestData\HeatFileMultpleFilesSameFileName\HeatFileMultpleFilesSameFileName.wixproj" CopyToOutputDirectory="PreserveNewest" />
16
- <Content Include="TestData\HeatFileMultpleFilesSameFileName\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
17
- <Content Include="TestData\HeatFileMultpleFilesSameFileName\MyProgram.txt" CopyToOutputDirectory="PreserveNewest" />
18
- <Content Include="TestData\HeatFileMultpleFilesSameFileName\MyProgram.json" CopyToOutputDirectory="PreserveNewest" />
19
- <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\MsiPackage.wixproj" CopyToOutputDirectory="PreserveNewest" />
20
- <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\Package.de-de.wxl" CopyToOutputDirectory="PreserveNewest" />
21
- <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
22
- <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
23
- <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
24
- <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\data\test.txt" CopyToOutputDirectory="PreserveNewest" />
25
- <Content Include="TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj" CopyToOutputDirectory="PreserveNewest" />
26
- <Content Include="TestData\SimpleMsiPackage\MsiPackage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
27
- <Content Include="TestData\SimpleMsiPackage\MsiPackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
28
- <Content Include="TestData\SimpleMsiPackage\MsiPackage\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
29
- <Content Include="TestData\SimpleMsiPackage\MsiPackage\data\test.txt" CopyToOutputDirectory="PreserveNewest" />
30
- <Content Include="TestData\SimpleMsiPackage\SimpleBundle\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" />
31
- <Content Include="TestData\SimpleMsiPackage\SimpleBundle\SimpleBundle.wixproj" CopyToOutputDirectory="PreserveNewest" />
13
+ <Content Include="..\WixToolsetTest.MSBuild\TestData\SimpleMsiPackage\MsiPackage\Package.en-us.wxl" Link="TestData\SimpleMsiPackage\MsiPackage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
14
+ <Content Include="..\WixToolsetTest.MSBuild\TestData\SimpleMsiPackage\MsiPackage\Package.wxs" Link="TestData\SimpleMsiPackage\MsiPackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
15
+ <Content Include="..\WixToolsetTest.MSBuild\TestData\SimpleMsiPackage\MsiPackage\PackageComponents.wxs" Link="TestData\SimpleMsiPackage\MsiPackage\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
16
+ <Content Include="..\WixToolsetTest.MSBuild\TestData\SimpleMsiPackage\MsiPackage\data\test.txt" Link="TestData\SimpleMsiPackage\MsiPackage\data\test.txt" CopyToOutputDirectory="PreserveNewest" />
17
</ItemGroup>
18
19
<ItemGroup>
35
- <Content Include="..\..\WixToolset.MSBuild\wix.harvest.targets" Link="wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" />
36
- <Content Include="..\..\WixToolset.MSBuild\wix.signing.targets" Link="wix.signing.targets" CopyToOutputDirectory="PreserveNewest" />
37
- <Content Include="..\..\WixToolset.MSBuild\wix.targets" Link="wix.targets" CopyToOutputDirectory="PreserveNewest" />
20
+ <Content Include="..\..\WixToolset.MSBuild\tools\wix.harvest.targets" Link="wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" />
21
+ <Content Include="..\..\WixToolset.MSBuild\tools\wix.signing.targets" Link="wix.signing.targets" CopyToOutputDirectory="PreserveNewest" />
22
+ <Content Include="..\..\WixToolset.MSBuild\tools\wix.targets" Link="wix.targets" CopyToOutputDirectory="PreserveNewest" />
23
</ItemGroup>
24
25
<ItemGroup>
src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs
renamed
+2
-13
@@ -1,18 +1,16 @@
1
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
2
3
-namespace WixToolsetTest.BuildTasks
3
+namespace WixToolsetTest.MSBuild
4
{
5
using System;
6
using System.IO;
7
using System.Linq;
8
using WixBuildTools.TestSupport;
9
- using WixToolset.BuildTasks;
9
using Xunit;
10
11
public class MsbuildFixture
12
{
14
- private static readonly string WixBinPath = Path.GetDirectoryName(new Uri(typeof(WixBuild).Assembly.CodeBase).AbsolutePath) + "\\";
15
- private static readonly string WixTargetsPath = Path.Combine(WixBinPath, "wix.targets");
13
+ private static readonly string WixTargetsPath = Path.Combine(new Uri(typeof(MsbuildFixture).Assembly.CodeBase).AbsolutePath, "..", "..", "publish", "WixToolset.MSBuild", "tools", "wix.targets");
14
15
[Fact]
16
public void CanBuildSimpleBundle()
@@ -28,7 +26,6 @@ namespace WixToolsetTest.BuildTasks
26
var result = MsbuildRunner.Execute(projectPath, new[]
27
{
28
$"-p:WixTargetsPath={WixTargetsPath}",
31
- $"-p:WixBinDir={WixBinPath}",
29
$"-p:IntermediateOutputPath={intermediateFolder}",
30
$"-p:OutputPath={binFolder}"
31
});
@@ -66,7 +63,6 @@ namespace WixToolsetTest.BuildTasks
63
var result = MsbuildRunner.Execute(projectPath, new[]
64
{
65
$"-p:WixTargetsPath={WixTargetsPath}",
69
- $"-p:WixBinDir={WixBinPath}",
66
$"-p:IntermediateOutputPath={intermediateFolder}",
67
$"-p:OutputPath={binFolder}"
68
});
@@ -129,7 +125,6 @@ namespace WixToolsetTest.BuildTasks
125
{
126
wixpdbType == null ? String.Empty : $"-p:WixPdbType={wixpdbType}",
127
$"-p:WixTargetsPath={WixTargetsPath}",
132
- $"-p:WixBinDir={WixBinPath}",
128
$"-p:IntermediateOutputPath={intermediateFolder}",
129
$"-p:OutputPath={binFolder}",
130
});
@@ -157,7 +152,6 @@ namespace WixToolsetTest.BuildTasks
152
var result = MsbuildRunner.Execute(projectPath, new[]
153
{
154
$"-p:WixTargetsPath={WixTargetsPath}",
160
- $"-p:WixBinDir={WixBinPath}",
155
$"-p:IntermediateOutputPath={intermediateFolder}",
156
$"-p:OutputPath={binFolder}",
157
$"-p:InstallerPlatform=x64",
@@ -183,7 +177,6 @@ namespace WixToolsetTest.BuildTasks
177
var result = MsbuildRunner.Execute(projectPath, new[]
178
{
179
$"-p:WixTargetsPath={WixTargetsPath}",
186
- $"-p:WixBinDir={WixBinPath}",
180
$"-p:IntermediateOutputPath={intermediateFolder}",
181
$"-p:OutputPath={binFolder}",
182
"-p:SuppressIces=\"ICE45;ICE46\""
@@ -206,7 +199,6 @@ namespace WixToolsetTest.BuildTasks
199
var result = MsbuildRunner.Execute(projectPath, new[]
200
{
201
$"-p:WixTargetsPath={WixTargetsPath}",
209
- $"-p:WixBinDir={WixBinPath}",
202
$"-p:IntermediateOutputPath={intermediateFolder}",
203
$"-p:OutputPath={binFolder}",
204
"-p:SuppressSpecificWarnings=\"1118;1102\""
@@ -232,7 +224,6 @@ namespace WixToolsetTest.BuildTasks
224
var result = MsbuildRunner.Execute(projectPath, new[]
225
{
226
$"-p:WixTargetsPath={WixTargetsPath}",
235
- $"-p:WixBinDir={WixBinPath}",
227
$"-p:IntermediateOutputPath={intermediateFolder}",
228
$"-p:OutputPath={binFolder}",
229
"-p:OutputType=IntermediatePostLink"
@@ -261,7 +252,6 @@ namespace WixToolsetTest.BuildTasks
252
var result = MsbuildRunner.Execute(projectPath, new[]
253
{
254
$"-p:WixTargetsPath={WixTargetsPath}",
264
- $"-p:WixBinDir={WixBinPath}",
255
$"-p:IntermediateOutputPath={intermediateFolder}",
256
$"-p:OutputPath={binFolder}",
257
"-v:diag"
@@ -280,7 +270,6 @@ namespace WixToolsetTest.BuildTasks
270
result = MsbuildRunner.Execute(projectPath, new[]
271
{
272
$"-p:WixTargetsPath={WixTargetsPath}",
283
- $"-p:WixBinDir={WixBinPath}",
273
$"-p:IntermediateOutputPath={intermediateFolder}",
274
$"-p:OutputPath={binFolder}",
275
"-t:Clean",
src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs
renamed
+4
-8
@@ -1,12 +1,11 @@
1
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
2
3
-namespace WixToolsetTest.BuildTasks
3
+namespace WixToolsetTest.MSBuild
4
{
5
using System;
6
using System.IO;
7
using System.Linq;
8
using WixBuildTools.TestSupport;
9
- using WixToolset.BuildTasks;
9
using WixToolset.Core.TestPackage;
10
using WixToolset.Data;
11
using WixToolset.Data.Tuples;
@@ -14,8 +13,7 @@ namespace WixToolsetTest.BuildTasks
13
14
public class MsbuildHeatFixture
15
{
17
- private static readonly string WixBinPath = Path.GetDirectoryName(new Uri(typeof(WixBuild).Assembly.CodeBase).AbsolutePath) + "\\";
18
- private static readonly string WixTargetsPath = Path.Combine(WixBinPath, "wix.targets");
16
+ private static readonly string WixTargetsPath = Path.Combine(new Uri(typeof(MsbuildHeatFixture).Assembly.CodeBase).AbsolutePath, "..", "..", "publish", "WixToolset.MSBuild", "tools", "wix.targets");
17
18
[Fact]
19
public void CanBuildHeatFilePackage()
@@ -31,7 +29,6 @@ namespace WixToolsetTest.BuildTasks
29
var result = MsbuildRunner.Execute(projectPath, new[]
30
{
31
$"-p:WixTargetsPath={WixTargetsPath}",
34
- $"-p:WixBinDir={WixBinPath}",
32
$"-p:IntermediateOutputPath={intermediateFolder}",
33
$"-p:OutputPath={binFolder}"
34
});
@@ -77,7 +74,7 @@ namespace WixToolsetTest.BuildTasks
74
[Fact]
75
public void CanBuildHeatFileWithMultipleFilesPackage()
76
{
80
- var projectPath = TestData.Get(@"TestData\HeatFileMultpleFilesSameFileName\HeatFileMultpleFilesSameFileName.wixproj");
77
+ var projectPath = TestData.Get(@"TestData\HeatFileMultipleFilesSameFileName\HeatFileMultipleFilesSameFileName.wixproj");
78
79
using (var fs = new DisposableFileSystem())
80
{
@@ -88,7 +85,6 @@ namespace WixToolsetTest.BuildTasks
85
var result = MsbuildRunner.Execute(projectPath, new[]
86
{
87
$"-p:WixTargetsPath={WixTargetsPath}",
91
- $"-p:WixBinDir={WixBinPath}",
88
$"-p:IntermediateOutputPath={intermediateFolder}",
89
$"-p:OutputPath={binFolder}"
90
});
@@ -140,7 +136,7 @@ namespace WixToolsetTest.BuildTasks
136
"</Fragment>" +
137
"</Wix>", testXml);
138
143
- var pdbPath = Path.Combine(binFolder, "HeatFileMultpleFilesSameFileName.wixpdb");
139
+ var pdbPath = Path.Combine(binFolder, "HeatFileMultipleFilesSameFileName.wixpdb");
140
Assert.True(File.Exists(pdbPath));
141
142
var intermediate = Intermediate.Load(pdbPath);
src/test/WixToolsetTest.MSBuild/README.md
new
+5
@@ -0,0 +1,5 @@
1
+In order to properly test wix.targets,
2
+all of the supported architectures for WixToolset.BuildTasks need to be available in the layout used in the Nuget package.
3
+Making this happen on every build for the solution takes too long,
4
+so this project relies on manually running appveyor.cmd to publish everything before the tests can be run.
5
+appveyor.cmd needs to be ran again every time changes are made in other projects, including the targets themselves.
\ No newline at end of file
src/test/WixToolsetTest.MSBuild/TestData/HeatFileMultipleFilesSameFileName/HeatFileMultipleFilesSameFileName.wixproj
renamed
src/test/WixToolsetTest.MSBuild/TestData/HeatFileMultipleFilesSameFileName/MyProgram.json
renamed
src/test/WixToolsetTest.MSBuild/TestData/HeatFileMultipleFilesSameFileName/MyProgram.txt
renamed
src/test/WixToolsetTest.MSBuild/TestData/HeatFileMultipleFilesSameFileName/Package.wxs
renamed
src/test/WixToolsetTest.MSBuild/TestData/HeatFilePackage/HeatFilePackage.wixproj
renamed
src/test/WixToolsetTest.MSBuild/TestData/HeatFilePackage/Package.wxs
renamed
src/test/WixToolsetTest.MSBuild/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj
renamed
src/test/WixToolsetTest.MSBuild/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl
renamed
src/test/WixToolsetTest.MSBuild/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl
renamed
src/test/WixToolsetTest.MSBuild/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs
renamed
src/test/WixToolsetTest.MSBuild/TestData/MultiCulturalMsiPackage/MsiPackage/PackageComponents.wxs
renamed
src/test/WixToolsetTest.MSBuild/TestData/MultiCulturalMsiPackage/MsiPackage/data/test.txt
renamed
src/test/WixToolsetTest.MSBuild/TestData/MultiCulturalMsiPackage/MultiCulturalMsiPackage.sln
renamed
src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj
renamed
src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/MsiPackage/Package.en-us.wxl
renamed
src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/MsiPackage/Package.wxs
renamed
src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/MsiPackage/PackageComponents.wxs
renamed
src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/MsiPackage/data/test.txt
renamed
src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/SimpleBundle/Bundle.wxs
renamed
src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj
renamed
src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/SimpleMsiPackage.sln
renamed
src/test/WixToolsetTest.MSBuild/WixToolsetTest.MSBuild.csproj
new
+43
@@ -0,0 +1,43 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
+
4
+<Project Sdk="Microsoft.NET.Sdk">
5
+ <PropertyGroup>
6
+ <TargetFramework>net461</TargetFramework>
7
+ <IsPackable>false</IsPackable>
8
+ <DebugType>embedded</DebugType>
9
+ </PropertyGroup>
10
+
11
+ <ItemGroup>
12
+ <Content Include="TestData\HeatFilePackage\HeatFilePackage.wixproj" CopyToOutputDirectory="PreserveNewest" />
13
+ <Content Include="TestData\HeatFilePackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
14
+ <Content Include="TestData\HeatFileMultipleFilesSameFileName\HeatFileMultipleFilesSameFileName.wixproj" CopyToOutputDirectory="PreserveNewest" />
15
+ <Content Include="TestData\HeatFileMultipleFilesSameFileName\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
16
+ <Content Include="TestData\HeatFileMultipleFilesSameFileName\MyProgram.txt" CopyToOutputDirectory="PreserveNewest" />
17
+ <Content Include="TestData\HeatFileMultipleFilesSameFileName\MyProgram.json" CopyToOutputDirectory="PreserveNewest" />
18
+ <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\MsiPackage.wixproj" CopyToOutputDirectory="PreserveNewest" />
19
+ <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\Package.de-de.wxl" CopyToOutputDirectory="PreserveNewest" />
20
+ <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
21
+ <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
22
+ <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
23
+ <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\data\test.txt" CopyToOutputDirectory="PreserveNewest" />
24
+ <Content Include="TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj" CopyToOutputDirectory="PreserveNewest" />
25
+ <Content Include="TestData\SimpleMsiPackage\MsiPackage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
26
+ <Content Include="TestData\SimpleMsiPackage\MsiPackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
27
+ <Content Include="TestData\SimpleMsiPackage\MsiPackage\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
28
+ <Content Include="TestData\SimpleMsiPackage\MsiPackage\data\test.txt" CopyToOutputDirectory="PreserveNewest" />
29
+ <Content Include="TestData\SimpleMsiPackage\SimpleBundle\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" />
30
+ <Content Include="TestData\SimpleMsiPackage\SimpleBundle\SimpleBundle.wixproj" CopyToOutputDirectory="PreserveNewest" />
31
+ </ItemGroup>
32
+
33
+ <ItemGroup>
34
+ <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" />
35
+ <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" />
36
+ </ItemGroup>
37
+
38
+ <ItemGroup>
39
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
40
+ <PackageReference Include="xunit" Version="2.4.1" />
41
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
42
+ </ItemGroup>
43
+</Project>
src/test/WixToolsetTest.MSBuild/WixToolsetTest.MSBuild.v3.ncrunchproject
new
+5
@@ -0,0 +1,5 @@
1
+<ProjectConfiguration>
2
+ <Settings>
3
+ <HiddenComponentWarnings />
4
+ </Settings>
5
+</ProjectConfiguration>
\ No newline at end of file