diff options
| author | Bob Arnson <bob@firegiant.com> | 2020-03-27 18:05:18 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2020-03-27 18:10:17 -0400 |
| commit | 192c5aa59b5d8e5e9df9095982317c224f3d4f04 (patch) | |
| tree | 4a62d949b34c018ec66104cf3c82f57e10b8421f /src/test/CompileCoreTestExtensionWixlib | |
| parent | 1adfdda935b814541693cd550bb34fdbf2942b1f (diff) | |
| download | wix-192c5aa59b5d8e5e9df9095982317c224f3d4f04.tar.gz wix-192c5aa59b5d8e5e9df9095982317c224f3d4f04.tar.bz2 wix-192c5aa59b5d8e5e9df9095982317c224f3d4f04.zip | |
Fix bundle-build extension library extraction.
Diffstat (limited to 'src/test/CompileCoreTestExtensionWixlib')
| -rw-r--r-- | src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj | 4 | ||||
| -rw-r--r-- | src/test/CompileCoreTestExtensionWixlib/Program.cs | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj b/src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj index 4bc1d02b..7e5c33ef 100644 --- a/src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj +++ b/src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj | |||
| @@ -1,9 +1,9 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 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. --> | 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 | 3 | ||
| 4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFrameworks>net461</TargetFrameworks> | 6 | <TargetFramework>net472</TargetFramework> |
| 7 | <OutputType>Exe</OutputType> | 7 | <OutputType>Exe</OutputType> |
| 8 | </PropertyGroup> | 8 | </PropertyGroup> |
| 9 | 9 | ||
diff --git a/src/test/CompileCoreTestExtensionWixlib/Program.cs b/src/test/CompileCoreTestExtensionWixlib/Program.cs index 308ab8a2..323b5e5e 100644 --- a/src/test/CompileCoreTestExtensionWixlib/Program.cs +++ b/src/test/CompileCoreTestExtensionWixlib/Program.cs | |||
| @@ -16,15 +16,19 @@ namespace CompileCoreTestExtensionWixlib | |||
| 16 | 16 | ||
| 17 | var buildArgs = new List<string>(); | 17 | var buildArgs = new List<string>(); |
| 18 | buildArgs.Add("build"); | 18 | buildArgs.Add("build"); |
| 19 | foreach (var path in args[2].Split(';')) | 19 | buildArgs.Add("-bindfiles"); |
| 20 | { | 20 | buildArgs.Add("-bindpath"); |
| 21 | buildArgs.Add(path); | 21 | buildArgs.Add("Data"); |
| 22 | } | ||
| 23 | buildArgs.Add("-intermediateFolder"); | 22 | buildArgs.Add("-intermediateFolder"); |
| 24 | buildArgs.Add(intermediateFolder); | 23 | buildArgs.Add(intermediateFolder); |
| 25 | buildArgs.Add("-o"); | 24 | buildArgs.Add("-o"); |
| 26 | buildArgs.Add(wixlibPath); | 25 | buildArgs.Add(wixlibPath); |
| 27 | 26 | ||
| 27 | foreach (var path in args[2].Split(';')) | ||
| 28 | { | ||
| 29 | buildArgs.Add(path); | ||
| 30 | } | ||
| 31 | |||
| 28 | var result = WixRunner.Execute(buildArgs.ToArray()); | 32 | var result = WixRunner.Execute(buildArgs.ToArray()); |
| 29 | 33 | ||
| 30 | result.AssertSuccess(); | 34 | result.AssertSuccess(); |
