Merge branch 'main' into CohostDebugBlazorWasm

Author: dibarbet

CHANGELOG.md

@@ -5,6 +5,13 @@
 
 # 2.89.x
 * Register Blazor WASM debugger in Razor Cohosting (PR: [#8511](https://github.com/dotnet/vscode-csharp/pull/8511))
+* Bump Razor to 10.0.0-preview.25411.5 (PR: [#8512](https://github.com/dotnet/vscode-csharp/pull/8512))
+  * Fix VS Code cohosting completion when Razor and C# are valid (PR: [#12096](https://github.com/dotnet/razor/pull/12096))
+  * Fix null reference exception in formatting (PR: [#12097](https://github.com/dotnet/razor/pull/12097))
+  * Fix cohost override setting (PR: [#12082](https://github.com/dotnet/razor/pull/12082))
+  * Cohost span mapping (PR: [#12055](https://github.com/dotnet/razor/pull/12055))
+  * Explicitly deny certain Roslyn formatting options (PR: [#12064](https://github.com/dotnet/razor/pull/12064))
+  * Don't use `requestContext` in document closed endpoint (PR: [#12080](https://github.com/dotnet/razor/pull/12080))
 
 # 2.88.x
 * Enable Razor Cohosting "on" by default (PR: [#8469](https://github.com/dotnet/vscode-csharp/pull/8469))

azure-pipelines/publish-roslyn-copilot.yml

@@ -0,0 +1,58 @@
+trigger: none
+pr: none
+
+resources:
+  repositories:
+  - repository: 1ESPipelineTemplates
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/release
+  pipelines:
+  - pipeline: CI
+    project: DevDiv
+    source: VisualStudio.Conversations
+    branch: main
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
+  parameters:
+    pool:
+      name: AzurePipelines-EO
+      image: 1ESPT-Windows2022
+      os: windows
+    stages:
+    - stage: Upload
+      jobs:
+      - job: UploadToServer
+        displayName: Upload to server
+        pool:
+          name: AzurePipelines-EO
+          image: 1ESPT-Windows2022
+          os: windows
+        templateContext:
+          type: releaseJob
+          isProduction: false #change this
+          inputs:
+          - input: pipelineArtifact
+            pipeline: CI
+            artifactName: partnerDeployables-Windows
+            destinationPath: $(Pipeline.Workspace)/artifacts
+
+        steps:
+        - checkout: none
+
+        - task: CopyFiles@2
+          displayName: 'Copy files from Zip folder to staging directory'
+          inputs:
+            SourceFolder: '$(Pipeline.Workspace)/'
+            Contents: '**/*Roslyn.LanguageServer*.zip'
+            TargetFolder: '$(Build.ArtifactStagingDirectory)/staging'
+            CleanTargetFolder: true
+
+        - task: AzureFileCopy@6
+          displayName: "Copy the zip to Azure Storage"
+          inputs:
+            SourcePath: '$(Build.ArtifactStagingDirectory)/staging/*'
+            azureSubscription: "$(AzSubscription)"
+            Destination: "AzureBlob"
+            storage: "$(AzStorage)"
+            ContainerName: "$(AzContainerName)"

package.json

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

src/shared/dotnetConfigurationProvider.ts

@@ -30,18 +30,24 @@ class InternalServiceError extends Error {}
 class UnavaliableLaunchServiceError extends Error {}
 
 const workspaceFolderToken = '${workspaceFolder}';
+const fileToken = '${file}';
+
 /**
- * Replaces '${workspaceFolder}' with the current folder while keeping path separators consistent.
+ * Replaces some '${variable}' tokens.
  *
  * @param projectPath The expected path to the .csproj
  * @param folderPath The current workspace folder
  * @returns A fully resolved path to the .csproj
  */
-function resolveWorkspaceFolderToken(projectPath: string, folderPath: string): string {
+function resolveVariableTokens(projectPath: string, folderPath: string): string {
+    if (projectPath === fileToken) {
+        return vscode.window.activeTextEditor?.document.fileName ?? projectPath;
+    }
+
     if (projectPath.startsWith(workspaceFolderToken)) {
         const relativeProjectPath: string = projectPath.substring(workspaceFolderToken.length);
 
-        // Keep the path seperate consistant
+        // Keep the path separators consistent
         if (relativeProjectPath.startsWith('/')) {
             folderPath = folderPath.replace(/[\\/]+/g, '/');
         } else {
@@ -91,7 +97,7 @@ export class DotnetConfigurationResolver implements vscode.DebugConfigurationPro
         let projectPath: string | undefined = debugConfiguration.projectPath;
         if (folder) {
             if (projectPath) {
-                projectPath = resolveWorkspaceFolderToken(projectPath, folder.uri.fsPath);
+                projectPath = resolveVariableTokens(projectPath, folder.uri.fsPath);
             }
 
             const dotnetDebugServiceProxy = await getServiceBroker()?.getProxy<IDotnetDebugConfigurationService>(

test/razor/razorIntegrationTests/reference.integration.test.ts

@@ -127,11 +127,6 @@ describe(`Razor References ${testAssetWorkspace.description}`, function () {
     });
 
     test('Find All References - CSharp', async () => {
-        if (!integrationHelpers.usingDevKit()) {
-            // If we're not using devkit, then it means we are testing cohosting, and FAR from C# doesn't currently work in cohosting.
-            return;
-        }
-
         if (!integrationHelpers.isRazorWorkspace(vscode.workspace)) {
             return;
         }