diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-12-16 18:01:23 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-12-16 21:24:41 -0600 |
commit | 8e08acb229ade411b7418df63b14198220aaaaa7 (patch) | |
tree | 1a0bc5a01dc33c6a0a0b9f13f25f5488c9f8e288 /src | |
parent | 950ccc8fc44cc67f1b3b37e27a34eb30d1cdfa98 (diff) | |
download | wix-8e08acb229ade411b7418df63b14198220aaaaa7.tar.gz wix-8e08acb229ade411b7418df63b14198220aaaaa7.tar.bz2 wix-8e08acb229ade411b7418df63b14198220aaaaa7.zip |
Add GetCanonicalRelativePath.
Diffstat (limited to 'src')
-rw-r--r-- | src/WixToolset.Extensibility/Services/IBackendHelper.cs | 11 | ||||
-rw-r--r-- | src/WixToolset.Extensibility/Services/IParseHelper.cs | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/src/WixToolset.Extensibility/Services/IBackendHelper.cs b/src/WixToolset.Extensibility/Services/IBackendHelper.cs index 26023674..bfec5256 100644 --- a/src/WixToolset.Extensibility/Services/IBackendHelper.cs +++ b/src/WixToolset.Extensibility/Services/IBackendHelper.cs | |||
@@ -36,6 +36,17 @@ namespace WixToolset.Extensibility.Services | |||
36 | IResolvedDirectory CreateResolvedDirectory(string directoryParent, string name); | 36 | IResolvedDirectory CreateResolvedDirectory(string directoryParent, string name); |
37 | 37 | ||
38 | /// <summary> | 38 | /// <summary> |
39 | /// Validates path is relative and canonicalizes it. | ||
40 | /// For example, "a\..\c\.\d.exe" => "c\d.exe". | ||
41 | /// </summary> | ||
42 | /// <param name="sourceLineNumbers"></param> | ||
43 | /// <param name="elementName"></param> | ||
44 | /// <param name="attributeName"></param> | ||
45 | /// <param name="relativePath"></param> | ||
46 | /// <returns>The original value if not relative, otherwise the canonicalized relative path.</returns> | ||
47 | string GetCanonicalRelativePath(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string relativePath); | ||
48 | |||
49 | /// <summary> | ||
39 | /// Creates a tracked file. | 50 | /// Creates a tracked file. |
40 | /// </summary> | 51 | /// </summary> |
41 | /// <param name="path">Destination path for the build output.</param> | 52 | /// <param name="path">Destination path for the build output.</param> |
diff --git a/src/WixToolset.Extensibility/Services/IParseHelper.cs b/src/WixToolset.Extensibility/Services/IParseHelper.cs index a7c5eb1b..08bcd911 100644 --- a/src/WixToolset.Extensibility/Services/IParseHelper.cs +++ b/src/WixToolset.Extensibility/Services/IParseHelper.cs | |||
@@ -341,6 +341,17 @@ namespace WixToolset.Extensibility.Services | |||
341 | YesNoDefaultType GetAttributeYesNoDefaultValue(SourceLineNumber sourceLineNumbers, XAttribute attribute); | 341 | YesNoDefaultType GetAttributeYesNoDefaultValue(SourceLineNumber sourceLineNumbers, XAttribute attribute); |
342 | 342 | ||
343 | /// <summary> | 343 | /// <summary> |
344 | /// Validates path is relative and canonicalizes it. | ||
345 | /// For example, "a\..\c\.\d.exe" => "c\d.exe". | ||
346 | /// </summary> | ||
347 | /// <param name="sourceLineNumbers"></param> | ||
348 | /// <param name="elementName"></param> | ||
349 | /// <param name="attributeName"></param> | ||
350 | /// <param name="relativePath"></param> | ||
351 | /// <returns>The original value if not relative, otherwise the canonicalized relative path.</returns> | ||
352 | string GetCanonicalRelativePath(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string relativePath); | ||
353 | |||
354 | /// <summary> | ||
344 | /// Gets a source line number for an element. | 355 | /// Gets a source line number for an element. |
345 | /// </summary> | 356 | /// </summary> |
346 | /// <param name="element">Element to get source line number.</param> | 357 | /// <param name="element">Element to get source line number.</param> |