Merge branch 'develop'

pyrevitlabs · Mar 23, 2021 · 9eb5df2 · 9eb5df2
2 parents 6f3e004 + e53ab8d
commit 9eb5df2
Show file tree

Hide file tree

Showing 250 changed files with 4,093 additions and 1,221 deletions.
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/bin/engines/CPY378/pyRevitLabs.PythonNet.dll b/bin/engines/CPY378/pyRevitLabs.PythonNet.dll
diff --git a/bin/engines/CPY385/pyRevitLabs.PythonNet.dll b/bin/engines/CPY385/pyRevitLabs.PythonNet.dll
diff --git a/bin/engines/IPY2710/pyRevitLoader.dll b/bin/engines/IPY2710/pyRevitLoader.dll
diff --git a/bin/engines/IPY2710/pyRevitRunner.dll b/bin/engines/IPY2710/pyRevitRunner.dll
diff --git a/bin/engines/IPY2711PR/pyRevitLoader.dll b/bin/engines/IPY2711PR/pyRevitLoader.dll
diff --git a/bin/engines/IPY2711PR/pyRevitRunner.dll b/bin/engines/IPY2711PR/pyRevitRunner.dll
diff --git a/bin/engines/IPY273/pyRevitLoader.dll b/bin/engines/IPY273/pyRevitLoader.dll
diff --git a/bin/engines/IPY273/pyRevitRunner.dll b/bin/engines/IPY273/pyRevitRunner.dll
diff --git a/bin/engines/IPY277/pyRevitLoader.dll b/bin/engines/IPY277/pyRevitLoader.dll
diff --git a/bin/engines/IPY277/pyRevitRunner.dll b/bin/engines/IPY277/pyRevitRunner.dll
diff --git a/bin/engines/IPY278/pyRevitLoader.dll b/bin/engines/IPY278/pyRevitLoader.dll
diff --git a/bin/engines/IPY278/pyRevitRunner.dll b/bin/engines/IPY278/pyRevitRunner.dll
diff --git a/bin/engines/IPY279/pyRevitLoader.dll b/bin/engines/IPY279/pyRevitLoader.dll
diff --git a/bin/engines/IPY279/pyRevitRunner.dll b/bin/engines/IPY279/pyRevitRunner.dll
diff --git a/bin/git2-7ce88e6.dll b/bin/git2-7ce88e6.dll
diff --git a/bin/pyRevitLabs.Common.dll b/bin/pyRevitLabs.Common.dll
diff --git a/bin/pyRevitLabs.CommonCLI.dll b/bin/pyRevitLabs.CommonCLI.dll
diff --git a/bin/pyRevitLabs.CommonWPF.dll b/bin/pyRevitLabs.CommonWPF.dll
diff --git a/bin/pyRevitLabs.DeffrelDB.dll b/bin/pyRevitLabs.DeffrelDB.dll
diff --git a/bin/pyRevitLabs.Emojis.dll b/bin/pyRevitLabs.Emojis.dll
diff --git a/bin/pyRevitLabs.Language.dll b/bin/pyRevitLabs.Language.dll
diff --git a/bin/pyRevitLabs.PyRevit.dll b/bin/pyRevitLabs.PyRevit.dll
diff --git a/bin/pyRevitLabs.TargetApps.AutoCAD.dll b/bin/pyRevitLabs.TargetApps.AutoCAD.dll
diff --git a/bin/pyRevitLabs.TargetApps.Navisworks.dll b/bin/pyRevitLabs.TargetApps.Navisworks.dll
diff --git a/bin/pyRevitLabs.TargetApps.Revit.dll b/bin/pyRevitLabs.TargetApps.Revit.dll
diff --git a/bin/pyrevit-autocomplete.exe b/bin/pyrevit-autocomplete.exe
diff --git a/bin/pyrevit-doctor.exe b/bin/pyrevit-doctor.exe
diff --git a/bin/pyrevit-products.json b/bin/pyrevit-products.json
@@ -1,4 +1,10 @@
 [
+ {
+  "product": "pyRevit",
+  "release": "4.8.6",
+  "version": "4.8.6",
+  "key": "{32B7C208-2ACC-4D2B-9C75-5BAEE22E7F85}"
+ },
  {
   "product": "pyRevit",
   "release": "4.8.5",
@@ -221,6 +227,12 @@
   "version": "4.6.1",
   "key": "{EF91A585-DC0C-43B8-B88B-4C130F430E84}"
  },
+ {
+  "product": "pyRevit CLI",
+  "release": "4.8.6",
+  "version": "4.8.6",
+  "key": "{AB14082F-168E-45DE-98A7-7C99DB00FFE7}"
+ },
  {
   "product": "pyRevit CLI",
   "release": "4.8.5",

diff --git a/bin/pyrevit-telemetryserver.exe b/bin/pyrevit-telemetryserver.exe
diff --git a/bin/pyrevit.exe b/bin/pyrevit.exe
diff --git a/dev/_release.py b/dev/_release.py
@@ -73,15 +73,6 @@ def _update_product_data(ver, key, cli=False):
         json.dump([x._asdict() for x in pdata], dfile, indent=True)
 
 
-def _installer_build():
-    installer = "advancedinstaller.com"
-    for script in [configs.PYREVIT_AIPFILE, configs.PYREVIT_CLI_AIPFILE]:
-        print(f"Building installer {script}")
-        utils.system(
-            [installer, "/build", op.abspath(script),]
-        )
-
-
 def _get_binaries():
     for dirname, _, files in os.walk(configs.BINPATH):
         for fn in files:
@@ -115,6 +106,16 @@ def _commit_changes(msg):
     utils.system(['git', 'commit', '-m', msg])
 
 
+def build_installers(args: Dict[str, str]):
+    """Build pyRevit and CLI installers"""
+    installer = "advancedinstaller.com"
+    for script in [configs.PYREVIT_AIPFILE, configs.PYREVIT_CLI_AIPFILE]:
+        print(f"Building installer {script}")
+        utils.system(
+            [installer, "/build", op.abspath(script),]
+        )
+
+
 def create_release(args: Dict[str, str]):
     """Create pyRevit release (build all, create installers)"""
     utils.ensure_windows()
@@ -147,4 +148,4 @@ def create_release(args: Dict[str, str]):
 
     # now build the installers
     # installer are signed by the installer builder
-    _installer_build()
+    build_installers(args)
diff --git a/dev/pyRevit/AssemblyVersion.cs b/dev/pyRevit/AssemblyVersion.cs
@@ -2,5 +2,5 @@
 using System.Runtime.InteropServices;
 using System.Runtime.CompilerServices;
 
-[assembly: AssemblyVersion("4.8.5")]
-[assembly: AssemblyFileVersion("4.8.5")]
+[assembly: AssemblyVersion("4.8.6")]
+[assembly: AssemblyFileVersion("4.8.6")]
diff --git a/dev/pyRevitLabs.PyRevit.Runtime/pyRevitLabs.PyRevit.Runtime.csproj b/dev/pyRevitLabs.PyRevit.Runtime/pyRevitLabs.PyRevit.Runtime.csproj
@@ -57,26 +57,23 @@
     <Reference Include="System.Windows.Interactivity">
       <HintPath>..\..\bin\System.Windows.Interactivity.dll</HintPath>
     </Reference>
-    <Reference Include="IKVM.Reflection">
-      <HintPath>..\..\bin\engines\2710\IKVM.Reflection.dll</HintPath>
-    </Reference>
     <Reference Include="IronPython">
-      <HintPath>..\..\bin\engines\2710\IronPython.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.IronPython.dll</HintPath>
     </Reference>
     <Reference Include="IronPython.Modules">
-      <HintPath>..\..\bin\engines\2710\IronPython.Modules.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.IronPython.Modules.dll</HintPath>
     </Reference>
     <Reference Include="IronPython.SQLite">
-      <HintPath>..\..\bin\engines\2710\IronPython.SQLite.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.IronPython.SQLite.dll</HintPath>
     </Reference>
     <Reference Include="IronPython.Wpf">
-      <HintPath>..\..\bin\engines\2710\IronPython.Wpf.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.IronPython.Wpf.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Dynamic">
-      <HintPath>..\..\bin\engines\2710\Microsoft.Dynamic.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.Microsoft.Dynamic.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Scripting">
-      <HintPath>..\..\bin\engines\2710\Microsoft.Scripting.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.Microsoft.Scripting.dll</HintPath>
     </Reference>
     <Reference Include="pyRevitLabs.Common">
       <HintPath>..\..\bin\pyRevitLabs.Common.dll</HintPath>
@@ -100,7 +97,7 @@
       <HintPath>..\..\bin\pyRevitLabs.TargetApps.Revit.dll</HintPath>
     </Reference>
     <Reference Include="pyRevitLoader">
-      <HintPath>..\..\bin\engines\2710\pyRevitLoader.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLoader.dll</HintPath>
     </Reference>
     <Reference Include="pyRevitLabs.PythonNet">
       <HintPath>..\modules\pyRevitLabs.Python.Net/src/runtime/bin/pyRevitLabs.PythonNet.dll</HintPath>

diff --git a/dev/pyRevitLabs.PyRevit.Runtime/pyRevitLabs.PyRevit.Runtime2017.csproj b/dev/pyRevitLabs.PyRevit.Runtime/pyRevitLabs.PyRevit.Runtime2017.csproj
@@ -57,26 +57,23 @@
     <Reference Include="System.Windows.Interactivity">
       <HintPath>..\..\bin\System.Windows.Interactivity.dll</HintPath>
     </Reference>
-    <Reference Include="IKVM.Reflection">
-      <HintPath>..\..\bin\engines\2710\IKVM.Reflection.dll</HintPath>
-    </Reference>
     <Reference Include="IronPython">
-      <HintPath>..\..\bin\engines\2710\IronPython.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.IronPython.dll</HintPath>
     </Reference>
     <Reference Include="IronPython.Modules">
-      <HintPath>..\..\bin\engines\2710\IronPython.Modules.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.IronPython.Modules.dll</HintPath>
     </Reference>
     <Reference Include="IronPython.SQLite">
-      <HintPath>..\..\bin\engines\2710\IronPython.SQLite.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.IronPython.SQLite.dll</HintPath>
     </Reference>
     <Reference Include="IronPython.Wpf">
-      <HintPath>..\..\bin\engines\2710\IronPython.Wpf.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.IronPython.Wpf.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Dynamic">
-      <HintPath>..\..\bin\engines\2710\Microsoft.Dynamic.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.Microsoft.Dynamic.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Scripting">
-      <HintPath>..\..\bin\engines\2710\Microsoft.Scripting.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.Microsoft.Scripting.dll</HintPath>
     </Reference>
     <Reference Include="pyRevitLabs.Common">
       <HintPath>..\..\bin\pyRevitLabs.Common.dll</HintPath>

diff --git a/dev/pyRevitLabs.PyRevit.Runtime/pyRevitLabs.PyRevit.Runtime2018.csproj b/dev/pyRevitLabs.PyRevit.Runtime/pyRevitLabs.PyRevit.Runtime2018.csproj
@@ -57,26 +57,23 @@
     <Reference Include="System.Windows.Interactivity">
       <HintPath>..\..\bin\System.Windows.Interactivity.dll</HintPath>
     </Reference>
-    <Reference Include="IKVM.Reflection">
-      <HintPath>..\..\bin\engines\2710\IKVM.Reflection.dll</HintPath>
-    </Reference>
     <Reference Include="IronPython">
-      <HintPath>..\..\bin\engines\2710\IronPython.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.IronPython.dll</HintPath>
     </Reference>
     <Reference Include="IronPython.Modules">
-      <HintPath>..\..\bin\engines\2710\IronPython.Modules.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.IronPython.Modules.dll</HintPath>
     </Reference>
     <Reference Include="IronPython.SQLite">
-      <HintPath>..\..\bin\engines\2710\IronPython.SQLite.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.IronPython.SQLite.dll</HintPath>
     </Reference>
     <Reference Include="IronPython.Wpf">
-      <HintPath>..\..\bin\engines\2710\IronPython.Wpf.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.IronPython.Wpf.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Dynamic">
-      <HintPath>..\..\bin\engines\2710\Microsoft.Dynamic.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.Microsoft.Dynamic.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Scripting">
-      <HintPath>..\..\bin\engines\2710\Microsoft.Scripting.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.Microsoft.Scripting.dll</HintPath>
     </Reference>
     <Reference Include="pyRevitLabs.Common">
       <HintPath>..\..\bin\pyRevitLabs.Common.dll</HintPath>

diff --git a/dev/pyRevitLabs.PyRevit.Runtime/pyRevitLabs.PyRevit.Runtime2019.csproj b/dev/pyRevitLabs.PyRevit.Runtime/pyRevitLabs.PyRevit.Runtime2019.csproj
@@ -57,26 +57,23 @@
     <Reference Include="System.Windows.Interactivity">
       <HintPath>..\..\bin\System.Windows.Interactivity.dll</HintPath>
     </Reference>
-    <Reference Include="IKVM.Reflection">
-      <HintPath>..\..\bin\engines\2710\IKVM.Reflection.dll</HintPath>
-    </Reference>
     <Reference Include="IronPython">
-      <HintPath>..\..\bin\engines\2710\IronPython.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.IronPython.dll</HintPath>
     </Reference>
     <Reference Include="IronPython.Modules">
-      <HintPath>..\..\bin\engines\2710\IronPython.Modules.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.IronPython.Modules.dll</HintPath>
     </Reference>
     <Reference Include="IronPython.SQLite">
-      <HintPath>..\..\bin\engines\2710\IronPython.SQLite.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.IronPython.SQLite.dll</HintPath>
     </Reference>
     <Reference Include="IronPython.Wpf">
-      <HintPath>..\..\bin\engines\2710\IronPython.Wpf.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.IronPython.Wpf.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Dynamic">
-      <HintPath>..\..\bin\engines\2710\Microsoft.Dynamic.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.Microsoft.Dynamic.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Scripting">
-      <HintPath>..\..\bin\engines\2710\Microsoft.Scripting.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.Microsoft.Scripting.dll</HintPath>
     </Reference>
     <Reference Include="pyRevitLabs.Common">
       <HintPath>..\..\bin\pyRevitLabs.Common.dll</HintPath>

diff --git a/dev/pyRevitLabs.PyRevit.Runtime/pyRevitLabs.PyRevit.Runtime2020.csproj b/dev/pyRevitLabs.PyRevit.Runtime/pyRevitLabs.PyRevit.Runtime2020.csproj
@@ -57,26 +57,23 @@
     <Reference Include="System.Windows.Interactivity">
       <HintPath>..\..\bin\System.Windows.Interactivity.dll</HintPath>
     </Reference>
-    <Reference Include="IKVM.Reflection">
-      <HintPath>..\..\bin\engines\2710\IKVM.Reflection.dll</HintPath>
-    </Reference>
     <Reference Include="IronPython">
-      <HintPath>..\..\bin\engines\2710\IronPython.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.IronPython.dll</HintPath>
     </Reference>
     <Reference Include="IronPython.Modules">
-      <HintPath>..\..\bin\engines\2710\IronPython.Modules.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.IronPython.Modules.dll</HintPath>
     </Reference>
     <Reference Include="IronPython.SQLite">
-      <HintPath>..\..\bin\engines\2710\IronPython.SQLite.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.IronPython.SQLite.dll</HintPath>
     </Reference>
     <Reference Include="IronPython.Wpf">
-      <HintPath>..\..\bin\engines\2710\IronPython.Wpf.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.IronPython.Wpf.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Dynamic">
-      <HintPath>..\..\bin\engines\2710\Microsoft.Dynamic.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.Microsoft.Dynamic.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Scripting">
-      <HintPath>..\..\bin\engines\2710\Microsoft.Scripting.dll</HintPath>
+      <HintPath>..\..\bin\engines\IPY2711PR\pyRevitLabs.Microsoft.Scripting.dll</HintPath>
     </Reference>
     <Reference Include="pyRevitLabs.Common">
       <HintPath>..\..\bin\pyRevitLabs.Common.dll</HintPath>

diff --git a/dev/pyRevitLabs/pyRevitCLI/PyRevitCLI.cs b/dev/pyRevitLabs/pyRevitCLI/PyRevitCLI.cs
@@ -204,8 +204,7 @@ private static void ProcessArguments() {
                         repoUrl: TryGetValue("--source"),
                         imagePath: TryGetValue("--image"),
                         destPath: TryGetValue("--dest"),
-                        username: TryGetValue("--username"),
-                        password: TryGetValue("--password")
+                        credentials: TryGetCredentials()
                     );
             }
 
@@ -278,11 +277,10 @@ private static void ProcessArguments() {
 
                 else if (all("update"))
                     PyRevitCLICloneCmds.UpdateClone(
-                        allClones: arguments["--all"].IsTrue,
-                        cloneName: TryGetValue("<clone_name>"),
-                        username: TryGetValue("--username"),
-                        password: TryGetValue("--password")
-                        );
+                            allClones: arguments["--all"].IsTrue,
+                            cloneName: TryGetValue("<clone_name>"),
+                            credentials: TryGetCredentials()
+                            );
 
                 else
                     PyRevitCLICloneCmds.PrintClones();
@@ -362,18 +360,16 @@ private static void ProcessArguments() {
                 if (IsHelpMode)
                     PyRevitCLIAppHelps.PrintHelp(PyRevitCLICommandType.Extend);
 
-                else if (any("ui", "lib")) {
+                else if (any("ui", "lib"))
                     PyRevitCLIExtensionCmds.Extend(
                         ui: arguments["ui"].IsTrue,
                         lib: arguments["lib"].IsTrue,
                         extName: TryGetValue("<extension_name>"),
                         destPath: TryGetValue("--dest"),
                         repoUrl: TryGetValue("<repo_url>"),
                         branchName: TryGetValue("--branch"),
-                        username: TryGetValue("--username"),
-                        password: TryGetValue("--password")
+                        credentials: TryGetCredentials()
                     );
-                }
 
                 else
                     PyRevitCLIExtensionCmds.Extend(
@@ -460,11 +456,10 @@ private static void ProcessArguments() {
 
                 else if (all("update"))
                     PyRevitCLIExtensionCmds.UpdateExtension(
-                        all: arguments["--all"].IsTrue,
-                        extName: TryGetValue("<extension_name>"),
-                        username: TryGetValue("--username"),
-                        password: TryGetValue("--password")
-                    );
+                            all: arguments["--all"].IsTrue,
+                            extName: TryGetValue("<extension_name>"),
+                            credentials: TryGetCredentials()
+                        );
 
                 else if (IsHelpMode)
                     PyRevitCLIAppHelps.PrintHelp(PyRevitCLICommandType.Extensions);
@@ -921,6 +916,21 @@ internal static string TryGetValue(string key, string defaultValue = null) {
             return arguments[key] != null ? arguments[key].Value as string : defaultValue;
         }
 
+        internal static GitInstallerCredentials TryGetCredentials() {
+            GitInstallerCredentials credentials = null;
+            if (TryGetValue("--password") is string password)
+                credentials = new GitInstallerUsernamePasswordCredentials {
+                    Username = TryGetValue("--username"),
+                    Password = password
+                };
+            else if (TryGetValue("--token") is string accessToken)
+                credentials = new GitInstallerAccessTokenCredentials {
+                    AccessToken = accessToken
+                };
+
+            return credentials;
+        }
+
         // private:
         private static void PrintArguments(IDictionary<string, ValueObject> arguments) {
             var activeArgs = arguments.Where(x => x.Value != null && (x.Value.IsTrue || x.Value.IsString));

diff --git a/dev/pyRevitLabs/pyRevitCLI/PyRevitCLICloneCmds.cs b/dev/pyRevitLabs/pyRevitCLI/PyRevitCLICloneCmds.cs
@@ -48,7 +48,7 @@ internal static void
         }
 
         internal static void
-        CreateClone(string cloneName, string deployName, string branchName, string repoUrl, string imagePath, string destPath, string username, string password) {
+        CreateClone(string cloneName, string deployName, string branchName, string repoUrl, string imagePath, string destPath, GitInstallerCredentials credentials) {
             // FIXME: implement image
             if (cloneName != null) {
                 // if deployment requested or image path is provided
@@ -68,8 +68,7 @@ internal static void
                         branchName: branchName,
                         repoUrl: repoUrl,
                         destPath: destPath,
-                        username: username,
-                        password: password
+                        credentials: credentials
                         );
             }
         }
@@ -236,7 +235,7 @@ internal static void
         }
 
         internal static void
-        UpdateClone(bool allClones, string cloneName, string username, string password) {
+        UpdateClone(bool allClones, string cloneName, GitInstallerCredentials credentials) {
             // TODO: ask for closing running Revits
 
             // prepare a list of clones to be updated
@@ -267,7 +266,7 @@ internal static void
             // update clones that do not include this process
             foreach (var clone in targetClones) {
                 logger.Debug("Updating clone \"{0}\"", clone.Name);
-                PyRevitClones.Update(clone, username, password);
+                PyRevitClones.Update(clone, credentials);
             }
 
             // now update myClone if any, as last step

diff --git a/dev/pyRevitLabs/pyRevitCLI/PyRevitCLIExtensionCmds.cs b/dev/pyRevitLabs/pyRevitCLI/PyRevitCLIExtensionCmds.cs
@@ -80,14 +80,14 @@ internal static void
         }
 
         internal static void
-        Extend(bool ui, bool lib, string extName, string destPath, string repoUrl, string branchName, string username, string password) {
+        Extend(bool ui, bool lib, string extName, string destPath, string repoUrl, string branchName, GitInstallerCredentials credentials) {
             PyRevitExtensionTypes extType = PyRevitExtensionTypes.Unknown;
             if (ui)
                 extType = PyRevitExtensionTypes.UIExtension;
             else if (lib)
                 extType = PyRevitExtensionTypes.LibraryExtension;
 
-            PyRevitExtensions.InstallExtension(extName, extType, repoUrl, destPath, branchName, username, password);
+            PyRevitExtensions.InstallExtension(extName, extType, repoUrl, destPath, branchName, credentials);
         }
 
         internal static void
@@ -207,11 +207,11 @@ internal static void
         }
 
         internal static void
-        UpdateExtension(bool all, string extName, string username, string password) {
+        UpdateExtension(bool all, string extName, GitInstallerCredentials credentials) {
             if (all)
-                PyRevitExtensions.UpdateAllInstalledExtensions(username, password);
+                PyRevitExtensions.UpdateAllInstalledExtensions(credentials);
             else if (extName != null)
-                PyRevitExtensions.UpdateExtension(extName, username, password);
+                PyRevitExtensions.UpdateExtension(extName, credentials);
         }
     }
 }