diff options
Diffstat (limited to 'src/test/WixToolsetTest.BuildTasks')
24 files changed, 7 insertions, 975 deletions
diff --git a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs b/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs deleted file mode 100644 index 0768f863..00000000 --- a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs +++ /dev/null | |||
| @@ -1,304 +0,0 @@ | |||
| 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 | ||
| 4 | { | ||
| 5 | using System; | ||
| 6 | using System.IO; | ||
| 7 | using System.Linq; | ||
| 8 | using WixBuildTools.TestSupport; | ||
| 9 | using WixToolset.BuildTasks; | ||
| 10 | using Xunit; | ||
| 11 | |||
| 12 | public class MsbuildFixture | ||
| 13 | { | ||
| 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"); | ||
| 16 | |||
| 17 | [Fact] | ||
| 18 | public void CanBuildSimpleBundle() | ||
| 19 | { | ||
| 20 | var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\SimpleBundle\SimpleBundle.wixproj"); | ||
| 21 | |||
| 22 | using (var fs = new DisposableFileSystem()) | ||
| 23 | { | ||
| 24 | var baseFolder = fs.GetFolder(); | ||
| 25 | var binFolder = Path.Combine(baseFolder, @"bin\"); | ||
| 26 | var intermediateFolder = Path.Combine(baseFolder, @"obj\"); | ||
| 27 | |||
| 28 | var result = MsbuildRunner.Execute(projectPath, new[] | ||
| 29 | { | ||
| 30 | $"-p:WixTargetsPath={WixTargetsPath}", | ||
| 31 | $"-p:WixBinDir={WixBinPath}", | ||
| 32 | $"-p:IntermediateOutputPath={intermediateFolder}", | ||
| 33 | $"-p:OutputPath={binFolder}" | ||
| 34 | }); | ||
| 35 | result.AssertSuccess(); | ||
| 36 | |||
| 37 | var platformSwitches = result.Output.Where(line => line.TrimStart().StartsWith("wix.exe build -platform x86")); | ||
| 38 | Assert.Single(platformSwitches); | ||
| 39 | |||
| 40 | var warnings = result.Output.Where(line => line.Contains(": warning")); | ||
| 41 | Assert.Empty(warnings); | ||
| 42 | |||
| 43 | var paths = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories) | ||
| 44 | .Select(s => s.Substring(baseFolder.Length + 1)) | ||
| 45 | .OrderBy(s => s) | ||
| 46 | .ToArray(); | ||
| 47 | Assert.Equal(new[] | ||
| 48 | { | ||
| 49 | @"bin\SimpleBundle.exe", | ||
| 50 | @"bin\SimpleBundle.wixpdb", | ||
| 51 | }, paths); | ||
| 52 | } | ||
| 53 | } | ||
| 54 | |||
| 55 | [Fact] | ||
| 56 | public void CanBuildSimpleMsiPackage() | ||
| 57 | { | ||
| 58 | var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj"); | ||
| 59 | |||
| 60 | using (var fs = new DisposableFileSystem()) | ||
| 61 | { | ||
| 62 | var baseFolder = fs.GetFolder(); | ||
| 63 | var binFolder = Path.Combine(baseFolder, @"bin\"); | ||
| 64 | var intermediateFolder = Path.Combine(baseFolder, @"obj\"); | ||
| 65 | |||
| 66 | var result = MsbuildRunner.Execute(projectPath, new[] | ||
| 67 | { | ||
| 68 | $"-p:WixTargetsPath={WixTargetsPath}", | ||
| 69 | $"-p:WixBinDir={WixBinPath}", | ||
| 70 | $"-p:IntermediateOutputPath={intermediateFolder}", | ||
| 71 | $"-p:OutputPath={binFolder}" | ||
| 72 | }); | ||
| 73 | result.AssertSuccess(); | ||
| 74 | |||
| 75 | var platformSwitches = result.Output.Where(line => line.TrimStart().StartsWith("wix.exe build -platform x86")); | ||
| 76 | Assert.Single(platformSwitches); | ||
| 77 | |||
| 78 | var warnings = result.Output.Where(line => line.Contains(": warning")); | ||
| 79 | Assert.Equal(4, warnings.Count()); | ||
| 80 | |||
| 81 | var paths = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories) | ||
| 82 | .Select(s => s.Substring(baseFolder.Length + 1)) | ||
| 83 | .OrderBy(s => s) | ||
| 84 | .ToArray(); | ||
| 85 | Assert.Equal(new[] | ||
| 86 | { | ||
| 87 | @"bin\en-US\cab1.cab", | ||
| 88 | @"bin\en-US\MsiPackage.msi", | ||
| 89 | @"bin\en-US\MsiPackage.wixpdb", | ||
| 90 | }, paths); | ||
| 91 | } | ||
| 92 | } | ||
| 93 | |||
| 94 | [Fact] | ||
| 95 | public void CanBuildWithDefaultAndExplicitlyFullWixpdbs() | ||
| 96 | { | ||
| 97 | var expectedOutputs = new[] | ||
| 98 | { | ||
| 99 | @"bin\en-US\cab1.cab", | ||
| 100 | @"bin\en-US\MsiPackage.msi", | ||
| 101 | @"bin\en-US\MsiPackage.wixpdb", | ||
| 102 | }; | ||
| 103 | |||
| 104 | this.AssertWixpdb(null, expectedOutputs); | ||
| 105 | this.AssertWixpdb("Full", expectedOutputs); | ||
| 106 | } | ||
| 107 | |||
| 108 | [Fact] | ||
| 109 | public void CanBuildWithNoWixpdb() | ||
| 110 | { | ||
| 111 | this.AssertWixpdb("NONE", new[] | ||
| 112 | { | ||
| 113 | @"bin\en-US\cab1.cab", | ||
| 114 | @"bin\en-US\MsiPackage.msi", | ||
| 115 | }); | ||
| 116 | } | ||
| 117 | |||
| 118 | private void AssertWixpdb(string wixpdbType, string[] expectedOutputFiles) | ||
| 119 | { | ||
| 120 | var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj"); | ||
| 121 | |||
| 122 | using (var fs = new DisposableFileSystem()) | ||
| 123 | { | ||
| 124 | var baseFolder = fs.GetFolder(); | ||
| 125 | var binFolder = Path.Combine(baseFolder, @"bin\"); | ||
| 126 | var intermediateFolder = Path.Combine(baseFolder, @"obj\"); | ||
| 127 | |||
| 128 | var result = MsbuildRunner.Execute(projectPath, new[] | ||
| 129 | { | ||
| 130 | wixpdbType == null ? String.Empty : $"-p:WixPdbType={wixpdbType}", | ||
| 131 | $"-p:WixTargetsPath={WixTargetsPath}", | ||
| 132 | $"-p:WixBinDir={WixBinPath}", | ||
| 133 | $"-p:IntermediateOutputPath={intermediateFolder}", | ||
| 134 | $"-p:OutputPath={binFolder}", | ||
| 135 | }); | ||
| 136 | result.AssertSuccess(); | ||
| 137 | |||
| 138 | var paths = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories) | ||
| 139 | .Select(s => s.Substring(baseFolder.Length + 1)) | ||
| 140 | .OrderBy(s => s) | ||
| 141 | .ToArray(); | ||
| 142 | Assert.Equal(expectedOutputFiles, paths); | ||
| 143 | } | ||
| 144 | } | ||
| 145 | |||
| 146 | [Fact] | ||
| 147 | public void CanBuild64BitMsiPackage() | ||
| 148 | { | ||
| 149 | var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj"); | ||
| 150 | |||
| 151 | using (var fs = new DisposableFileSystem()) | ||
| 152 | { | ||
| 153 | var baseFolder = fs.GetFolder(); | ||
| 154 | var binFolder = Path.Combine(baseFolder, @"bin\"); | ||
| 155 | var intermediateFolder = Path.Combine(baseFolder, @"obj\"); | ||
| 156 | |||
| 157 | var result = MsbuildRunner.Execute(projectPath, new[] | ||
| 158 | { | ||
| 159 | $"-p:WixTargetsPath={WixTargetsPath}", | ||
| 160 | $"-p:WixBinDir={WixBinPath}", | ||
| 161 | $"-p:IntermediateOutputPath={intermediateFolder}", | ||
| 162 | $"-p:OutputPath={binFolder}", | ||
| 163 | $"-p:InstallerPlatform=x64", | ||
| 164 | }); | ||
| 165 | result.AssertSuccess(); | ||
| 166 | |||
| 167 | var platformSwitches = result.Output.Where(line => line.TrimStart().StartsWith("wix.exe build -platform x64")); | ||
| 168 | Assert.Single(platformSwitches); | ||
| 169 | } | ||
| 170 | } | ||
| 171 | |||
| 172 | [Fact(Skip = "Currently fails")] | ||
| 173 | public void CanBuildSimpleMsiPackageWithIceSuppressions() | ||
| 174 | { | ||
| 175 | var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj"); | ||
| 176 | |||
| 177 | using (var fs = new DisposableFileSystem()) | ||
| 178 | { | ||
| 179 | var baseFolder = fs.GetFolder(); | ||
| 180 | var binFolder = Path.Combine(baseFolder, @"bin\"); | ||
| 181 | var intermediateFolder = Path.Combine(baseFolder, @"obj\"); | ||
| 182 | |||
| 183 | var result = MsbuildRunner.Execute(projectPath, new[] | ||
| 184 | { | ||
| 185 | $"-p:WixTargetsPath={WixTargetsPath}", | ||
| 186 | $"-p:WixBinDir={WixBinPath}", | ||
| 187 | $"-p:IntermediateOutputPath={intermediateFolder}", | ||
| 188 | $"-p:OutputPath={binFolder}", | ||
| 189 | "-p:SuppressIces=\"ICE45;ICE46\"" | ||
| 190 | }); | ||
| 191 | result.AssertSuccess(); | ||
| 192 | } | ||
| 193 | } | ||
| 194 | |||
| 195 | [Fact] | ||
| 196 | public void CanBuildSimpleMsiPackageWithWarningSuppressions() | ||
| 197 | { | ||
| 198 | var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj"); | ||
| 199 | |||
| 200 | using (var fs = new DisposableFileSystem()) | ||
| 201 | { | ||
| 202 | var baseFolder = fs.GetFolder(); | ||
| 203 | var binFolder = Path.Combine(baseFolder, @"bin\"); | ||
| 204 | var intermediateFolder = Path.Combine(baseFolder, @"obj\"); | ||
| 205 | |||
| 206 | var result = MsbuildRunner.Execute(projectPath, new[] | ||
| 207 | { | ||
| 208 | $"-p:WixTargetsPath={WixTargetsPath}", | ||
| 209 | $"-p:WixBinDir={WixBinPath}", | ||
| 210 | $"-p:IntermediateOutputPath={intermediateFolder}", | ||
| 211 | $"-p:OutputPath={binFolder}", | ||
| 212 | "-p:SuppressSpecificWarnings=\"1118;1102\"" | ||
| 213 | }); | ||
| 214 | result.AssertSuccess(); | ||
| 215 | |||
| 216 | var warnings = result.Output.Where(line => line.Contains(": warning")); | ||
| 217 | Assert.Empty(warnings); | ||
| 218 | } | ||
| 219 | } | ||
| 220 | |||
| 221 | [Fact] | ||
| 222 | public void CanBuildSimpleMsiPackageAsWixipl() | ||
| 223 | { | ||
| 224 | var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj"); | ||
| 225 | |||
| 226 | using (var fs = new DisposableFileSystem()) | ||
| 227 | { | ||
| 228 | var baseFolder = fs.GetFolder(); | ||
| 229 | var binFolder = Path.Combine(baseFolder, @"bin\"); | ||
| 230 | var intermediateFolder = Path.Combine(baseFolder, @"obj\"); | ||
| 231 | |||
| 232 | var result = MsbuildRunner.Execute(projectPath, new[] | ||
| 233 | { | ||
| 234 | $"-p:WixTargetsPath={WixTargetsPath}", | ||
| 235 | $"-p:WixBinDir={WixBinPath}", | ||
| 236 | $"-p:IntermediateOutputPath={intermediateFolder}", | ||
| 237 | $"-p:OutputPath={binFolder}", | ||
| 238 | "-p:OutputType=IntermediatePostLink" | ||
| 239 | }); | ||
| 240 | result.AssertSuccess(); | ||
| 241 | |||
| 242 | var path = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories) | ||
| 243 | .Select(s => s.Substring(baseFolder.Length + 1)) | ||
| 244 | .Single(); | ||
| 245 | Assert.Equal(@"bin\MsiPackage.wixipl", path); | ||
| 246 | } | ||
| 247 | } | ||
| 248 | |||
| 249 | [Fact] | ||
| 250 | public void CanBuildAndCleanSimpleMsiPackage() | ||
| 251 | { | ||
| 252 | var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj"); | ||
| 253 | |||
| 254 | using (var fs = new DisposableFileSystem()) | ||
| 255 | { | ||
| 256 | var baseFolder = fs.GetFolder(); | ||
| 257 | var binFolder = Path.Combine(baseFolder, @"bin\"); | ||
| 258 | var intermediateFolder = Path.Combine(baseFolder, @"obj\"); | ||
| 259 | |||
| 260 | // Build | ||
| 261 | var result = MsbuildRunner.Execute(projectPath, new[] | ||
| 262 | { | ||
| 263 | $"-p:WixTargetsPath={WixTargetsPath}", | ||
| 264 | $"-p:WixBinDir={WixBinPath}", | ||
| 265 | $"-p:IntermediateOutputPath={intermediateFolder}", | ||
| 266 | $"-p:OutputPath={binFolder}", | ||
| 267 | "-v:diag" | ||
| 268 | }); | ||
| 269 | result.AssertSuccess(); | ||
| 270 | |||
| 271 | var buildOutput = String.Join("\r\n", result.Output); | ||
| 272 | |||
| 273 | var createdPaths = Directory.EnumerateFiles(baseFolder, @"*.*", SearchOption.AllDirectories) | ||
| 274 | .Select(s => s.Substring(baseFolder.Length + 1)) | ||
| 275 | .OrderBy(s => s) | ||
| 276 | .ToArray(); | ||
| 277 | Assert.NotEmpty(createdPaths); | ||
| 278 | |||
| 279 | // Clean | ||
| 280 | result = MsbuildRunner.Execute(projectPath, new[] | ||
| 281 | { | ||
| 282 | $"-p:WixTargetsPath={WixTargetsPath}", | ||
| 283 | $"-p:WixBinDir={WixBinPath}", | ||
| 284 | $"-p:IntermediateOutputPath={intermediateFolder}", | ||
| 285 | $"-p:OutputPath={binFolder}", | ||
| 286 | "-t:Clean", | ||
| 287 | "-v:diag" | ||
| 288 | }); | ||
| 289 | result.AssertSuccess(); | ||
| 290 | |||
| 291 | var cleanOutput = String.Join("\r\n", result.Output); | ||
| 292 | |||
| 293 | // Clean is only expected to delete the files listed in {Project}.FileListAbsolute.txt, | ||
| 294 | // so this is not quite right but close enough. | ||
| 295 | var remainingPaths = Directory.EnumerateFiles(baseFolder, @"*.*", SearchOption.AllDirectories) | ||
| 296 | .Select(s => s.Substring(baseFolder.Length + 1)) | ||
| 297 | .Where(s => s != "obj\\MsiPackage.wixproj.FileListAbsolute.txt") | ||
| 298 | .OrderBy(s => s) | ||
| 299 | .ToArray(); | ||
| 300 | Assert.Empty(remainingPaths); | ||
| 301 | } | ||
| 302 | } | ||
| 303 | } | ||
| 304 | } | ||
diff --git a/src/test/WixToolsetTest.BuildTasks/MsbuildHeatFixture.cs b/src/test/WixToolsetTest.BuildTasks/MsbuildHeatFixture.cs deleted file mode 100644 index 95805658..00000000 --- a/src/test/WixToolsetTest.BuildTasks/MsbuildHeatFixture.cs +++ /dev/null | |||
| @@ -1,155 +0,0 @@ | |||
| 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 | ||
| 4 | { | ||
| 5 | using System; | ||
| 6 | using System.IO; | ||
| 7 | using System.Linq; | ||
| 8 | using WixBuildTools.TestSupport; | ||
| 9 | using WixToolset.BuildTasks; | ||
| 10 | using WixToolset.Core.TestPackage; | ||
| 11 | using WixToolset.Data; | ||
| 12 | using WixToolset.Data.Tuples; | ||
| 13 | using Xunit; | ||
| 14 | |||
| 15 | public class MsbuildHeatFixture | ||
| 16 | { | ||
| 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"); | ||
| 19 | |||
| 20 | [Fact] | ||
| 21 | public void CanBuildHeatFilePackage() | ||
| 22 | { | ||
| 23 | var projectPath = TestData.Get(@"TestData\HeatFilePackage\HeatFilePackage.wixproj"); | ||
| 24 | |||
| 25 | using (var fs = new DisposableFileSystem()) | ||
| 26 | { | ||
| 27 | var baseFolder = fs.GetFolder(); | ||
| 28 | var binFolder = Path.Combine(baseFolder, @"bin\"); | ||
| 29 | var intermediateFolder = Path.Combine(baseFolder, @"obj\"); | ||
| 30 | |||
| 31 | var result = MsbuildRunner.Execute(projectPath, new[] | ||
| 32 | { | ||
| 33 | $"-p:WixTargetsPath={WixTargetsPath}", | ||
| 34 | $"-p:WixBinDir={WixBinPath}", | ||
| 35 | $"-p:IntermediateOutputPath={intermediateFolder}", | ||
| 36 | $"-p:OutputPath={binFolder}" | ||
| 37 | }); | ||
| 38 | result.AssertSuccess(); | ||
| 39 | |||
| 40 | var heatCommandLines = result.Output.Where(line => line.TrimStart().StartsWith("heat.exe file")); | ||
| 41 | Assert.Single(heatCommandLines); | ||
| 42 | |||
| 43 | var warnings = result.Output.Where(line => line.Contains(": warning")); | ||
| 44 | Assert.Empty(warnings); | ||
| 45 | |||
| 46 | var generatedFilePath = Path.Combine(intermediateFolder, @"_ProductComponents_INSTALLFOLDER_HeatFilePackage.wixproj_file.wxs"); | ||
| 47 | Assert.True(File.Exists(generatedFilePath)); | ||
| 48 | |||
| 49 | var generatedContents = File.ReadAllText(generatedFilePath); | ||
| 50 | var testXml = generatedContents.GetTestXml(); | ||
| 51 | Assert.Equal(@"<Wix>" + | ||
| 52 | "<Fragment>" + | ||
| 53 | "<DirectoryRef Id='INSTALLFOLDER'>" + | ||
| 54 | "<Component Id='HeatFilePackage.wixproj' Guid='*'>" + | ||
| 55 | "<File Id='HeatFilePackage.wixproj' KeyPath='yes' Source='SourceDir\\HeatFilePackage.wixproj' />" + | ||
| 56 | "</Component>" + | ||
| 57 | "</DirectoryRef>" + | ||
| 58 | "</Fragment>" + | ||
| 59 | "<Fragment>" + | ||
| 60 | "<ComponentGroup Id='ProductComponents'>" + | ||
| 61 | "<ComponentRef Id='HeatFilePackage.wixproj' />" + | ||
| 62 | "</ComponentGroup>" + | ||
| 63 | "</Fragment>" + | ||
| 64 | "</Wix>", testXml); | ||
| 65 | |||
| 66 | var pdbPath = Path.Combine(binFolder, "HeatFilePackage.wixpdb"); | ||
| 67 | Assert.True(File.Exists(pdbPath)); | ||
| 68 | |||
| 69 | var intermediate = Intermediate.Load(pdbPath); | ||
| 70 | var section = intermediate.Sections.Single(); | ||
| 71 | |||
| 72 | var fileTuple = section.Tuples.OfType<FileTuple>().Single(); | ||
| 73 | Assert.Equal(@"SourceDir\HeatFilePackage.wixproj", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); | ||
| 74 | } | ||
| 75 | } | ||
| 76 | |||
| 77 | [Fact] | ||
| 78 | public void CanBuildHeatFileWithMultipleFilesPackage() | ||
| 79 | { | ||
| 80 | var projectPath = TestData.Get(@"TestData\HeatFileMultpleFilesSameFileName\HeatFileMultpleFilesSameFileName.wixproj"); | ||
| 81 | |||
| 82 | using (var fs = new DisposableFileSystem()) | ||
| 83 | { | ||
| 84 | var baseFolder = fs.GetFolder(); | ||
| 85 | var binFolder = Path.Combine(baseFolder, @"bin\"); | ||
| 86 | var intermediateFolder = Path.Combine(baseFolder, @"obj\"); | ||
| 87 | |||
| 88 | var result = MsbuildRunner.Execute(projectPath, new[] | ||
| 89 | { | ||
| 90 | $"-p:WixTargetsPath={WixTargetsPath}", | ||
| 91 | $"-p:WixBinDir={WixBinPath}", | ||
| 92 | $"-p:IntermediateOutputPath={intermediateFolder}", | ||
| 93 | $"-p:OutputPath={binFolder}" | ||
| 94 | }); | ||
| 95 | result.AssertSuccess(); | ||
| 96 | |||
| 97 | var heatCommandLines = result.Output.Where(line => line.TrimStart().StartsWith("heat.exe file")); | ||
| 98 | Assert.Equal(2, heatCommandLines.Count()); | ||
| 99 | |||
| 100 | var warnings = result.Output.Where(line => line.Contains(": warning")); | ||
| 101 | Assert.Empty(warnings); | ||
| 102 | |||
| 103 | var generatedFilePath = Path.Combine(intermediateFolder, @"_TxtProductComponents_INSTALLFOLDER_MyProgram.txt_file.wxs"); | ||
| 104 | Assert.True(File.Exists(generatedFilePath)); | ||
| 105 | |||
| 106 | var generatedContents = File.ReadAllText(generatedFilePath); | ||
| 107 | var testXml = generatedContents.GetTestXml(); | ||
| 108 | Assert.Equal("<Wix>" + | ||
| 109 | "<Fragment>" + | ||
| 110 | "<DirectoryRef Id='INSTALLFOLDER'>" + | ||
| 111 | "<Component Id='MyProgram.txt' Guid='*'>" + | ||
| 112 | @"<File Id='MyProgram.txt' KeyPath='yes' Source='SourceDir\MyProgram.txt' />" + | ||
| 113 | "</Component>" + | ||
| 114 | "</DirectoryRef>" + | ||
| 115 | "</Fragment>" + | ||
| 116 | "<Fragment>" + | ||
| 117 | "<ComponentGroup Id='TxtProductComponents'>" + | ||
| 118 | "<ComponentRef Id='MyProgram.txt' />" + | ||
| 119 | "</ComponentGroup>" + | ||
| 120 | "</Fragment>" + | ||
| 121 | "</Wix>", testXml); | ||
| 122 | |||
| 123 | generatedFilePath = Path.Combine(intermediateFolder, @"_JsonProductComponents_INSTALLFOLDER_MyProgram.json_file.wxs"); | ||
| 124 | Assert.True(File.Exists(generatedFilePath)); | ||
| 125 | |||
| 126 | generatedContents = File.ReadAllText(generatedFilePath); | ||
| 127 | testXml = generatedContents.GetTestXml(); | ||
| 128 | Assert.Equal("<Wix>" + | ||
| 129 | "<Fragment>" + | ||
| 130 | "<DirectoryRef Id='INSTALLFOLDER'>" + | ||
| 131 | "<Component Id='MyProgram.json' Guid='*'>" + | ||
| 132 | @"<File Id='MyProgram.json' KeyPath='yes' Source='SourceDir\MyProgram.json' />" + | ||
| 133 | "</Component>" + | ||
| 134 | "</DirectoryRef>" + | ||
| 135 | "</Fragment>" + | ||
| 136 | "<Fragment>" + | ||
| 137 | "<ComponentGroup Id='JsonProductComponents'>" + | ||
| 138 | "<ComponentRef Id='MyProgram.json' />" + | ||
| 139 | "</ComponentGroup>" + | ||
| 140 | "</Fragment>" + | ||
| 141 | "</Wix>", testXml); | ||
| 142 | |||
| 143 | var pdbPath = Path.Combine(binFolder, "HeatFileMultpleFilesSameFileName.wixpdb"); | ||
| 144 | Assert.True(File.Exists(pdbPath)); | ||
| 145 | |||
| 146 | var intermediate = Intermediate.Load(pdbPath); | ||
| 147 | var section = intermediate.Sections.Single(); | ||
| 148 | |||
| 149 | var fileTuples = section.Tuples.OfType<FileTuple>().ToArray(); | ||
| 150 | Assert.Equal(@"SourceDir\MyProgram.txt", fileTuples[0][FileTupleFields.Source].PreviousValue.AsPath().Path); | ||
| 151 | Assert.Equal(@"SourceDir\MyProgram.json", fileTuples[1][FileTupleFields.Source].PreviousValue.AsPath().Path); | ||
| 152 | } | ||
| 153 | } | ||
| 154 | } | ||
| 155 | } | ||
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/HeatFileMultpleFilesSameFileName.wixproj b/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/HeatFileMultpleFilesSameFileName.wixproj deleted file mode 100644 index 860fc2dd..00000000 --- a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/HeatFileMultpleFilesSameFileName.wixproj +++ /dev/null | |||
| @@ -1,61 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | <PropertyGroup> | ||
| 4 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| 5 | <Platform Condition=" '$(Platform)' == '' ">x86</Platform> | ||
| 6 | </PropertyGroup> | ||
| 7 | |||
| 8 | <PropertyGroup> | ||
| 9 | <ProjectGuid>7fb77005-c6e0-454f-8c2d-0a4a79c918ba</ProjectGuid> | ||
| 10 | </PropertyGroup> | ||
| 11 | |||
| 12 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> | ||
| 13 | <PlatformName>$(Platform)</PlatformName> | ||
| 14 | <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> | ||
| 15 | <DefineConstants>Debug</DefineConstants> | ||
| 16 | </PropertyGroup> | ||
| 17 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> | ||
| 18 | <PlatformName>$(Platform)</PlatformName> | ||
| 19 | <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> | ||
| 20 | </PropertyGroup> | ||
| 21 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> | ||
| 22 | <PlatformName>$(Platform)</PlatformName> | ||
| 23 | <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> | ||
| 24 | <DefineConstants>Debug</DefineConstants> | ||
| 25 | </PropertyGroup> | ||
| 26 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> | ||
| 27 | <PlatformName>$(Platform)</PlatformName> | ||
| 28 | <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> | ||
| 29 | </PropertyGroup> | ||
| 30 | |||
| 31 | <ItemGroup> | ||
| 32 | <Compile Include="Package.wxs" /> | ||
| 33 | </ItemGroup> | ||
| 34 | |||
| 35 | <ItemGroup> | ||
| 36 | <BindInputPaths Include="." /> | ||
| 37 | </ItemGroup> | ||
| 38 | |||
| 39 | <PropertyGroup> | ||
| 40 | <HarvestFileSuppressUniqueIds>true</HarvestFileSuppressUniqueIds> | ||
| 41 | </PropertyGroup> | ||
| 42 | |||
| 43 | <ItemGroup> | ||
| 44 | <HarvestFile Include="MyProgram.txt"> | ||
| 45 | <ComponentGroupName>TxtProductComponents</ComponentGroupName> | ||
| 46 | <DirectoryRefId>INSTALLFOLDER</DirectoryRefId> | ||
| 47 | <SuppressRootDirectory>true</SuppressRootDirectory> | ||
| 48 | </HarvestFile> | ||
| 49 | <HarvestFile Include="MyProgram.json"> | ||
| 50 | <ComponentGroupName>JsonProductComponents</ComponentGroupName> | ||
| 51 | <DirectoryRefId>INSTALLFOLDER</DirectoryRefId> | ||
| 52 | <SuppressRootDirectory>true</SuppressRootDirectory> | ||
| 53 | </HarvestFile> | ||
| 54 | </ItemGroup> | ||
| 55 | |||
| 56 | <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " /> | ||
| 57 | <Import Project="$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets') " /> | ||
| 58 | <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' "> | ||
| 59 | <Error Text="WiX Toolset build tools (v4.0 or later) must be installed to build this project. To download the WiX Toolset, go to http://wixtoolset.org/releases/." /> | ||
| 60 | </Target> | ||
| 61 | </Project> \ No newline at end of file | ||
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/MyProgram.json b/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/MyProgram.json deleted file mode 100644 index 5f282702..00000000 --- a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/MyProgram.json +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | \ No newline at end of file | ||
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/MyProgram.txt b/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/MyProgram.txt deleted file mode 100644 index 5f282702..00000000 --- a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/MyProgram.txt +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | \ No newline at end of file | ||
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/Package.wxs b/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/Package.wxs deleted file mode 100644 index 884da274..00000000 --- a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/Package.wxs +++ /dev/null | |||
| @@ -1,22 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | |||
| 3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 4 | <Product Id="*" Name="HeatFilePackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> | ||
| 5 | <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" /> | ||
| 6 | |||
| 7 | <MediaTemplate /> | ||
| 8 | |||
| 9 | <Feature Id="ProductFeature" Title="HeatFileFeature"> | ||
| 10 | <ComponentGroupRef Id="TxtProductComponents" /> | ||
| 11 | <ComponentGroupRef Id="JsonProductComponents" /> | ||
| 12 | </Feature> | ||
| 13 | </Product> | ||
| 14 | |||
| 15 | <Fragment> | ||
| 16 | <Directory Id="TARGETDIR" Name="SourceDir"> | ||
| 17 | <Directory Id="ProgramFilesFolder"> | ||
| 18 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | ||
| 19 | </Directory> | ||
| 20 | </Directory> | ||
| 21 | </Fragment> | ||
| 22 | </Wix> | ||
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFilePackage/HeatFilePackage.wixproj b/src/test/WixToolsetTest.BuildTasks/TestData/HeatFilePackage/HeatFilePackage.wixproj deleted file mode 100644 index 87f4388a..00000000 --- a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFilePackage/HeatFilePackage.wixproj +++ /dev/null | |||
| @@ -1,56 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | <PropertyGroup> | ||
| 4 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| 5 | <Platform Condition=" '$(Platform)' == '' ">x86</Platform> | ||
| 6 | </PropertyGroup> | ||
| 7 | |||
| 8 | <PropertyGroup> | ||
| 9 | <ProjectGuid>7fb77005-c6e0-454f-8c2d-0a4a79c918ba</ProjectGuid> | ||
| 10 | </PropertyGroup> | ||
| 11 | |||
| 12 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> | ||
| 13 | <PlatformName>$(Platform)</PlatformName> | ||
| 14 | <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> | ||
| 15 | <DefineConstants>Debug</DefineConstants> | ||
| 16 | </PropertyGroup> | ||
| 17 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> | ||
| 18 | <PlatformName>$(Platform)</PlatformName> | ||
| 19 | <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> | ||
| 20 | </PropertyGroup> | ||
| 21 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> | ||
| 22 | <PlatformName>$(Platform)</PlatformName> | ||
| 23 | <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> | ||
| 24 | <DefineConstants>Debug</DefineConstants> | ||
| 25 | </PropertyGroup> | ||
| 26 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> | ||
| 27 | <PlatformName>$(Platform)</PlatformName> | ||
| 28 | <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> | ||
| 29 | </PropertyGroup> | ||
| 30 | |||
| 31 | <ItemGroup> | ||
| 32 | <Compile Include="Package.wxs" /> | ||
| 33 | </ItemGroup> | ||
| 34 | |||
| 35 | <ItemGroup> | ||
| 36 | <BindInputPaths Include="." /> | ||
| 37 | </ItemGroup> | ||
| 38 | |||
| 39 | <PropertyGroup> | ||
| 40 | <HarvestFileSuppressUniqueIds>true</HarvestFileSuppressUniqueIds> | ||
| 41 | </PropertyGroup> | ||
| 42 | |||
| 43 | <ItemGroup> | ||
| 44 | <HarvestFile Include="HeatFilePackage.wixproj"> | ||
| 45 | <ComponentGroupName>ProductComponents</ComponentGroupName> | ||
| 46 | <DirectoryRefId>INSTALLFOLDER</DirectoryRefId> | ||
| 47 | <SuppressRootDirectory>true</SuppressRootDirectory> | ||
| 48 | </HarvestFile> | ||
| 49 | </ItemGroup> | ||
| 50 | |||
| 51 | <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " /> | ||
| 52 | <Import Project="$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets') " /> | ||
| 53 | <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' "> | ||
| 54 | <Error Text="WiX Toolset build tools (v4.0 or later) must be installed to build this project. To download the WiX Toolset, go to http://wixtoolset.org/releases/." /> | ||
| 55 | </Target> | ||
| 56 | </Project> \ No newline at end of file | ||
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFilePackage/Package.wxs b/src/test/WixToolsetTest.BuildTasks/TestData/HeatFilePackage/Package.wxs deleted file mode 100644 index e509c464..00000000 --- a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFilePackage/Package.wxs +++ /dev/null | |||
| @@ -1,21 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | |||
| 3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 4 | <Product Id="*" Name="HeatFilePackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> | ||
| 5 | <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" /> | ||
| 6 | |||
| 7 | <MediaTemplate /> | ||
| 8 | |||
| 9 | <Feature Id="ProductFeature" Title="HeatFileFeature"> | ||
| 10 | <ComponentGroupRef Id="ProductComponents" /> | ||
| 11 | </Feature> | ||
| 12 | </Product> | ||
| 13 | |||
| 14 | <Fragment> | ||
| 15 | <Directory Id="TARGETDIR" Name="SourceDir"> | ||
| 16 | <Directory Id="ProgramFilesFolder"> | ||
| 17 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | ||
| 18 | </Directory> | ||
| 19 | </Directory> | ||
| 20 | </Fragment> | ||
| 21 | </Wix> | ||
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj b/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj deleted file mode 100644 index e04ea43d..00000000 --- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj +++ /dev/null | |||
| @@ -1,57 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | <PropertyGroup> | ||
| 4 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| 5 | <Platform Condition=" '$(Platform)' == '' ">x86</Platform> | ||
| 6 | <ProductVersion>0.9</ProductVersion> | ||
| 7 | <ProjectGuid>7fb77005-c6e0-454f-8c2d-0a4a79c918ba</ProjectGuid> | ||
| 8 | <OutputName>MsiPackage</OutputName> | ||
| 9 | <OutputType>Package</OutputType> | ||
| 10 | <Name>MsiPackage</Name> | ||
| 11 | <RootNamespace>MsiPackage</RootNamespace> | ||
| 12 | <Cultures>en-US,en;de-DE</Cultures> | ||
| 13 | </PropertyGroup> | ||
| 14 | |||
| 15 | <PropertyGroup> | ||
| 16 | <WixTargetsPath>..\..\..\..\..\..\build\Release\publish\net461\wix.targets</WixTargetsPath> | ||
| 17 | </PropertyGroup> | ||
| 18 | |||
| 19 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> | ||
| 20 | <PlatformName>$(Platform)</PlatformName> | ||
| 21 | <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> | ||
| 22 | <DefineConstants>Debug</DefineConstants> | ||
| 23 | </PropertyGroup> | ||
| 24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> | ||
| 25 | <PlatformName>$(Platform)</PlatformName> | ||
| 26 | <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> | ||
| 27 | </PropertyGroup> | ||
| 28 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> | ||
| 29 | <PlatformName>$(Platform)</PlatformName> | ||
| 30 | <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> | ||
| 31 | <DefineConstants>Debug</DefineConstants> | ||
| 32 | </PropertyGroup> | ||
| 33 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> | ||
| 34 | <PlatformName>$(Platform)</PlatformName> | ||
| 35 | <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> | ||
| 36 | </PropertyGroup> | ||
| 37 | |||
| 38 | <ItemGroup> | ||
| 39 | <Compile Include="Package.wxs" /> | ||
| 40 | <Compile Include="PackageComponents.wxs" /> | ||
| 41 | </ItemGroup> | ||
| 42 | |||
| 43 | <ItemGroup> | ||
| 44 | <EmbeddedResource Include="Package.en-us.wxl" /> | ||
| 45 | <EmbeddedResource Include="Package.de-de.wxl" /> | ||
| 46 | </ItemGroup> | ||
| 47 | |||
| 48 | <ItemGroup> | ||
| 49 | <BindInputPaths Include="data" /> | ||
| 50 | </ItemGroup> | ||
| 51 | |||
| 52 | <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " /> | ||
| 53 | <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " /> | ||
| 54 | <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' "> | ||
| 55 | <Error Text="WiX Toolset build tools (v3.11 or later) must be installed to build this project. To download the WiX Toolset, go to http://wixtoolset.org/releases/." /> | ||
| 56 | </Target> | ||
| 57 | </Project> | ||
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl b/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl deleted file mode 100644 index 23493ace..00000000 --- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | |||
| 3 | <!-- | ||
| 4 | This file contains the declaration of all the localizable strings. | ||
| 5 | --> | ||
| 6 | <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="de-DE"> | ||
| 7 | |||
| 8 | <String Id="DowngradeError">German DowngradeError</String> | ||
| 9 | <String Id="FeatureTitle">German FeatureTitle</String> | ||
| 10 | |||
| 11 | </WixLocalization> | ||
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl b/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl deleted file mode 100644 index 38c12ac1..00000000 --- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | |||
| 3 | <!-- | ||
| 4 | This file contains the declaration of all the localizable strings. | ||
| 5 | --> | ||
| 6 | <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US"> | ||
| 7 | |||
| 8 | <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String> | ||
| 9 | <String Id="FeatureTitle">MsiPackage</String> | ||
| 10 | |||
| 11 | </WixLocalization> | ||
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs b/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs deleted file mode 100644 index d5a5a40d..00000000 --- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs +++ /dev/null | |||
| @@ -1,21 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 3 | <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> | ||
| 4 | <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" /> | ||
| 5 | |||
| 6 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> | ||
| 7 | <MediaTemplate /> | ||
| 8 | |||
| 9 | <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> | ||
| 10 | <ComponentGroupRef Id="ProductComponents" /> | ||
| 11 | </Feature> | ||
| 12 | </Product> | ||
| 13 | |||
| 14 | <Fragment> | ||
| 15 | <Directory Id="TARGETDIR" Name="SourceDir"> | ||
| 16 | <Directory Id="ProgramFilesFolder"> | ||
| 17 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | ||
| 18 | </Directory> | ||
| 19 | </Directory> | ||
| 20 | </Fragment> | ||
| 21 | </Wix> | ||
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/PackageComponents.wxs b/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/PackageComponents.wxs deleted file mode 100644 index e26c4509..00000000 --- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/PackageComponents.wxs +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 3 | <Fragment> | ||
| 4 | <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> | ||
| 5 | <Component> | ||
| 6 | <File Source="test.txt" /> | ||
| 7 | </Component> | ||
| 8 | </ComponentGroup> | ||
| 9 | </Fragment> | ||
| 10 | </Wix> | ||
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/data/test.txt b/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/data/test.txt deleted file mode 100644 index cd0db0e1..00000000 --- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/data/test.txt +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | This is test.txt. \ No newline at end of file | ||
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MultiCulturalMsiPackage.sln b/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MultiCulturalMsiPackage.sln deleted file mode 100644 index 2c88704e..00000000 --- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MultiCulturalMsiPackage.sln +++ /dev/null | |||
| @@ -1,31 +0,0 @@ | |||
| 1 | | ||
| 2 | Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| 3 | # Visual Studio 15 | ||
| 4 | VisualStudioVersion = 15.0.26730.8 | ||
| 5 | MinimumVisualStudioVersion = 10.0.40219.1 | ||
| 6 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MsiPackage", "MsiPackage\MsiPackage.wixproj", "{7FB77005-C6E0-454F-8C2D-0A4A79C918BA}" | ||
| 7 | EndProject | ||
| 8 | Global | ||
| 9 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| 10 | Debug|x64 = Debug|x64 | ||
| 11 | Debug|x86 = Debug|x86 | ||
| 12 | Release|x64 = Release|x64 | ||
| 13 | Release|x86 = Release|x86 | ||
| 14 | EndGlobalSection | ||
| 15 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| 16 | {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x64.ActiveCfg = Debug|x64 | ||
| 17 | {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x64.Build.0 = Debug|x64 | ||
| 18 | {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x86.ActiveCfg = Debug|x86 | ||
| 19 | {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x86.Build.0 = Debug|x86 | ||
| 20 | {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x64.ActiveCfg = Release|x64 | ||
| 21 | {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x64.Build.0 = Release|x64 | ||
| 22 | {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x86.ActiveCfg = Release|x86 | ||
| 23 | {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x86.Build.0 = Release|x86 | ||
| 24 | EndGlobalSection | ||
| 25 | GlobalSection(SolutionProperties) = preSolution | ||
| 26 | HideSolutionNode = FALSE | ||
| 27 | EndGlobalSection | ||
| 28 | GlobalSection(ExtensibilityGlobals) = postSolution | ||
| 29 | SolutionGuid = {585B0599-4EB5-4AB6-BC66-819CC78B63D5} | ||
| 30 | EndGlobalSection | ||
| 31 | EndGlobal | ||
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj b/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj deleted file mode 100644 index d5cac8d8..00000000 --- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj +++ /dev/null | |||
| @@ -1,49 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | <PropertyGroup> | ||
| 4 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| 5 | <Platform Condition=" '$(Platform)' == '' ">x86</Platform> | ||
| 6 | </PropertyGroup> | ||
| 7 | |||
| 8 | <PropertyGroup> | ||
| 9 | <ProjectGuid>7fb77005-c6e0-454f-8c2d-0a4a79c918ba</ProjectGuid> | ||
| 10 | </PropertyGroup> | ||
| 11 | |||
| 12 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> | ||
| 13 | <PlatformName>$(Platform)</PlatformName> | ||
| 14 | <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> | ||
| 15 | <DefineConstants>Debug</DefineConstants> | ||
| 16 | </PropertyGroup> | ||
| 17 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> | ||
| 18 | <PlatformName>$(Platform)</PlatformName> | ||
| 19 | <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> | ||
| 20 | </PropertyGroup> | ||
| 21 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> | ||
| 22 | <PlatformName>$(Platform)</PlatformName> | ||
| 23 | <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> | ||
| 24 | <DefineConstants>Debug</DefineConstants> | ||
| 25 | </PropertyGroup> | ||
| 26 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> | ||
| 27 | <PlatformName>$(Platform)</PlatformName> | ||
| 28 | <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> | ||
| 29 | </PropertyGroup> | ||
| 30 | |||
| 31 | <ItemGroup> | ||
| 32 | <Compile Include="Package.wxs" /> | ||
| 33 | <Compile Include="PackageComponents.wxs" /> | ||
| 34 | </ItemGroup> | ||
| 35 | |||
| 36 | <ItemGroup> | ||
| 37 | <EmbeddedResource Include="Package.en-us.wxl" /> | ||
| 38 | </ItemGroup> | ||
| 39 | |||
| 40 | <ItemGroup> | ||
| 41 | <BindInputPaths Include="data" /> | ||
| 42 | </ItemGroup> | ||
| 43 | |||
| 44 | <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " /> | ||
| 45 | <Import Project="$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets') " /> | ||
| 46 | <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' "> | ||
| 47 | <Error Text="WiX Toolset build tools (v4.0 or later) must be installed to build this project. To download the WiX Toolset, go to http://wixtoolset.org/releases/." /> | ||
| 48 | </Target> | ||
| 49 | </Project> \ No newline at end of file | ||
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/Package.en-us.wxl b/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/Package.en-us.wxl deleted file mode 100644 index 38c12ac1..00000000 --- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/Package.en-us.wxl +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | |||
| 3 | <!-- | ||
| 4 | This file contains the declaration of all the localizable strings. | ||
| 5 | --> | ||
| 6 | <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US"> | ||
| 7 | |||
| 8 | <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String> | ||
| 9 | <String Id="FeatureTitle">MsiPackage</String> | ||
| 10 | |||
| 11 | </WixLocalization> | ||
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/Package.wxs b/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/Package.wxs deleted file mode 100644 index f7998fff..00000000 --- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/Package.wxs +++ /dev/null | |||
| @@ -1,25 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | |||
| 3 | <?define Variable = "Value" ?> | ||
| 4 | <?define Variable = "DifferentValue" ?> | ||
| 5 | |||
| 6 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 7 | <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> | ||
| 8 | <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" /> | ||
| 9 | |||
| 10 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> | ||
| 11 | <MediaTemplate /> | ||
| 12 | |||
| 13 | <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> | ||
| 14 | <ComponentGroupRef Id="ProductComponents" /> | ||
| 15 | </Feature> | ||
| 16 | </Product> | ||
| 17 | |||
| 18 | <Fragment> | ||
| 19 | <Directory Id="TARGETDIR" Name="SourceDir"> | ||
| 20 | <Directory Id="ProgramFilesFolder"> | ||
| 21 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | ||
| 22 | </Directory> | ||
| 23 | </Directory> | ||
| 24 | </Fragment> | ||
| 25 | </Wix> | ||
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/PackageComponents.wxs b/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/PackageComponents.wxs deleted file mode 100644 index ddb95faf..00000000 --- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/PackageComponents.wxs +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 3 | <Fragment> | ||
| 4 | <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> | ||
| 5 | <Component> | ||
| 6 | <File Source="test.txt" DefaultLanguage="1033" /> | ||
| 7 | </Component> | ||
| 8 | </ComponentGroup> | ||
| 9 | </Fragment> | ||
| 10 | </Wix> | ||
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/data/test.txt b/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/data/test.txt deleted file mode 100644 index cd0db0e1..00000000 --- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/data/test.txt +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | This is test.txt. \ No newline at end of file | ||
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleBundle/Bundle.wxs b/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleBundle/Bundle.wxs deleted file mode 100644 index 6cd04712..00000000 --- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleBundle/Bundle.wxs +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 3 | <Bundle Name="SimpleBundle" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="6670d5c9-bbec-4828-ab60-4a1c0ffeb97d"> | ||
| 4 | <BootstrapperApplication SourceFile="test.txt" /> | ||
| 5 | |||
| 6 | <Chain> | ||
| 7 | <ExePackage SourceFile="test.txt" /> | ||
| 8 | </Chain> | ||
| 9 | </Bundle> | ||
| 10 | </Wix> | ||
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj b/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj deleted file mode 100644 index 4c837936..00000000 --- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj +++ /dev/null | |||
| @@ -1,45 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | <PropertyGroup> | ||
| 4 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| 5 | <Platform Condition=" '$(Platform)' == '' ">x86</Platform> | ||
| 6 | </PropertyGroup> | ||
| 7 | |||
| 8 | <PropertyGroup> | ||
| 9 | <ProjectGuid>6670d5c9-bbec-4828-ab60-4a1c0ffeb97d</ProjectGuid> | ||
| 10 | <OutputType>Bundle</OutputType> | ||
| 11 | </PropertyGroup> | ||
| 12 | |||
| 13 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> | ||
| 14 | <PlatformName>$(Platform)</PlatformName> | ||
| 15 | <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> | ||
| 16 | <DefineConstants>Debug</DefineConstants> | ||
| 17 | </PropertyGroup> | ||
| 18 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> | ||
| 19 | <PlatformName>$(Platform)</PlatformName> | ||
| 20 | <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> | ||
| 21 | </PropertyGroup> | ||
| 22 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> | ||
| 23 | <PlatformName>$(Platform)</PlatformName> | ||
| 24 | <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> | ||
| 25 | <DefineConstants>Debug</DefineConstants> | ||
| 26 | </PropertyGroup> | ||
| 27 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> | ||
| 28 | <PlatformName>$(Platform)</PlatformName> | ||
| 29 | <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> | ||
| 30 | </PropertyGroup> | ||
| 31 | |||
| 32 | <ItemGroup> | ||
| 33 | <Compile Include="Bundle.wxs" /> | ||
| 34 | </ItemGroup> | ||
| 35 | |||
| 36 | <ItemGroup> | ||
| 37 | <BindInputPaths Include="..\MsiPackage\data" /> | ||
| 38 | </ItemGroup> | ||
| 39 | |||
| 40 | <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " /> | ||
| 41 | <Import Project="$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets') " /> | ||
| 42 | <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' "> | ||
| 43 | <Error Text="WiX Toolset build tools (v4.0 or later) must be installed to build this project. To download the WiX Toolset, go to http://wixtoolset.org/releases/." /> | ||
| 44 | </Target> | ||
| 45 | </Project> \ No newline at end of file | ||
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleMsiPackage.sln b/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleMsiPackage.sln deleted file mode 100644 index dd21489d..00000000 --- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleMsiPackage.sln +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | | ||
| 2 | Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| 3 | # Visual Studio Version 16 | ||
| 4 | VisualStudioVersion = 16.0.30011.22 | ||
| 5 | MinimumVisualStudioVersion = 10.0.40219.1 | ||
| 6 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MsiPackage", "MsiPackage\MsiPackage.wixproj", "{7FB77005-C6E0-454F-8C2D-0A4A79C918BA}" | ||
| 7 | EndProject | ||
| 8 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SimpleBundle", "SimpleBundle\SimpleBundle.wixproj", "{6670D5C9-BBEC-4828-AB60-4A1C0FFEB97D}" | ||
| 9 | EndProject | ||
| 10 | Global | ||
| 11 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| 12 | Debug|x64 = Debug|x64 | ||
| 13 | Debug|x86 = Debug|x86 | ||
| 14 | Release|x64 = Release|x64 | ||
| 15 | Release|x86 = Release|x86 | ||
| 16 | EndGlobalSection | ||
| 17 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| 18 | {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x64.ActiveCfg = Debug|x64 | ||
| 19 | {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x64.Build.0 = Debug|x64 | ||
| 20 | {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x86.ActiveCfg = Debug|x86 | ||
| 21 | {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x86.Build.0 = Debug|x86 | ||
| 22 | {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x64.ActiveCfg = Release|x64 | ||
| 23 | {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x64.Build.0 = Release|x64 | ||
| 24 | {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x86.ActiveCfg = Release|x86 | ||
| 25 | {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x86.Build.0 = Release|x86 | ||
| 26 | {6670D5C9-BBEC-4828-AB60-4A1C0FFEB97D}.Debug|x64.ActiveCfg = Debug|x86 | ||
| 27 | {6670D5C9-BBEC-4828-AB60-4A1C0FFEB97D}.Debug|x86.ActiveCfg = Debug|x86 | ||
| 28 | {6670D5C9-BBEC-4828-AB60-4A1C0FFEB97D}.Debug|x86.Build.0 = Debug|x86 | ||
| 29 | {6670D5C9-BBEC-4828-AB60-4A1C0FFEB97D}.Release|x64.ActiveCfg = Release|x86 | ||
| 30 | {6670D5C9-BBEC-4828-AB60-4A1C0FFEB97D}.Release|x86.ActiveCfg = Release|x86 | ||
| 31 | {6670D5C9-BBEC-4828-AB60-4A1C0FFEB97D}.Release|x86.Build.0 = Release|x86 | ||
| 32 | EndGlobalSection | ||
| 33 | GlobalSection(SolutionProperties) = preSolution | ||
| 34 | HideSolutionNode = FALSE | ||
| 35 | EndGlobalSection | ||
| 36 | GlobalSection(ExtensibilityGlobals) = postSolution | ||
| 37 | SolutionGuid = {585B0599-4EB5-4AB6-BC66-819CC78B63D5} | ||
| 38 | EndGlobalSection | ||
| 39 | EndGlobal | ||
diff --git a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj index 9fb2bc82..22d421de 100644 --- a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj +++ b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj | |||
| @@ -10,31 +10,16 @@ | |||
| 10 | </PropertyGroup> | 10 | </PropertyGroup> |
| 11 | 11 | ||
| 12 | <ItemGroup> | 12 | <ItemGroup> |
| 13 | <Content Include="TestData\HeatFilePackage\HeatFilePackage.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="TestData\HeatFilePackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> | 14 | <Content Include="..\WixToolsetTest.MSBuild\TestData\SimpleMsiPackage\MsiPackage\Package.wxs" Link="TestData\SimpleMsiPackage\MsiPackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> |
| 15 | <Content Include="TestData\HeatFileMultpleFilesSameFileName\HeatFileMultpleFilesSameFileName.wixproj" CopyToOutputDirectory="PreserveNewest" /> | 15 | <Content Include="..\WixToolsetTest.MSBuild\TestData\SimpleMsiPackage\MsiPackage\PackageComponents.wxs" Link="TestData\SimpleMsiPackage\MsiPackage\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" /> |
| 16 | <Content Include="TestData\HeatFileMultpleFilesSameFileName\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> | 16 | <Content Include="..\WixToolsetTest.MSBuild\TestData\SimpleMsiPackage\MsiPackage\data\test.txt" Link="TestData\SimpleMsiPackage\MsiPackage\data\test.txt" 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" /> | ||
| 32 | </ItemGroup> | 17 | </ItemGroup> |
| 33 | 18 | ||
| 34 | <ItemGroup> | 19 | <ItemGroup> |
| 35 | <Content Include="..\..\WixToolset.MSBuild\wix.harvest.targets" Link="wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" /> | 20 | <Content Include="..\..\WixToolset.MSBuild\tools\wix.harvest.targets" Link="wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" /> |
| 36 | <Content Include="..\..\WixToolset.MSBuild\wix.signing.targets" Link="wix.signing.targets" CopyToOutputDirectory="PreserveNewest" /> | 21 | <Content Include="..\..\WixToolset.MSBuild\tools\wix.signing.targets" Link="wix.signing.targets" CopyToOutputDirectory="PreserveNewest" /> |
| 37 | <Content Include="..\..\WixToolset.MSBuild\wix.targets" Link="wix.targets" CopyToOutputDirectory="PreserveNewest" /> | 22 | <Content Include="..\..\WixToolset.MSBuild\tools\wix.targets" Link="wix.targets" CopyToOutputDirectory="PreserveNewest" /> |
| 38 | </ItemGroup> | 23 | </ItemGroup> |
| 39 | 24 | ||
| 40 | <ItemGroup> | 25 | <ItemGroup> |
