Merge branch 'develop'

# Conflicts:
#	bin/pyrevit-hosts.json

Author: eirannejad

README.md

@@ -1349,7 +1349,7 @@
             "source": "https://help.autodesk.com/view/RVT/2021/ENU/?guid=RevitReleaseNotes_2021updates_2021_1_1_html"
         },
         "product": "Autodesk Revit",
-        "release": "2020.1.1",
+        "release": "2021.1.1",
         "version": "21.1.10.26",
         "build": "20200909_1515",
         "target": "x64",

bin/engines/2710/pyRevitLoader.dll

@@ -1,4 +1,10 @@
 [
+ {
+  "product": "pyRevit",
+  "release": "4.8.3",
+  "version": "4.8.3",
+  "key": "{696310B4-5E37-4437-B047-20954E4B2814}"
+ },
  {
   "product": "pyRevit",
   "release": "4.8.2",
@@ -203,6 +209,12 @@
   "version": "4.6.1",
   "key": "{EF91A585-DC0C-43B8-B88B-4C130F430E84}"
  },
+ {
+  "product": "pyRevit CLI",
+  "release": "4.8.3",
+  "version": "4.8.3",
+  "key": "{F0958CD1-EEF8-481D-871C-7501947EC650}"
+ },
  {
   "product": "pyRevit CLI",
   "release": "4.8.2",

bin/engines/2710/pyRevitRunner.dll

@@ -101,6 +101,7 @@ def title(self):
     ChangeGroup(tag="runtime", header="Runtime"),
     ChangeGroup(tag="framework", header="Framework Updates"),
     ChangeGroup(tag="installer", header="Installer"),
+    ChangeGroup(tag="cli", header="Command Line Utility"),
     ChangeGroup(tag="bundles", header="Script bundles"),
     ChangeGroup(tag="tele", header="Telemetry"),
     ChangeGroup(tag="api", header="API"),

bin/engines/273/pyRevitLoader.dll

@@ -2,5 +2,5 @@
 using System.Runtime.InteropServices;
 using System.Runtime.CompilerServices;
 
-[assembly: AssemblyVersion("4.8.2")]
-[assembly: AssemblyFileVersion("4.8.2")]
+[assembly: AssemblyVersion("4.8.3")]
+[assembly: AssemblyFileVersion("4.8.3")]

bin/engines/273/pyRevitRunner.dll

@@ -278,7 +278,9 @@ private static void ProcessArguments() {
                 else if (all("update"))
                     PyRevitCLICloneCmds.UpdateClone(
                         allClones: arguments["--all"].IsTrue,
-                        cloneName: TryGetValue("<clone_name>")
+                        cloneName: TryGetValue("<clone_name>"),
+                        username: TryGetValue("--username"),
+                        password: TryGetValue("--password")
                         );
 
                 else
@@ -432,7 +434,9 @@ private static void ProcessArguments() {
                 else if (all("update"))
                     PyRevitCLIExtensionCmds.UpdateExtension(
                         all: arguments["--all"].IsTrue,
-                        extName: TryGetValue("<extension_name>")
+                        extName: TryGetValue("<extension_name>"),
+                        username: TryGetValue("--username"),
+                        password: TryGetValue("--password")
                     );
 
                 else if (IsHelpMode)

bin/engines/277/pyRevitLoader.dll

@@ -229,7 +229,7 @@ internal static void
         }
 
         internal static void
-        UpdateClone(bool allClones, string cloneName) {
+        UpdateClone(bool allClones, string cloneName, string username, string password) {
             // TODO: ask for closing running Revits
 
             // prepare a list of clones to be updated
@@ -260,7 +260,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);
+                PyRevitClones.Update(clone, username, password);
             }
 
             // now update myClone if any, as last step

bin/engines/277/pyRevitRunner.dll

@@ -209,11 +209,11 @@ internal static void
         }
 
         internal static void
-        UpdateExtension(bool all, string extName) {
+        UpdateExtension(bool all, string extName, string username, string password) {
             if (all)
-                PyRevitExtensions.UpdateAllInstalledExtensions();
+                PyRevitExtensions.UpdateAllInstalledExtensions(username, password);
             else if (extName != null)
-                PyRevitExtensions.UpdateExtension(extName);
+                PyRevitExtensions.UpdateExtension(extName, username, password);
         }
     }
 }

bin/engines/278/pyRevitLoader.dll

@@ -20,7 +20,7 @@ Usage:
 	pyrevit clones commit <clone_name> [<commit_hash>] [--log=<log_file>]
 	pyrevit clones origin <clone_name> --reset [--log=<log_file>]
 	pyrevit clones origin <clone_name> [<origin_url>] [--log=<log_file>]
-	pyrevit clones update (--all | <clone_name>) [--log=<log_file>]
+	pyrevit clones update (--all | <clone_name>) [--log=<log_file>] [--username=<username>] [--password=<password>]
 	pyrevit clones deployments <clone_name>
 	pyrevit clones engines <clone_name>
 	pyrevit attach --help
@@ -49,7 +49,7 @@ Usage:
 	pyrevit extensions sources [--help]
 	pyrevit extensions sources forget --all [--log=<log_file>]
 	pyrevit extensions sources (add | forget) <source_json_or_url> [--log=<log_file>]
-	pyrevit extensions update (--all | <extension_name>) [--log=<log_file>]
+	pyrevit extensions update (--all | <extension_name>) [--log=<log_file>] [--username=<username>] [--password=<password>]
 	pyrevit releases --help
 	pyrevit releases [--pre] [--notes]
 	pyrevit releases latest [--pre] [--notes]

bin/engines/278/pyRevitRunner.dll

@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-
+using System.Web.UI.WebControls.Adapters;
 using LibGit2Sharp;
 using pyRevitLabs.NLog;
 
@@ -106,12 +106,19 @@ public static void CheckoutBranch(string repoPath, string branchName) {
 
         // rebase current branch and pull from master
         // @handled @logs
-        public static UpdateStatus ForcedUpdate(string repoPath) {
+        public static UpdateStatus ForcedUpdate(string repoPath, string username, string password) {
             logger.Debug("Force updating repo \"{0}\"...", repoPath);
             try {
                 var repo = new Repository(repoPath);
                 var options = new PullOptions();
-                options.FetchOptions = new FetchOptions();
+                var fetchOpts = new FetchOptions();
+
+                // add username and password to clone options, if provided by user
+                if (username != null && password != null)
+                    fetchOpts.CredentialsProvider =
+                        (_url, _usernameFromUrl, _credTypes) => new UsernamePasswordCredentials { Username = username, Password = password };
+
+                options.FetchOptions = fetchOpts;
 
                 // before updating, let's first
                 // forced checkout to overwrite possible local changes
@@ -233,10 +240,12 @@ public static string GetCheckedoutBranch(string repoPath) {
         // get the checkedout branch from repopath
         // @handled @logs
         public static string GetHeadCommit(string repoPath) {
+            string head = null;
             if (IsValidRepo(repoPath))
-                return new Repository(repoPath).Head.Tip.Id.ToString();
-            logger.Debug("Can not determine head commit hash for \"{0}\"", repoPath);
-            return null;
+                head = new Repository(repoPath).Head?.Tip?.Id.ToString();
+            if (head is null)
+                logger.Debug("Can not determine head commit hash for \"{0}\"", repoPath);
+            return head;
         }
 
         // get the checkedout branch from repopath

bin/engines/279/pyRevitLoader.dll

@@ -52,7 +52,10 @@ public static Version GetInstalledDotNetVersion() {
 
         public static List<string> GetInstalledDotnetTargetPacks() {
             var targetPackPaths = new List<string>();
-            var frameworkPath = @"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework";
+            var frameworkPath = Path.Combine(
+                Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86),
+                @"Reference Assemblies\Microsoft\Framework\.NETFramework"
+                );
             foreach (string path in Directory.GetDirectories(frameworkPath))
                 if (Regex.Match(Path.GetFileName(path), @"\d\..+").Success)
                     targetPackPaths.Add(path);
@@ -61,7 +64,10 @@ public static List<string> GetInstalledDotnetTargetPacks() {
 
         public static List<string> GetInstalledDotnetCoreTargetPacks() {
             var targetPackPaths = new List<string>();
-            var frameworkPath = @"C:\Program Files\dotnet\sdk";
+            var frameworkPath = Path.Combine(
+                Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles),
+                @"dotnet\sdk"
+                );
             foreach (string path in Directory.GetDirectories(frameworkPath))
                 if (Regex.Match(Path.GetFileName(path), @"\d\..+").Success)
                     targetPackPaths.Add(path);
@@ -80,7 +86,8 @@ public static string GetLoggedInUserName() {
                 foreach (ManagementObject oReturn in oReturnCollection) {
                     return oReturn["UserName"].ToString();
                 }
-            } catch (Exception ex) {
+            }
+            catch (Exception ex) {
                 logger.Debug("Failed to get logged in username. | {0}", ex.Message);
             }
             return null;

bin/engines/279/pyRevitRunner.dll

@@ -124,13 +124,17 @@ public static List<PyRevitAttachment> GetAttachments() {
 
         // get all attachments for a revit version
         // @handled @logs
-        public static List<PyRevitAttachment> GetAllAttached(int revitYear) =>
-            GetAttachments().Where(x => x.Product.ProductYear == revitYear).OrderBy(x => x.AllUsers).ToList();
+        public static List<PyRevitAttachment> GetAllAttached(int revitYear) {
+            var attachments = GetAttachments().Where(x => x.Product.ProductYear == revitYear);
+            if (attachments.Count() > 0)
+                return attachments.OrderBy(x => x.AllUsers).ToList();
+            return new List<PyRevitAttachment>();
+        }            
 
         // get attachment for a revit version
         // @handled @logs
         public static PyRevitAttachment GetAttached(int revitYear) {
-            return GetAllAttached(revitYear)?.First();
+            return GetAllAttached(revitYear)?.FirstOrDefault();
         }
 
     }