Merge branch 'main' into dev/jorobich/support-project-context

Author: JoeRobich

CHANGELOG.md

@@ -4,6 +4,11 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 # 2.92.x
+* Bump Razor to 10.0.0-preview.25464.2 (PR: [#8628](https://github.com/dotnet/vscode-csharp/pull/8628))
+  * Improve go to definition for mvc tag helpers (PR: [#12216](https://github.com/dotnet/razor/pull/12216))                                                                                                               
+  * Filter CSS024 when caused by C# code in an attribute (PR: [#12209](https://github.com/dotnet/razor/pull/12209))
+  * Provide more specific information in cohosting failures (PR: [#12193](https://github.com/dotnet/razor/pull/12193))
+  * Fix renaming file (PR: [#12196](https://github.com/dotnet/razor/pull/12196))
 
 # 2.91.x
 * Bump Roslyn to 5.0.0-2.25458.10 (PR: [#8588](https://github.com/dotnet/vscode-csharp/pull/8588))
@@ -17,12 +22,10 @@
   * Allow Razor to get task list items for a document (PR: [#80102](https://github.com/dotnet/roslyn/pull/80102))
   * Update debugger packages, move to PortableInterop IMetadataImport (PR: [#80063](https://github.com/dotnet/roslyn/pull/80063))
   * Fix issue reporting diagnostic in additional file when diagnostic produced by a source generator (PR: [#80071](https://github.com/dotnet/roslyn/pull/80071))
-  * Always run the razor generator even in balanced mode (PR: [#79510](https://github.com/dotnet/roslyn/pull/79510))
 * Bump Razor to 10.0.0-preview.25454.5 (PR: [#8590](https://github.com/dotnet/vscode-csharp/pull/8590))
   * Fix extra character insertion during attribute completion in VS Code (PR: [#12177](https://github.com/dotnet/razor/pull/12177))
   * Remove UseNewRazorFormattingEngine feature flag (PR: [#12160](https://github.com/dotnet/razor/pull/12160))
   * Allow for weird Uris as file paths (PR: [#12155](https://github.com/dotnet/razor/pull/12155))
-  * Remove the feature flag for precise semantic tokens (PR: [#12149](https://github.com/dotnet/razor/pull/12149))
 * Do not create a proxy agent if proxy url is empty string.  (PR: [#8580](https://github.com/dotnet/vscode-csharp/pull/8580))
 * Use aka.ms link for ARM32 Linux help page (PR: [#8574](https://github.com/dotnet/vscode-csharp/pull/8574))
 * Update Debugger to 2.90.0 (PR: [#8572](https://github.com/dotnet/vscode-csharp/pull/8572))

azure-pipelines.yml

@@ -15,13 +15,33 @@ pr:
     - prerelease
     - main
   paths:
+    # Exclude paths and files which do not cause functional changes to the C# extension and do not impact CI.
     exclude:
-    - '*.md'
-    - 'version.json'
+    # Changes to these configuration files are not functional changes.
+    - .azuredevops/*
+    - .config/*
+    - .devcontainer/*
     - .github/*
+    - .vscode/*
+    # The following pipelines are not run for PRs and changes should be validated by a separate run of the pipeline.
+    - azure-pipelines/dotnet-vscode-csharp-insertion.yml
+    - azure-pipelines/loc.yml
     - azure-pipelines/release.yml
-    - CHANGELOG.
+    - azure-pipelines/profiling.yml
+    - azure-pipelines/publish-roslyn-copilot.yml
+    # Changes to documentation are not functional changes.
+    - docs/*
+    - images/*
+    - RuntimeLicenses/*
+    # Changes to language bundles are not functional changes. We still run CI when `l10n/bundle.l10n.json` itself is changed.
     - 'l10n/bundle.l10n.*.json'
+    # Changes to the color themes are not functional changes.
+    - themes/*
+    # Changes to documentation are not functional changes.
+    - '**.md'
+    - CODEOWNERS
+    # Changes to the vesion is not a functional change. The extension version is updated by the branch-snap GH action.
+    - 'version.json'
 
 # Run a scheduled build every night on main to run tests against insiders VSCode.
 # The variable testVSCodeVersion is set to insiders based on the build reason.

package.json

@@ -42,7 +42,7 @@
   "defaults": {
     "roslyn": "5.0.0-2.25458.10",
     "omniSharp": "1.39.14",
-    "razor": "10.0.0-preview.25454.5",
+    "razor": "10.0.0-preview.25464.2",
     "razorOmnisharp": "7.0.0-preview.23363.1",
     "xamlTools": "17.14.36106.43"
   },

src/lsptoolshost/razor/htmlDocumentManager.ts

@@ -12,6 +12,7 @@ import { HtmlDocumentContentProvider } from './htmlDocumentContentProvider';
 import { HtmlDocument } from './htmlDocument';
 import { RoslynLanguageServer } from '../server/roslynLanguageServer';
 import { RequestType, TextDocumentIdentifier } from 'vscode-languageserver-protocol';
+import { UriConverter } from '../utils/uriConverter';
 
 export class HtmlDocumentManager {
     private readonly htmlDocuments: { [hostDocumentPath: string]: HtmlDocument } = {};
@@ -51,7 +52,7 @@ export class HtmlDocumentManager {
                 // so making it a request means the logs end up in the right place.
                 await this.roslynLanguageServer.sendRequest(
                     this.razorDocumentClosedRequest,
-                    TextDocumentIdentifier.create(getUriPath(document.uri)),
+                    TextDocumentIdentifier.create(UriConverter.serialize(document.uri)),
                     new vscode.CancellationTokenSource().token
                 );
             }

test/vscodeLauncher.ts

@@ -69,15 +69,38 @@ export async function prepareVSCodeAndExecuteTests(
 
 async function installExtensions(extensionIds: string[], vscodeCli: string, vscodeArgs: string[]): Promise<void> {
     for (const extensionId of extensionIds) {
-        vscodeArgs.push('--install-extension', extensionId);
+        // Workaround for https://github.com/microsoft/vscode/issues/256031 to retry installing the extension with a delay.
+        let installError: any | undefined = undefined;
+        let installSucceeded = false;
+        for (let attempts = 0; attempts < 5; attempts++) {
+            try {
+                await installExtension(extensionId, vscodeCli, vscodeArgs);
+                installSucceeded = true;
+                break;
+            } catch (error) {
+                console.warn(`Failed to install extension ${extensionId}; retrying: ${error}`);
+                installError = error;
+                await new Promise((resolve) => setTimeout(resolve, 2000));
+            }
+        }
+
+        if (!installSucceeded) {
+            throw installError;
+        }
     }
 
+    console.log();
+}
+
+async function installExtension(extensionId: string, vscodeCli: string, vscodeArgs: string[]): Promise<void> {
+    const argsWithExtension = [...vscodeArgs, '--install-extension', extensionId];
+
     // Since we're using shell execute, spaces in the CLI path will get interpeted as args
     // Therefore we wrap the CLI path in quotes as on MacOS the path can contain spaces.
     const cliWrapped = `"${vscodeCli}"`;
-    console.log(`${cliWrapped} ${vscodeArgs}`);
+    console.log(`${cliWrapped} ${argsWithExtension}`);
 
-    const result = cp.spawnSync(cliWrapped, vscodeArgs, {
+    const result = cp.spawnSync(cliWrapped, argsWithExtension, {
         encoding: 'utf-8',
         stdio: 'inherit',
         // Workaround as described in https://github.com/nodejs/node/issues/52554
@@ -86,8 +109,6 @@ async function installExtensions(extensionIds: string[], vscodeCli: string, vsco
     if (result.error || result.status !== 0) {
         throw new Error(`Failed to install extensions: ${JSON.stringify(result)}`);
     }
-
-    console.log();
 }
 
 function getSln(workspacePath: string): string | undefined {