diff options
Diffstat (limited to 'src/ext/NetFx')
-rw-r--r-- | src/ext/NetFx/be/precomp.h | 5 | ||||
-rw-r--r-- | src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs | 16 | ||||
-rw-r--r-- | src/ext/NetFx/wixlib/netfx.wixproj | 2 |
3 files changed, 9 insertions, 14 deletions
diff --git a/src/ext/NetFx/be/precomp.h b/src/ext/NetFx/be/precomp.h index c164834d..a0ae1038 100644 --- a/src/ext/NetFx/be/precomp.h +++ b/src/ext/NetFx/be/precomp.h | |||
@@ -19,11 +19,6 @@ | |||
19 | #include <procutil.h> | 19 | #include <procutil.h> |
20 | #include <xmlutil.h> | 20 | #include <xmlutil.h> |
21 | 21 | ||
22 | #include <BundleExtensionEngine.h> | ||
23 | #include <BundleExtension.h> | ||
24 | |||
25 | #include <IBundleExtensionEngine.h> | ||
26 | #include <IBundleExtension.h> | ||
27 | #include <bextutil.h> | 22 | #include <bextutil.h> |
28 | #include <BextBundleExtensionEngine.h> | 23 | #include <BextBundleExtensionEngine.h> |
29 | 24 | ||
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs index 27a19116..a78a5617 100644 --- a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs +++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs | |||
@@ -24,7 +24,7 @@ namespace WixToolsetTest.Netfx | |||
24 | var extensionResult = WixRunner.Execute(new[] | 24 | var extensionResult = WixRunner.Execute(new[] |
25 | { | 25 | { |
26 | "extension", "add", | 26 | "extension", "add", |
27 | "WixToolset.Bal.wixext" | 27 | "WixToolset.BootstrapperApplications.wixext" |
28 | }); | 28 | }); |
29 | 29 | ||
30 | var compileResult = WixRunner.Execute(new[] | 30 | var compileResult = WixRunner.Execute(new[] |
@@ -33,7 +33,7 @@ namespace WixToolsetTest.Netfx | |||
33 | Path.Combine(bundleSourceFolder, "BundleLatest.wxs"), | 33 | Path.Combine(bundleSourceFolder, "BundleLatest.wxs"), |
34 | Path.Combine(bundleSourceFolder, "NetCore3.1.12_x86.wxs"), | 34 | Path.Combine(bundleSourceFolder, "NetCore3.1.12_x86.wxs"), |
35 | Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"), | 35 | Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"), |
36 | "-ext", "WixToolset.Bal.wixext", | 36 | "-ext", "WixToolset.BootstrapperApplications.wixext", |
37 | "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), | 37 | "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), |
38 | "-intermediateFolder", intermediateFolder, | 38 | "-intermediateFolder", intermediateFolder, |
39 | "-o", bundleFile, | 39 | "-o", bundleFile, |
@@ -57,7 +57,7 @@ namespace WixToolsetTest.Netfx | |||
57 | var extensionResult = WixRunner.Execute(new[] | 57 | var extensionResult = WixRunner.Execute(new[] |
58 | { | 58 | { |
59 | "extension", "add", | 59 | "extension", "add", |
60 | "WixToolset.Bal.wixext" | 60 | "WixToolset.BootstrapperApplications.wixext" |
61 | }); | 61 | }); |
62 | 62 | ||
63 | var compileResult = WixRunner.Execute(new[] | 63 | var compileResult = WixRunner.Execute(new[] |
@@ -65,7 +65,7 @@ namespace WixToolsetTest.Netfx | |||
65 | "build", | 65 | "build", |
66 | Path.Combine(bundleSourceFolder, "BundleLatest_x64.wxs"), | 66 | Path.Combine(bundleSourceFolder, "BundleLatest_x64.wxs"), |
67 | Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"), | 67 | Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"), |
68 | "-ext", "WixToolset.Bal.wixext", | 68 | "-ext", "WixToolset.BootstrapperApplications.wixext", |
69 | "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), | 69 | "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), |
70 | "-intermediateFolder", intermediateFolder, | 70 | "-intermediateFolder", intermediateFolder, |
71 | "-o", bundleFile, | 71 | "-o", bundleFile, |
@@ -89,14 +89,14 @@ namespace WixToolsetTest.Netfx | |||
89 | var extensionResult = WixRunner.Execute(new[] | 89 | var extensionResult = WixRunner.Execute(new[] |
90 | { | 90 | { |
91 | "extension", "add", | 91 | "extension", "add", |
92 | "WixToolset.Bal.wixext" | 92 | "WixToolset.BootstrapperApplications.wixext" |
93 | }); | 93 | }); |
94 | 94 | ||
95 | var compileResult = WixRunner.Execute(new[] | 95 | var compileResult = WixRunner.Execute(new[] |
96 | { | 96 | { |
97 | "build", | 97 | "build", |
98 | Path.Combine(bundleSourceFolder, "BundleLatest.wxs"), | 98 | Path.Combine(bundleSourceFolder, "BundleLatest.wxs"), |
99 | "-ext", "WixToolset.Bal.wixext", | 99 | "-ext", "WixToolset.BootstrapperApplications.wixext", |
100 | "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), | 100 | "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), |
101 | "-intermediateFolder", intermediateFolder, | 101 | "-intermediateFolder", intermediateFolder, |
102 | "-o", bundleFile, | 102 | "-o", bundleFile, |
@@ -121,7 +121,7 @@ namespace WixToolsetTest.Netfx | |||
121 | var extensionResult = WixRunner.Execute(warningsAsErrors: true, new[] | 121 | var extensionResult = WixRunner.Execute(warningsAsErrors: true, new[] |
122 | { | 122 | { |
123 | "extension", "add", | 123 | "extension", "add", |
124 | "WixToolset.Bal.wixext", | 124 | "WixToolset.BootstrapperApplications.wixext", |
125 | "extension", "add", | 125 | "extension", "add", |
126 | "WixToolset.Util.wixext", | 126 | "WixToolset.Util.wixext", |
127 | }); | 127 | }); |
@@ -130,7 +130,7 @@ namespace WixToolsetTest.Netfx | |||
130 | { | 130 | { |
131 | "build", | 131 | "build", |
132 | Path.Combine(bundleSourceFolder, "BundleLatest.wxs"), | 132 | Path.Combine(bundleSourceFolder, "BundleLatest.wxs"), |
133 | "-ext", "WixToolset.Bal.wixext", | 133 | "-ext", "WixToolset.BootstrapperApplications.wixext", |
134 | "-ext", "WixToolset.Util.wixext", | 134 | "-ext", "WixToolset.Util.wixext", |
135 | "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), | 135 | "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), |
136 | "-intermediateFolder", intermediateFolder, | 136 | "-intermediateFolder", intermediateFolder, |
diff --git a/src/ext/NetFx/wixlib/netfx.wixproj b/src/ext/NetFx/wixlib/netfx.wixproj index 2bd09d95..4327257a 100644 --- a/src/ext/NetFx/wixlib/netfx.wixproj +++ b/src/ext/NetFx/wixlib/netfx.wixproj | |||
@@ -20,7 +20,7 @@ | |||
20 | </ItemGroup> | 20 | </ItemGroup> |
21 | 21 | ||
22 | <ItemGroup> | 22 | <ItemGroup> |
23 | <PackageReference Include="WixToolset.Bal.wixext" /> | 23 | <PackageReference Include="WixToolset.BootstrapperApplications.wixext" /> |
24 | <PackageReference Include="WixToolset.Util.wixext" /> | 24 | <PackageReference Include="WixToolset.Util.wixext" /> |
25 | </ItemGroup> | 25 | </ItemGroup> |
26 | 26 | ||