4 files changed, 8 insertions, 7 deletions

diff --git a/src/WixToolset.Extensibility/Data/IComponentKeyPath.cs b/src/WixToolset.Extensibility/Data/IComponentKeyPath.cs
index ba660b45..9417b836 100644
--- a/src/WixToolset.Extensibility/Data/IComponentKeyPath.cs
+++ b/src/WixToolset.Extensibility/Data/IComponentKeyPath.cs
@@ -8,6 +8,6 @@ namespace WixToolset.Extensibility.Data
 
         string Id { get; set; }
 
-        ComponentKeyPathType Type { get; set; }
+        PossibleKeyPathType Type { get; set; }
     }
 }
diff --git a/src/WixToolset.Extensibility/Data/ComponentKeyPathType.cs b/src/WixToolset.Extensibility/Data/PossibleKeyPathType.cs
index 58bbb0cf..75ccb1d1 100644
--- a/src/WixToolset.Extensibility/Data/ComponentKeyPathType.cs
+++ b/src/WixToolset.Extensibility/Data/PossibleKeyPathType.cs
@@ -1,8 +1,8 @@
-// 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.
+// 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.
 
 namespace WixToolset.Extensibility.Data
 {
-    public enum ComponentKeyPathType
+    public enum PossibleKeyPathType
     {
         /// <summary>
         /// Not a key path.
diff --git a/src/WixToolset.Extensibility/Services/IParseHelper.cs b/src/WixToolset.Extensibility/Services/IParseHelper.cs
index 36caf192..a4eb3ce7 100644
--- a/src/WixToolset.Extensibility/Services/IParseHelper.cs
+++ b/src/WixToolset.Extensibility/Services/IParseHelper.cs
@@ -6,6 +6,7 @@ namespace WixToolset.Extensibility.Services
     using System.Collections.Generic;
     using System.Xml.Linq;
     using WixToolset.Data;
+    using WixToolset.Data.Tuples;
     using WixToolset.Extensibility.Data;
 
     /// <summary>
@@ -89,7 +90,7 @@ namespace WixToolset.Extensibility.Services
         /// <param name="value">The registry entry value.</param>
         /// <param name="componentId">The component which will control installation/uninstallation of the registry entry.</param>
         /// <param name="escapeLeadingHash">If true, "escape" leading '#' characters so the value is written as a REG_SZ.</param>
-        Identifier CreateRegistryRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, int root, string key, string name, string value, string componentId, bool escapeLeadingHash);
+        Identifier CreateRegistryRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, RegistryRootType root, string key, string name, string value, string componentId, bool escapeLeadingHash);
 
         /// <summary>
         /// Creates a short file/directory name using an identifier and long file/directory name as input.
@@ -220,13 +221,13 @@ namespace WixToolset.Extensibility.Services
         string GetAttributeLongFilename(SourceLineNumber sourceLineNumbers, XAttribute attribute, bool allowWildcards = false, bool allowRelative = false);
 
         /// <summary>
-        /// Gets a RegistryRoot as a MsiInterop.MsidbRegistryRoot value and displays an error for an illegal value.
+        /// Gets a RegistryRootType value and displays an error for an illegal value.
         /// </summary>
         /// <param name="sourceLineNumbers">Source line information about the owner element.</param>
         /// <param name="attribute">The attribute containing the value to get.</param>
         /// <param name="allowHkmu">Whether HKMU is returned as -1 (true), or treated as an error (false).</param>
         /// <returns>The attribute's RegisitryRootType value.</returns>
-        int GetAttributeMsidbRegistryRootValue(SourceLineNumber sourceLineNumbers, XAttribute attribute, bool allowHkmu);
+        RegistryRootType? GetAttributeRegistryRootValue(SourceLineNumber sourceLineNumbers, XAttribute attribute, bool allowHkmu);
 
         /// <summary>
         /// Gets a version value or possibly a binder variable and displays an error for an illegal version value.
diff --git a/src/WixToolset.Extensibility/WixToolset.Extensibility.csproj b/src/WixToolset.Extensibility/WixToolset.Extensibility.csproj
index 31d5ca87..997c10ce 100644
--- a/src/WixToolset.Extensibility/WixToolset.Extensibility.csproj
+++ b/src/WixToolset.Extensibility/WixToolset.Extensibility.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All" />
     <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
   </ItemGroup>
 </Project>