Merge branch 'develop' into fix/config-read-telemetry-path

Author: thumDer

.github/workflows/ci.yml

@@ -49,14 +49,14 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           fetch-depth: 0
           submodules: recursive
           token: ${{ secrets.SUBMODULES_TOKEN || github.token }}
 
       - name: Cache NuGet packages
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj', '**/Directory.Build.props', 'build/Build.csproj') }}
@@ -256,7 +256,7 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           fetch-depth: 0
           ref: ${{ github.sha }}

.github/workflows/docs.yml

@@ -25,7 +25,7 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: Prepare Python 3.14
         uses: actions/setup-python@v6

.github/workflows/release.yml

@@ -36,7 +36,7 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           fetch-depth: 0
 
@@ -68,7 +68,7 @@ jobs:
           exit 1
 
       - name: Download unsigned bin artifact
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: unsigned-bin-${{ github.sha }}
           run-id: ${{ steps.wait_ci.outputs.run_id }}
@@ -84,7 +84,7 @@ jobs:
           path: .
 
       - name: Cache NuGet packages
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj', '**/Directory.Build.props', 'build/Build.csproj') }}
@@ -161,7 +161,7 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           fetch-depth: 0
           ref: ${{ github.event_name == 'workflow_dispatch' && inputs.tag_ref || github.ref }}

.github/workflows/winget.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: windows-2025
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           fetch-depth: 0
 

.github/workflows/wip.yml

@@ -38,7 +38,7 @@ jobs:
         run: echo "run_id=${{ github.run_id }}" >> "$GITHUB_OUTPUT"
 
       - name: Checkout Repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           fetch-depth: 0
           ref: ${{ inputs.head_sha }}
@@ -60,7 +60,7 @@ jobs:
           path: .
 
       - name: Cache NuGet packages
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj', '**/Directory.Build.props', 'build/Build.csproj') }}

Pipfile

@@ -5,7 +5,7 @@ verify_ssl = true
 
 [dev-packages]
 mypy = "*"
-pylint = "==4.0.5"
+pylint = "==4.0.6"
 
 [packages]
 docopt = "*"

Pipfile.lock

@@ -46,18 +46,20 @@ public static void RegisterClone(string cloneName, string repoPath, bool forceUp
 
             var registeredClones = GetRegisteredClones();
 
-            if (forceUpdate && registeredClones.Contains(clone))
-                registeredClones.Remove(clone);
-
-            if (!registeredClones.Contains(clone))
+            if (forceUpdate)
             {
-                registeredClones.Add(clone);
-                SaveRegisteredClones(registeredClones);
+                registeredClones.RemoveAll(
+                    registeredClone => registeredClone.Matches(cloneName) || registeredClone.Equals(clone));
             }
-            else
+            else if (registeredClones.Contains(clone))
+            {
                 throw new PyRevitException(
                     string.Format("Clone with repo path \"{0}\" already exists.", clone.ClonePath)
                     );
+            }
+
+            registeredClones.Add(clone);
+            SaveRegisteredClones(registeredClones);
         }
 
         // renames a clone in a configs
@@ -241,6 +243,9 @@ public static void DeployFromRepo(string cloneName,
             // make sure destPath exists
             CommonUtils.EnsurePath(destPath);
 
+            // Drop stale registrations before cloning so a retried install can register cleanly.
+            PruneStaleCloneRegistrations();
+
             // check existing destination path
             if (CommonUtils.VerifyPath(destPath))
             {
@@ -273,7 +278,7 @@ public static void DeployFromRepo(string cloneName,
                     PyRevitClone.VerifyCloneValidity(clonedPath);
                     InstallBinariesForRepoClone(clonedPath, repoSourcePath, BinArtifactInstallMode.Clone);
                     logger.Debug("Clone successful \"{0}\"", clonedPath);
-                    RegisterClone(cloneName, clonedPath);
+                    RegisterClone(cloneName, clonedPath, forceUpdate: true);
                 }
                 catch (pyRevitBinArtifactNotFoundException ex)
                 {
@@ -287,6 +292,7 @@ public static void DeployFromRepo(string cloneName,
                 {
                     logger.Debug(string.Format("Exception occured after clone complete. Deleting clone \"{0}\" | {1}",
                                                clonedPath, ex.Message));
+                    UnregisterCloneAtPath(clonedPath);
                     try
                     {
                         CommonUtils.DeleteDirectory(clonedPath);
@@ -346,6 +352,9 @@ public static void DeployFromImage(string cloneName,
 
             logger.Debug("Destination path determined as \"{0}\"", destPath);
 
+            // Drop stale registrations before deploying so a retried install can register cleanly.
+            PruneStaleCloneRegistrations();
+
             // process source
             // decide to download if source is a url
             if (imageSource.IsValidHttpUrl())
@@ -463,6 +472,7 @@ public static void DeployFromImage(string cloneName,
                 {
                     logger.Debug(string.Format("Exception occured after clone from image complete. " +
                                                "Deleting clone \"{0}\" | {1}", destPath, ex.Message));
+                    UnregisterCloneAtPath(destPath);
                     try
                     {
                         CommonUtils.DeleteDirectory(destPath);
@@ -506,12 +516,13 @@ private static void VerifyAndRegisterClone(string cloneName, string clonePath)
             {
                 PyRevitClone.VerifyCloneValidity(clonePath);
                 logger.Debug("Clone successful \"{0}\"", clonePath);
-                RegisterClone(cloneName, clonePath);
+                RegisterClone(cloneName, clonePath, forceUpdate: true);
             }
             catch (Exception ex)
             {
                 logger.Debug(string.Format("Exception occured after clone complete. Deleting clone \"{0}\" | {1}",
                                            clonePath, ex.Message));
+                UnregisterCloneAtPath(clonePath);
                 try
                 {
                     CommonUtils.DeleteDirectory(clonePath);
@@ -731,6 +742,24 @@ private static void InstallBinariesForImageClone(
             }
         }
 
+        private static void PruneStaleCloneRegistrations()
+        {
+            GetRegisteredClones();
+        }
+
+        private static void UnregisterCloneAtPath(string clonePath)
+        {
+            if (string.IsNullOrWhiteSpace(clonePath))
+                return;
+
+            var normalizedPath = clonePath.NormalizeAsPath();
+            foreach (var clone in GetRegisteredClones().ToList())
+            {
+                if (clone.ClonePath.Equals(normalizedPath, StringComparison.OrdinalIgnoreCase))
+                    UnregisterClone(clone);
+            }
+        }
+
         private static void WarnIfBinEnginesMissing(string clonePath) {
             var netfxEngines = Path.Combine(clonePath, "bin", "netfx", "engines");
             var netcoreEngines = Path.Combine(clonePath, "bin", "netcore", "engines");