Rename ComponentKeyPathType to PossibleKeyPathType
Rob Mensching committed
May 8, 2019 at 13:41 UTC
2c15f33036489464f6ebd7cc1584e1975e765899
4 files changed
+8
-7
src/WixToolset.Extensibility/Data/IComponentKeyPath.cs
+1
-1
@@ -8,6 +8,6 @@ namespace WixToolset.Extensibility.Data
8
9
string Id { get; set; }
10
11
- ComponentKeyPathType Type { get; set; }
11
+ PossibleKeyPathType Type { get; set; }
12
}
13
}
src/WixToolset.Extensibility/Data/PossibleKeyPathType.cs
renamed
+2
-2
@@ -1,8 +1,8 @@
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.
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.Extensibility.Data
4
{
5
- public enum ComponentKeyPathType
5
+ public enum PossibleKeyPathType
6
{
7
/// <summary>
8
/// Not a key path.
src/WixToolset.Extensibility/Services/IParseHelper.cs
+4
-3
@@ -6,6 +6,7 @@ namespace WixToolset.Extensibility.Services
6
using System.Collections.Generic;
7
using System.Xml.Linq;
8
using WixToolset.Data;
9
+ using WixToolset.Data.Tuples;
10
using WixToolset.Extensibility.Data;
11
12
/// <summary>
@@ -89,7 +90,7 @@ namespace WixToolset.Extensibility.Services
90
/// <param name="value">The registry entry value.</param>
91
/// <param name="componentId">The component which will control installation/uninstallation of the registry entry.</param>
92
/// <param name="escapeLeadingHash">If true, "escape" leading '#' characters so the value is written as a REG_SZ.</param>
92
- Identifier CreateRegistryRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, int root, string key, string name, string value, string componentId, bool escapeLeadingHash);
93
+ Identifier CreateRegistryRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, RegistryRootType root, string key, string name, string value, string componentId, bool escapeLeadingHash);
94
95
/// <summary>
96
/// Creates a short file/directory name using an identifier and long file/directory name as input.
@@ -220,13 +221,13 @@ namespace WixToolset.Extensibility.Services
221
string GetAttributeLongFilename(SourceLineNumber sourceLineNumbers, XAttribute attribute, bool allowWildcards = false, bool allowRelative = false);
222
223
/// <summary>
223
- /// Gets a RegistryRoot as a MsiInterop.MsidbRegistryRoot value and displays an error for an illegal value.
224
+ /// Gets a RegistryRootType value and displays an error for an illegal value.
225
/// </summary>
226
/// <param name="sourceLineNumbers">Source line information about the owner element.</param>
227
/// <param name="attribute">The attribute containing the value to get.</param>
228
/// <param name="allowHkmu">Whether HKMU is returned as -1 (true), or treated as an error (false).</param>
229
/// <returns>The attribute's RegisitryRootType value.</returns>
229
- int GetAttributeMsidbRegistryRootValue(SourceLineNumber sourceLineNumbers, XAttribute attribute, bool allowHkmu);
230
+ RegistryRootType? GetAttributeRegistryRootValue(SourceLineNumber sourceLineNumbers, XAttribute attribute, bool allowHkmu);
231
232
/// <summary>
233
/// Gets a version value or possibly a binder variable and displays an error for an illegal version value.
src/WixToolset.Extensibility/WixToolset.Extensibility.csproj
+1
-1
@@ -15,7 +15,7 @@
15
</ItemGroup>
16
17
<ItemGroup>
18
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All" />
18
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All" />
19
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
20
</ItemGroup>
21
</Project>