Merge branch 'develop' for release v6.5.2

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: jmcouffin

build/Modules/PublishWingetModule.cs

@@ -162,14 +162,12 @@ await context.Shell.Command.ExecuteCommandLineTool(
     private static IEnumerable<string> BuildPyRevitUrls(VersionInfo versionInfo, string releaseTag)
     {
         var baseUrl = $"https://github.com/pyrevitlabs/pyRevit/releases/download/{releaseTag}/";
-        yield return $"{baseUrl}pyRevit_{versionInfo.InstallVersion}_signed.exe|x86|user";
         yield return $"{baseUrl}pyRevit_{versionInfo.InstallVersion}_admin_signed.exe|x64|machine";
     }
 
     private static IEnumerable<string> BuildCliUrls(VersionInfo versionInfo, string releaseTag)
     {
         var baseUrl = $"https://github.com/pyrevitlabs/pyRevit/releases/download/{releaseTag}/";
-        yield return $"{baseUrl}pyRevit_CLI_{versionInfo.InstallVersion}_signed.exe|x64|user";
         yield return $"{baseUrl}pyRevit_CLI_{versionInfo.InstallVersion}_admin_signed.exe|x64|machine";
         yield return $"{baseUrl}pyRevit_CLI_{versionInfo.InstallVersion}_admin_signed.msi|x64|machine";
     }

build/README.md

@@ -115,7 +115,7 @@ dotnet test tests/Build.Tests.csproj -c Release
 | `pack` | Restore CI-stamped metadata (if present), build Inno/MSI installers and Chocolatey package (requires `bin/`) |
 | `sign` | Sign binaries, installers, and `.nupkg` via `sign code trusted-signing` |
 | `publish` | Generate release notes, create draft GitHub release, push Chocolatey |
-| `winget` | Generate WinGet manifests, strip `elevationProhibited` from user installers, submit PRs to winget-pkgs |
+| `winget` | Generate WinGet manifests (machine-scope installers only), strip `elevationProhibited` if present, submit PRs to winget-pkgs |
 | `notify` | Comment on linked GitHub issues |
 
 Combine modes as needed, e.g. WIP pack+sign:

dev/Directory.Build.props

@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>6.5.0.26173+1406</Version>
+    <Version>6.5.2.26175+2113</Version>
     <Copyright>Copyright © 2014-2026</Copyright>
     <Company>pyRevitLabs.io</Company>
   </PropertyGroup>

dev/pyRevitLabs/pyRevitCLI/PyRevitCLI.cs

@@ -859,6 +859,9 @@ private static void ProcessArguments() {
                 else if (all("seed"))
                     PyRevitConfigs.SeedConfig(lockSeedConfig: arguments["--lock"].IsTrue);
 
+                else if (all("seedshippeddefaults"))
+                    PyRevitConfigs.SeedShippedExtensionDefaults();
+
                 else if (any("enable", "disable")) {
                     if (arguments["<option_path>"] != null) {
                         // extract section and option names

dev/pyRevitLabs/pyRevitCLI/PyRevitCLIAppCmds.cs

@@ -157,6 +157,10 @@ internal static void
                                             Environment.UserDomainName, Environment.UserName));
             Console.WriteLine(string.Format("Active User: {0}", UserEnv.GetLoggedInUserName()));
             Console.WriteLine(string.Format("Admin Access: {0}", UserEnv.IsRunAsAdmin() ? "Yes" : "No"));
+            Console.WriteLine(string.Format("Install Scope: {0}",
+                                            PyRevitInstallScope.IsAllUsersInstall() ? "AllUsers" : "PerUser"));
+            Console.WriteLine(string.Format("Active Config: \"{0}\"",
+                                            PyRevitInstallScope.GetActiveConfigFilePath()));
             Console.WriteLine(string.Format("%APPDATA%: \"{0}\"",
                                             Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)));
             Console.WriteLine(string.Format("Latest Installed .Net Framework: {0}",

dev/pyRevitLabs/pyRevitCLI/PyRevitCLIAppHelps.cs

@@ -329,6 +329,7 @@ internal static void PrintHelp(PyRevitCLICommandType commandType, int exitCode)
                         header: "Manage pyRevit configurations",
                         mgmtCommands: new Dictionary<string, string>() {
                             { "seed",                   "Seed existing configuration file to %PROGRAMDATA%" },
+                            { "seedshippeddefaults",    "Write disabled flags for shipped extensions with default_enabled=False" },
                             { "routes",                 "Routes configurations" },
                             { "telemetry",              "Script Telemetry configurations" },
                             { "apptelemetry",           "Application Telemetry configurations" },

dev/pyRevitLabs/pyRevitCLI/PyRevitCLIExtensionCmds.cs

@@ -175,7 +175,7 @@ internal static void
             if (extName != null) {
                 PyRevitClone clone = null;
                 if (cloneName != null)
-                    clone = PyRevitClones.GetRegisteredClone(cloneName);
+                    clone = TryResolveShippedClone(cloneName);
 
                 if (enable) {
                     if (clone != null)
@@ -192,6 +192,30 @@ internal static void
             }
         }
 
+        private static PyRevitClone TryResolveShippedClone(string cloneName) {
+            try {
+                return PyRevitClones.GetRegisteredClone(cloneName);
+            }
+            catch {
+                PyRevitClone fallbackClone = null;
+                foreach (var attachment in PyRevitAttachments.GetAttachments()) {
+                    try {
+                        var manifestClone = PyRevitClone.GetCloneFromManifest(attachment.Manifest);
+                        if (manifestClone.Matches(cloneName))
+                            return manifestClone;
+                        if (fallbackClone == null)
+                            fallbackClone = manifestClone;
+                    }
+                    catch {
+                        continue;
+                    }
+                }
+                if (fallbackClone != null)
+                    return new PyRevitClone(fallbackClone.ClonePath, name: cloneName);
+                return null;
+            }
+        }
+
         internal static void
         ForgetExtensionLookupSources(bool all, string lookupPath) {
             if (all)

dev/pyRevitLabs/pyRevitCLI/Resources/UsagePatterns.txt

@@ -102,6 +102,7 @@ Usage:
 	pyrevit configs apptelemetry server [<server_path>] [--log=<log_file>]
 	pyrevit configs outputcss [<css_path>] [--log=<log_file>]
 	pyrevit configs seed [--lock] [--log=<log_file>]
+	pyrevit configs seedshippeddefaults [--log=<log_file>]
 	pyrevit configs <option_path> [(enable | disable)] [--log=<log_file>]
 	pyrevit configs <option_path> [<option_value>] [--log=<log_file>]
     pyrevit doctor (-h | --help)

dev/pyRevitLabs/pyRevitLabs.Common/CommonUtils.cs

@@ -43,6 +43,44 @@ public static bool VerifyPath(string path) {
             return false;
         }
 
+        /// <summary>
+        /// Expands %VAR% tokens in a user-supplied path (e.g. --dest=%LOCALAPPDATA%\pyRevit).
+        /// Repeats until stable so nested values like TEMP=%LOCALAPPDATA%\Temp resolve fully.
+        /// </summary>
+        public static string ExpandEnvironmentPath(string path) {
+            if (string.IsNullOrWhiteSpace(path))
+                return path;
+            return ExpandEnvironmentPathRecursive(path.Trim());
+        }
+
+        /// <summary>
+        /// User temp directory with environment variables expanded (handles TEMP=%LOCALAPPDATA%\Temp).
+        /// </summary>
+        public static string GetUserTempDirectory() {
+            var temp = Environment.GetEnvironmentVariable("TEMP");
+            var candidate = !string.IsNullOrWhiteSpace(temp)
+                ? ExpandEnvironmentPathRecursive(temp.Trim())
+                : ExpandEnvironmentPathRecursive("%TEMP%");
+            if (IsConcreteExpandedPath(candidate))
+                return candidate;
+            return Path.GetTempPath().TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+        }
+
+        private static bool IsConcreteExpandedPath(string path) {
+            return !string.IsNullOrWhiteSpace(path) && path.IndexOf('%') < 0;
+        }
+
+        private static string ExpandEnvironmentPathRecursive(string path) {
+            var expanded = path;
+            for (int pass = 0; pass < 8; pass++) {
+                var next = Environment.ExpandEnvironmentVariables(expanded).Trim();
+                if (string.Equals(next, expanded, StringComparison.OrdinalIgnoreCase))
+                    break;
+                expanded = next;
+            }
+            return expanded;
+        }
+
         public static bool VerifyPythonScript(string path) {
             return VerifyFile(path) && path.ToLower().EndsWith(".py");
         }

dev/pyRevitLabs/pyRevitLabs.Common/Consts.cs

@@ -7,6 +7,8 @@
 
 namespace pyRevitLabs.Common {
     public class PyRevitLabsConsts {
+        public const string PyRevitPathOverrideEnvVar = "PYREVIT_PATH_OVERRIDE";
+        public const string PyRevitProgramDataPathOverrideEnvVar = "PYREVIT_PROGRAMDATA_PATH_OVERRIDE";
         // product
         public const string ProductName = "pyRevit";
 
@@ -50,13 +52,31 @@ public class PyRevitLabsConsts {
         public const string AppdataCacheDirName = "Cache";
         public const string AppdataLogsDirName = "Logs";
 
+        // install scope marker (all-users installer creates this under %ProgramData%\pyRevit\)
+        public const string InstallAllUsersMarkerFileName = "install_all_users";
+        public const string DefaultConfigsFileName = "pyRevit_config.ini";
+
         // pyRevit %appdata% path
         // @reviewed
-        public static string PyRevitPath => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), AppdataDirName);
+        public static string PyRevitPath {
+            get {
+                string pathOverride = Environment.GetEnvironmentVariable(PyRevitPathOverrideEnvVar);
+                if (!string.IsNullOrWhiteSpace(pathOverride))
+                    return pathOverride;
+                return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), AppdataDirName);
+            }
+        }
 
         // pyRevit %programdata% path
         // @reviewed
-        public static string PyRevitProgramDataPath => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), AppdataDirName);
+        public static string PyRevitProgramDataPath {
+            get {
+                string pathOverride = Environment.GetEnvironmentVariable(PyRevitProgramDataPathOverrideEnvVar);
+                if (!string.IsNullOrWhiteSpace(pathOverride))
+                    return pathOverride;
+                return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), AppdataDirName);
+            }
+        }
 
         // pyrevit general cache folder 
         public static string CacheDirectory => Path.Combine(PyRevitPath, AppdataCacheDirName);