Merge pull request #6892 from dotnet/merges/prerelease-to-main

Merge prerelease to main

Author: dotnet-bot

src/lsptoolshost/dotnetRuntimeExtensionResolver.ts

@@ -50,7 +50,7 @@ export class DotnetRuntimeExtensionResolver implements IHostExecutableResolver {
                 return {
                     version: '' /* We don't need to know the version - we've already verified its high enough */,
                     path: dotnetPath,
-                    env: process.env,
+                    env: this.getEnvironmentVariables(dotnetPath),
                 };
             }
         }
@@ -67,6 +67,14 @@ export class DotnetRuntimeExtensionResolver implements IHostExecutableResolver {
             throw new Error(`Cannot find dotnet path '${dotnetExecutablePath}'`);
         }
 
+        return {
+            version: '' /* We don't need to know the version - we've already downloaded the correct one */,
+            path: dotnetExecutablePath,
+            env: this.getEnvironmentVariables(dotnetExecutablePath),
+        };
+    }
+
+    private getEnvironmentVariables(dotnetExecutablePath: string): NodeJS.ProcessEnv {
         // Take care to always run .NET processes on the runtime that we intend.
         // The dotnet.exe we point to should not go looking for other runtimes.
         const env: NodeJS.ProcessEnv = { ...process.env };
@@ -86,11 +94,7 @@ export class DotnetRuntimeExtensionResolver implements IHostExecutableResolver {
             env.DOTNET_DbgMiniDumpName = path.join(languageServerOptions.crashDumpPath, '%e.%p.dmp');
         }
 
-        return {
-            version: '' /* We don't need to know the version - we've already downloaded the correct one */,
-            path: dotnetExecutablePath,
-            env: process.env,
-        };
+        return env;
     }
 
     /**

version.json

@@ -3,6 +3,7 @@
 	"version": "2.19",
 	"publicReleaseRefSpec": [
 		"^refs/heads/release$",
+    "^refs/heads/prerelease$",
 		"^refs/heads/main$",
 		"^refs/heads/patch/.*$"
 	],
@@ -11,4 +12,4 @@
 			"enabled": false
 		}
 	}
-}
+}