Fix bundle-build extension library extraction.
Bob Arnson committed
Mar 27, 2020 at 18:05 UTC
192c5aa59b5d8e5e9df9095982317c224f3d4f04
6 files changed
+17
-24
src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
+3
-6
@@ -122,14 +122,11 @@ namespace WixToolset.Core.Burn
122
// of this in the 4.0 timeframe.
123
var orderedSearches = this.OrderSearches(section);
124
125
-#if THIS_SHOULD_BE_DELETED_SINCE_RESOLVE_DOES_THIS_NOW
126
- // Extract files that come from cabinet files (this does not extract files from merge modules).
125
+ // Extract files that come from binary .wixlibs and WixExtensions (this does not extract files from merge modules).
126
{
128
- var extractEmbeddedFilesCommand = new ExtractEmbeddedFilesCommand();
129
- extractEmbeddedFilesCommand.FilesWithEmbeddedFiles = ExpectedEmbeddedFiles;
130
- extractEmbeddedFilesCommand.Execute();
127
+ var command = new ExtractEmbeddedFilesCommand(this.ExpectedEmbeddedFiles);
128
+ command.Execute();
129
}
132
-#endif
130
131
// Get the explicit payloads.
132
var payloadTuples = section.Tuples.OfType<WixBundlePayloadTuple>().ToDictionary(t => t.Id.Id);
src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj
+2
-2
@@ -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. -->
3
4
<Project Sdk="Microsoft.NET.Sdk">
5
<PropertyGroup>
6
- <TargetFrameworks>net461</TargetFrameworks>
6
+ <TargetFramework>net472</TargetFramework>
7
<OutputType>Exe</OutputType>
8
</PropertyGroup>
9
src/test/CompileCoreTestExtensionWixlib/Program.cs
+8
-4
@@ -16,15 +16,19 @@ namespace CompileCoreTestExtensionWixlib
16
17
var buildArgs = new List<string>();
18
buildArgs.Add("build");
19
- foreach (var path in args[2].Split(';'))
20
- {
21
- buildArgs.Add(path);
22
- }
19
+ buildArgs.Add("-bindfiles");
20
+ buildArgs.Add("-bindpath");
21
+ buildArgs.Add("Data");
22
buildArgs.Add("-intermediateFolder");
23
buildArgs.Add(intermediateFolder);
24
buildArgs.Add("-o");
25
buildArgs.Add(wixlibPath);
26
27
+ foreach (var path in args[2].Split(';'))
28
+ {
29
+ buildArgs.Add(path);
30
+ }
31
+
32
var result = WixRunner.Execute(buildArgs.ToArray());
33
34
result.AssertSuccess();
src/test/Example.Extension/Example.Extension.csproj
+1
-1
@@ -24,7 +24,7 @@
24
25
<Target Name="SetExtensionWixlib">
26
<PropertyGroup>
27
- <CompileWixlibExePath>$(OutputPath)..\net461\CompileCoreTestExtensionWixlib.exe</CompileWixlibExePath>
27
+ <CompileWixlibExePath>$(OutputPath)..\net472\CompileCoreTestExtensionWixlib.exe</CompileWixlibExePath>
28
<WixlibPath>$(IntermediateOutputPath)Example.wixlib</WixlibPath>
29
</PropertyGroup>
30
src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
+1
-9
@@ -101,7 +101,7 @@ namespace WixToolsetTest.CoreIntegration
101
}
102
}
103
104
- [Fact(Skip = "Test demonstrates failure")]
104
+ [Fact]
105
public void CanBuildSimpleBundleUsingExtensionBA()
106
{
107
var burnStubPath = TestData.Get(@"TestData\.Data\burn.exe");
@@ -113,14 +113,6 @@ namespace WixToolsetTest.CoreIntegration
113
var baseFolder = fs.GetFolder();
114
var intermediateFolder = Path.Combine(baseFolder, "obj");
115
116
- var libResult = WixRunner.Execute(new[]
117
- {
118
- "build",
119
- Path.Combine(@"C:\src\mynewwix4\Core\src\test\Example.Extension\Data", "example.wxs"),
120
- "-intermediateFolder", intermediateFolder,
121
- "-o", Path.Combine(intermediateFolder, @"test.wixlib")
122
- });
123
-
116
var result = WixRunner.Execute(new[]
117
{
118
"build",
src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs
+2
-2
@@ -103,7 +103,7 @@ namespace WixToolsetTest.CoreIntegration
103
}
104
}
105
106
- [Fact(Skip = "Test demonstrates failure")]
106
+ [Fact]
107
public void CanBuildMsiUsingExtensionLibrary()
108
{
109
var folder = TestData.Get(@"TestData\Wixipl");
@@ -147,7 +147,7 @@ namespace WixToolsetTest.CoreIntegration
147
}
148
}
149
150
- [Fact(Skip = "Test demonstrates failure")]
150
+ [Fact]
151
public void CanBuildWixiplUsingExtensionLibrary()
152
{
153
var folder = TestData.Get(@"TestData\Wixipl");