diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-04-27 16:54:28 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-04-28 14:23:08 -0500 |
commit | 681da11cfc9a266304b47b88843cb8a365015c63 (patch) | |
tree | d670f3a45d15d1fe43c8d5dee04b2dac548d8cf6 /src/ext/Util/wixext/UtilCompiler.cs | |
parent | 7860559202d01cef07a9996d2c12606ac8d56221 (diff) | |
download | wix-681da11cfc9a266304b47b88843cb8a365015c63.tar.gz wix-681da11cfc9a266304b47b88843cb8a365015c63.tar.bz2 wix-681da11cfc9a266304b47b88843cb8a365015c63.zip |
Add ability to disable file system redirection for File/DirectorySearch
Fixes 5476
Diffstat (limited to 'src/ext/Util/wixext/UtilCompiler.cs')
-rw-r--r-- | src/ext/Util/wixext/UtilCompiler.cs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/ext/Util/wixext/UtilCompiler.cs b/src/ext/Util/wixext/UtilCompiler.cs index 323e0f6a..d770555f 100644 --- a/src/ext/Util/wixext/UtilCompiler.cs +++ b/src/ext/Util/wixext/UtilCompiler.cs | |||
@@ -999,6 +999,12 @@ namespace WixToolset.Util | |||
999 | case "After": | 999 | case "After": |
1000 | this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after); | 1000 | this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after); |
1001 | break; | 1001 | break; |
1002 | case "DisableFileRedirection": | ||
1003 | if (this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) == YesNoType.Yes) | ||
1004 | { | ||
1005 | attributes |= WixFileSearchAttributes.DisableFileRedirection; | ||
1006 | } | ||
1007 | break; | ||
1002 | case "Path": | 1008 | case "Path": |
1003 | path = this.ParseHelper.GetAttributeLongFilename(sourceLineNumbers, attrib, false, true); | 1009 | path = this.ParseHelper.GetAttributeLongFilename(sourceLineNumbers, attrib, false, true); |
1004 | break; | 1010 | break; |
@@ -1104,6 +1110,12 @@ namespace WixToolset.Util | |||
1104 | case "After": | 1110 | case "After": |
1105 | this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after); | 1111 | this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after); |
1106 | break; | 1112 | break; |
1113 | case "DisableFileRedirection": | ||
1114 | if (this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) == YesNoType.Yes) | ||
1115 | { | ||
1116 | attributes |= WixFileSearchAttributes.DisableFileRedirection; | ||
1117 | } | ||
1118 | break; | ||
1107 | case "Path": | 1119 | case "Path": |
1108 | path = this.ParseHelper.GetAttributeLongFilename(sourceLineNumbers, attrib, false, true); | 1120 | path = this.ParseHelper.GetAttributeLongFilename(sourceLineNumbers, attrib, false, true); |
1109 | break; | 1121 | break; |