diff options
| author | Nir Bar <nir.bar@panel-sw.co.il> | 2020-12-21 05:05:45 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-12-21 16:49:04 -0600 |
| commit | d085e938317c80f62a3b484d20ed1a6cf89bb59d (patch) | |
| tree | d993e2bf90bc754d62b9731981b3cb056e1bb7b9 /src/WixToolset.Core | |
| parent | 85deb61f666f6817c1a137ace4d666c8ae2940fb (diff) | |
| download | wix-d085e938317c80f62a3b484d20ed1a6cf89bb59d.tar.gz wix-d085e938317c80f62a3b484d20ed1a6cf89bb59d.tar.bz2 wix-d085e938317c80f62a3b484d20ed1a6cf89bb59d.zip | |
Add CanExtractBundleWithDetachedContainer test.
Diffstat (limited to 'src/WixToolset.Core')
| -rw-r--r-- | src/WixToolset.Core/Compiler_Bundle.cs | 12 | ||||
| -rw-r--r-- | src/WixToolset.Core/IUnbinder.cs | 12 |
2 files changed, 22 insertions, 2 deletions
diff --git a/src/WixToolset.Core/Compiler_Bundle.cs b/src/WixToolset.Core/Compiler_Bundle.cs index 86fec16e..b8386138 100644 --- a/src/WixToolset.Core/Compiler_Bundle.cs +++ b/src/WixToolset.Core/Compiler_Bundle.cs | |||
| @@ -566,9 +566,17 @@ namespace WixToolset.Core | |||
| 566 | break; | 566 | break; |
| 567 | case "Type": | 567 | case "Type": |
| 568 | var typeString = this.Core.GetAttributeValue(sourceLineNumbers, attrib); | 568 | var typeString = this.Core.GetAttributeValue(sourceLineNumbers, attrib); |
| 569 | if (!Enum.TryParse<ContainerType>(typeString, out type)) | 569 | switch (typeString) |
| 570 | { | 570 | { |
| 571 | this.Core.Write(ErrorMessages.IllegalAttributeValueWithLegalList(sourceLineNumbers, node.Name.LocalName, "Type", typeString, "attached, detached")); | 571 | case "attached": |
| 572 | type = ContainerType.Attached; | ||
| 573 | break; | ||
| 574 | case "detached": | ||
| 575 | type = ContainerType.Detached; | ||
| 576 | break; | ||
| 577 | default: | ||
| 578 | this.Core.Write(ErrorMessages.IllegalAttributeValueWithLegalList(sourceLineNumbers, node.Name.LocalName, "Type", typeString, "attached, detached")); | ||
| 579 | break; | ||
| 572 | } | 580 | } |
| 573 | break; | 581 | break; |
| 574 | default: | 582 | default: |
diff --git a/src/WixToolset.Core/IUnbinder.cs b/src/WixToolset.Core/IUnbinder.cs new file mode 100644 index 00000000..2b4daaa5 --- /dev/null +++ b/src/WixToolset.Core/IUnbinder.cs | |||
| @@ -0,0 +1,12 @@ | |||
| 1 | // 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. | ||
| 2 | |||
| 3 | namespace WixToolset.Core | ||
| 4 | { | ||
| 5 | using WixToolset.Data; | ||
| 6 | |||
| 7 | #pragma warning disable 1591 // TODO: add documentation, move into Extensibility | ||
| 8 | public interface IUnbinder | ||
| 9 | { | ||
| 10 | Intermediate Unbind(string file, OutputType outputType, string exportBasePath); | ||
| 11 | } | ||
| 12 | } | ||
