From 726013926b7cef670d228fabb0a65c6a13fc5835 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 2 Mar 2022 11:37:29 -0800 Subject: Set ExePackage/@Uninstallable in bundle manifests --- src/api/api.v3.ncrunchsolution | 6 ++++++ src/api/wix/WixToolset.Data/Symbols/WixBundleExePackageSymbol.cs | 4 +++- src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs | 5 ++++- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 src/api/api.v3.ncrunchsolution (limited to 'src/api') diff --git a/src/api/api.v3.ncrunchsolution b/src/api/api.v3.ncrunchsolution new file mode 100644 index 00000000..10420ac9 --- /dev/null +++ b/src/api/api.v3.ncrunchsolution @@ -0,0 +1,6 @@ + + + True + True + + \ No newline at end of file diff --git a/src/api/wix/WixToolset.Data/Symbols/WixBundleExePackageSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixBundleExePackageSymbol.cs index 8a8cff1b..64a21321 100644 --- a/src/api/wix/WixToolset.Data/Symbols/WixBundleExePackageSymbol.cs +++ b/src/api/wix/WixToolset.Data/Symbols/WixBundleExePackageSymbol.cs @@ -89,6 +89,8 @@ namespace WixToolset.Data.Symbols set => this.Set((int)WixBundleExePackageSymbolFields.ExeProtocol, value); } - public bool Repairable => !String.IsNullOrEmpty(this.RepairCommand); + public bool Repairable => this.RepairCommand != null; + + public bool Uninstallable => this.UninstallCommand != null; } } diff --git a/src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs b/src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs index cd485fd2..cda5d79a 100644 --- a/src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs +++ b/src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs @@ -25,9 +25,10 @@ namespace WixToolsetTest.Data section.AddSymbol(new ComponentSymbol(sln, new Identifier(AccessModifier.Global, "TestComponent")) { - ComponentId = new Guid(1, 0, 0, new byte[8]).ToString("B"), + ComponentId = String.Empty, DirectoryRef = "TestFolder", Location = ComponentLocation.Either, + KeyPath = null, }); var intermediate = new Intermediate("TestIntermediate", IntermediateLevels.Compiled, new[] { section }, null); @@ -50,8 +51,10 @@ namespace WixToolsetTest.Data Assert.Equal("TestComponent", symbol.Id.Id); Assert.Equal(AccessModifier.Global, symbol.Id.Access); + Assert.Equal(String.Empty, symbol.ComponentId); Assert.Equal("TestFolder", symbol.DirectoryRef); Assert.Equal(ComponentLocation.Either, symbol.Location); + Assert.Null(symbol.KeyPath); } finally { -- cgit v1.2.3-55-g6feb