Merge pull request #7193 from dibarbet/merge_main

Merge main into prerelease

Author: dibarbet

CHANGELOG.md

@@ -4,12 +4,19 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 # Latest
+* Update xamlTools to 17.11.34924.19 (PR: [#7192](https://github.com/dotnet/vscode-csharp/pull/7192))
+* Include process environment variables when running shell commands (PR: [#7152](https://github.com/dotnet/vscode-csharp/pull/7152))
+
+# 2.32.14
 * Use XML settings for XAML language-configuration.json (PR: https://github.com/dotnet/vscode-csharp/pull/7162)
 * Bump xamlTools to the latest (PR: https://github.com/dotnet/vscode-csharp/pull/7161)
 * Update Debugger to v2.30.1 (PR: https://github.com/dotnet/vscode-csharp/pull/7145)
 
-# 2.30.28
-* Update Roslyn to 4.11.0-2.24266.3 (PR: [#7135](https://github.com/dotnet/vscode-csharp/pull/7135))
+# 2.31.28
+* Update Razor to use source generator shipped in extension instead of the SDK (PR: [#7134](https://github.com/dotnet/vscode-csharp/pull/7134))
+  * Fixes incorrect 'Amibuity between' errors displaying in Razor files (Issue: [#10351](https://github.com/dotnet/razor/issues/10351))
+* Update Roslyn to 4.11.0-2.24267.3 (PR: [#7134](https://github.com/dotnet/vscode-csharp/pull/7134))
+  * Allow Razor to use source generator shipped with tooling (PR: [#73524](https://github.com/dotnet/roslyn/pull/73524))
   * Various performance improvements and allocation reductions
     * Reduce allocations in retrieving text from parsed trees (PR: [#73512](https://github.com/dotnet/roslyn/pull/73512))
     * Improve code action performance (PR: [#73493](https://github.com/dotnet/roslyn/pull/73493))

src/common.ts

@@ -58,8 +58,8 @@ export function safeLength<T>(arr: T[] | undefined) {
 
 export async function execChildProcess(
     command: string,
-    workingDirectory: string = getExtensionPath(),
-    env: NodeJS.ProcessEnv = {}
+    workingDirectory: string,
+    env: NodeJS.ProcessEnv
 ): Promise<string> {
     return new Promise<string>((resolve, reject) => {
         cp.exec(command, { cwd: workingDirectory, maxBuffer: 500 * 1024, env: env }, (error, stdout, stderr) => {

src/shared/platform.ts

@@ -173,7 +173,7 @@ export class PlatformInformation {
     }
 
     private static async GetUnixArchitecture(): Promise<string> {
-        const architecture = (await util.execChildProcess('uname -m', __dirname)).trim();
+        const architecture = (await util.execChildProcess('uname -m', __dirname, process.env)).trim();
         if (architecture === 'aarch64') {
             return 'arm64';
         }
@@ -183,7 +183,7 @@ export class PlatformInformation {
     // Emulates https://github.com/dotnet/install-scripts/blob/3c6cc06/src/dotnet-install.sh#L187-L189.
     private static async GetIsMusl(): Promise<boolean> {
         try {
-            const output = await util.execChildProcess('ldd --version', __dirname);
+            const output = await util.execChildProcess('ldd --version', __dirname, process.env);
             return output.includes('musl');
         } catch (err) {
             return err instanceof Error ? err.message.includes('musl') : false;

test/vscodeLauncher.ts

@@ -69,7 +69,7 @@ async function main() {
             }
 
             const dotnetPath = path.join(process.env.DOTNET_ROOT, 'dotnet');
-            await execChildProcess(`${dotnetPath} build ${sln}`, workspacePath);
+            await execChildProcess(`${dotnetPath} build ${sln}`, workspacePath, process.env);
         }
 
         // Download VS Code, unzip it and run the integration test

version.json

@@ -1,6 +1,6 @@
 {
 	"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-	"version": "2.32",
+	"version": "2.33",
 	"publicReleaseRefSpec": [
 		"^refs/heads/release$",
     "^refs/heads/prerelease$",