diff options
| author | Rob Mensching <rob@firegiant.com> | 2022-03-02 11:37:29 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2022-03-02 12:30:07 -0800 |
| commit | 726013926b7cef670d228fabb0a65c6a13fc5835 (patch) | |
| tree | 11b41ba84a3af10f0998bb0b6b16b789e9882adf /src/api | |
| parent | 8bd6ae43c8e79bf8e715f4857b4ae9a7ba388596 (diff) | |
| download | wix-726013926b7cef670d228fabb0a65c6a13fc5835.tar.gz wix-726013926b7cef670d228fabb0a65c6a13fc5835.tar.bz2 wix-726013926b7cef670d228fabb0a65c6a13fc5835.zip | |
Set ExePackage/@Uninstallable in bundle manifests
Diffstat (limited to 'src/api')
| -rw-r--r-- | src/api/api.v3.ncrunchsolution | 6 | ||||
| -rw-r--r-- | src/api/wix/WixToolset.Data/Symbols/WixBundleExePackageSymbol.cs | 4 | ||||
| -rw-r--r-- | src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs | 5 |
3 files changed, 13 insertions, 2 deletions
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 @@ | |||
| 1 | <SolutionConfiguration> | ||
| 2 | <Settings> | ||
| 3 | <AllowParallelTestExecution>True</AllowParallelTestExecution> | ||
| 4 | <SolutionConfigured>True</SolutionConfigured> | ||
| 5 | </Settings> | ||
| 6 | </SolutionConfiguration> \ 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 | |||
| 89 | set => this.Set((int)WixBundleExePackageSymbolFields.ExeProtocol, value); | 89 | set => this.Set((int)WixBundleExePackageSymbolFields.ExeProtocol, value); |
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | public bool Repairable => !String.IsNullOrEmpty(this.RepairCommand); | 92 | public bool Repairable => this.RepairCommand != null; |
| 93 | |||
| 94 | public bool Uninstallable => this.UninstallCommand != null; | ||
| 93 | } | 95 | } |
| 94 | } | 96 | } |
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 | |||
| 25 | 25 | ||
| 26 | section.AddSymbol(new ComponentSymbol(sln, new Identifier(AccessModifier.Global, "TestComponent")) | 26 | section.AddSymbol(new ComponentSymbol(sln, new Identifier(AccessModifier.Global, "TestComponent")) |
| 27 | { | 27 | { |
| 28 | ComponentId = new Guid(1, 0, 0, new byte[8]).ToString("B"), | 28 | ComponentId = String.Empty, |
| 29 | DirectoryRef = "TestFolder", | 29 | DirectoryRef = "TestFolder", |
| 30 | Location = ComponentLocation.Either, | 30 | Location = ComponentLocation.Either, |
| 31 | KeyPath = null, | ||
| 31 | }); | 32 | }); |
| 32 | 33 | ||
| 33 | var intermediate = new Intermediate("TestIntermediate", IntermediateLevels.Compiled, new[] { section }, null); | 34 | var intermediate = new Intermediate("TestIntermediate", IntermediateLevels.Compiled, new[] { section }, null); |
| @@ -50,8 +51,10 @@ namespace WixToolsetTest.Data | |||
| 50 | 51 | ||
| 51 | Assert.Equal("TestComponent", symbol.Id.Id); | 52 | Assert.Equal("TestComponent", symbol.Id.Id); |
| 52 | Assert.Equal(AccessModifier.Global, symbol.Id.Access); | 53 | Assert.Equal(AccessModifier.Global, symbol.Id.Access); |
| 54 | Assert.Equal(String.Empty, symbol.ComponentId); | ||
| 53 | Assert.Equal("TestFolder", symbol.DirectoryRef); | 55 | Assert.Equal("TestFolder", symbol.DirectoryRef); |
| 54 | Assert.Equal(ComponentLocation.Either, symbol.Location); | 56 | Assert.Equal(ComponentLocation.Either, symbol.Location); |
| 57 | Assert.Null(symbol.KeyPath); | ||
| 55 | } | 58 | } |
| 56 | finally | 59 | finally |
| 57 | { | 60 | { |
