aboutsummaryrefslogtreecommitdiff
path: root/src/ext/NetFx/test
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2022-10-14 14:27:03 -0700
committerRob Mensching <rob@firegiant.com>2022-10-15 11:45:54 -0700
commita3af25607b56f5ecf21d6712a8367217e5c43eb0 (patch)
tree213634eab88ea51ab6775ea49df85a73a0f54287 /src/ext/NetFx/test
parent08f53f409020b12dffaa2aeefa943b667a4b9328 (diff)
downloadwix-a3af25607b56f5ecf21d6712a8367217e5c43eb0.tar.gz
wix-a3af25607b56f5ecf21d6712a8367217e5c43eb0.tar.bz2
wix-a3af25607b56f5ecf21d6712a8367217e5c43eb0.zip
Use "wixext4" instead of "tools" as the root folder in ".wixext.nupkg"s
Fixes 6944
Diffstat (limited to 'src/ext/NetFx/test')
-rw-r--r--src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs16
-rw-r--r--src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj5
2 files changed, 14 insertions, 7 deletions
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
index 8db3db46..6a75f30f 100644
--- a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
+++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
@@ -21,13 +21,19 @@ namespace WixToolsetTest.Netfx
21 var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages"); 21 var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages");
22 var intermediateFolder = Path.Combine(baseFolder, "obj"); 22 var intermediateFolder = Path.Combine(baseFolder, "obj");
23 23
24 var extensionResult = WixRunner.Execute(new[]
25 {
26 "extension", "add",
27 "WixToolset.Bal.wixext"
28 });
29
24 var compileResult = WixRunner.Execute(new[] 30 var compileResult = WixRunner.Execute(new[]
25 { 31 {
26 "build", 32 "build",
27 Path.Combine(bundleSourceFolder, "BundleLatest.wxs"), 33 Path.Combine(bundleSourceFolder, "BundleLatest.wxs"),
28 Path.Combine(bundleSourceFolder, "NetCore3.1.12_x86.wxs"), 34 Path.Combine(bundleSourceFolder, "NetCore3.1.12_x86.wxs"),
29 Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"), 35 Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"),
30 "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), 36 "-ext", "WixToolset.Bal.wixext",
31 "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), 37 "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
32 "-intermediateFolder", intermediateFolder, 38 "-intermediateFolder", intermediateFolder,
33 "-o", bundleFile, 39 "-o", bundleFile,
@@ -48,12 +54,18 @@ namespace WixToolsetTest.Netfx
48 var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages"); 54 var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages");
49 var intermediateFolder = Path.Combine(baseFolder, "obj"); 55 var intermediateFolder = Path.Combine(baseFolder, "obj");
50 56
57 var extensionResult = WixRunner.Execute(new[]
58 {
59 "extension", "add",
60 "WixToolset.Bal.wixext"
61 });
62
51 var compileResult = WixRunner.Execute(new[] 63 var compileResult = WixRunner.Execute(new[]
52 { 64 {
53 "build", 65 "build",
54 Path.Combine(bundleSourceFolder, "BundleLatest_x64.wxs"), 66 Path.Combine(bundleSourceFolder, "BundleLatest_x64.wxs"),
55 Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"), 67 Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"),
56 "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), 68 "-ext", "WixToolset.Bal.wixext",
57 "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), 69 "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
58 "-intermediateFolder", intermediateFolder, 70 "-intermediateFolder", intermediateFolder,
59 "-o", bundleFile, 71 "-o", bundleFile,
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
index e2f97a16..8b13d357 100644
--- a/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
+++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
@@ -16,11 +16,6 @@
16 </ItemGroup> 16 </ItemGroup>
17 17
18 <ItemGroup> 18 <ItemGroup>
19 <PackageReference Include="WixToolset.Bal.wixext" />
20 <PackageReference Include="WixToolset.Core.TestPackage" /> 19 <PackageReference Include="WixToolset.Core.TestPackage" />
21 </ItemGroup> 20 </ItemGroup>
22
23 <Target Name="CopyExtensions" AfterTargets="Build">
24 <Copy DestinationFolder="$(OutputPath)" SourceFiles="@(WixExtension)" />
25 </Target>
26</Project> 21</Project>