Merge remote-tracking branch 'upstream/main' into find_dotnet_runtime

Author: dibarbet

.vscode/launch.json

@@ -66,7 +66,7 @@
             "internalConsoleOptions": "openOnSessionStart"
         },
         {
-            "name": "Launch Current File BasicRazorApp2_1 Integration Tests",
+            "name": "[Razor] Run Current File Integration Test",
             "type": "extensionHost",
             "request": "launch",
             "runtimeExecutable": "${execPath}",
@@ -76,7 +76,7 @@
                 // The profile can be found under /test/csharp-test-profile.
                 "--profile",
                 "csharp-test-profile",
-                "${workspaceRoot}/test/razor/razorIntegrationTests/testAssets/BasicRazorApp2_1/.vscode/lsp_tools_host_BasicRazorApp2_1.code-workspace",
+                "${workspaceRoot}/test/razor/razorIntegrationTests/testAssets/RazorApp/.vscode/RazorApp.code-workspace",
                 "--extensionDevelopmentPath=${workspaceRoot}",
                 "--extensionTestsPath=${workspaceRoot}/out/test/razor/razorIntegrationTests",
                 "--log",
@@ -89,7 +89,7 @@
             "sourceMaps": true,
             "outFiles": ["${workspaceRoot}/dist/*.js", "${workspaceRoot}/out/test/**/*.js"],
             "resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
-            "preLaunchTask": "buildDev",
+            "preLaunchTask": "buildTest",
             "internalConsoleOptions": "openOnSessionStart"
         },
         {
@@ -204,7 +204,7 @@
             "id": "omnisharpAssetName",
             "description": "The name of the asset folder to use for the OmniSharp integration test.",
             "type": "pickString",
-            "options": ["singleCsproj", "BasicRazorApp2_1", "slnWithCsproj", "slnFilterWithCsproj", "slnWithGenerator"]
+            "options": ["singleCsproj", "RazorApp", "slnWithCsproj", "slnFilterWithCsproj", "slnWithGenerator"]
         },
         {
             "id": "gulpTaskName",

.vscode/tasks.json

@@ -1,48 +1,50 @@
 {
-	"version": "2.0.0",
-	"presentation": {
-		"echo": true,
-		"reveal": "always",
-		"focus": false,
-		"panel": "shared"
-	},
-	"tasks": [
-		{
-			"label": "build",
-			"command": "npm",
-			"type": "shell",
-			"args": [
-				"run",
-				"compile"
-			],
-			"group": {
-				"kind": "build",
-				"isDefault": true
-			}
-		},
-		{
-			"label": "buildDev",
-			"command": "npm",
-			"type": "shell",
-			"args": [
-				"run",
-				"compileDev"
-			],
-			"group": {
-				"kind": "build",
-				"isDefault": true
-			}
-		},
-		{
-			"label": "test",
-			"command": "echo",
-			"group": {
-				"kind": "test",
-				"isDefault": true
-			},
-			"args": [
-				"Run tests in VS Code by launching the debugger with the 'Launch Tests' configuration."
-			]
-		},
-	]
-}
+    "version": "2.0.0",
+    "presentation": {
+        "echo": true,
+        "reveal": "always",
+        "focus": false,
+        "panel": "shared"
+    },
+    "tasks": [
+        {
+            "label": "build",
+            "command": "npm",
+            "type": "shell",
+            "args": ["run", "compile"],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "buildDev",
+            "command": "npm",
+            "type": "shell",
+            "args": ["run", "compileDev"],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "buildTest",
+            "command": "npm",
+            "type": "shell",
+            "args": ["run", "compileTest"],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "test",
+            "command": "echo",
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            },
+            "args": ["Run tests in VS Code by launching the debugger with the 'Launch Tests' configuration."]
+        }
+    ]
+}

CHANGELOG.md

@@ -3,9 +3,41 @@
 - Diagnostics related feature requests and improvements [#5951](https://github.com/dotnet/vscode-csharp/issues/5951)
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
+# 2.57.x
+* Update Razor to 9.0.0-preview.24561.3 (PR: [#7748](https://github.com/dotnet/vscode-csharp/pull/7748))
+  * Add feature flag to turn on the new Roslyn tokenizer (PR: [#11185](https://github.com/dotnet/razor/pull/11185))
+* Bump xamltools to 17.13.35513.19 (PR: [#7777](https://github.com/dotnet/vscode-csharp/pull/7777))
+
 # 2.56.x
+* Update Roslyn to 4.13.0-2.24561.3 (PR: [#7765](https://github.com/dotnet/vscode-csharp/pull/7765))
+  * Update Razor to fix serialization issue loading projects (PR: [#75794](https://github.com/dotnet/roslyn/pull/75794))
+* Update Razor to 9.0.0-preview.24557.11 (PR: [#7756](https://github.com/dotnet/vscode-csharp/pull/7756))
+  * Fix FUSE hook up in VS Code (#11175) (PR: [#11175](https://github.com/dotnet/razor/pull/11175))
+  * Update VSTelemetryAPI version (#11181) (PR: [#11181](https://github.com/dotnet/razor/pull/11181))
+  * Improvements for Assumed.Unreachable(...) (#11155) (PR: [#11155](https://github.com/dotnet/razor/pull/11155))
+  * Better logging for named pipe (#11144) (PR: [#11144](https://github.com/dotnet/razor/pull/11144))
+  * Fix code actions (and code actions integration tests) (#11141) (PR: [#11141](https://github.com/dotnet/razor/pull/11141))
+  * Fix some things for extract component (#11137) (PR: [#11137](https://github.com/dotnet/razor/pull/11137))
+  * More CodeAction moves in preparation for cohosting (#11135) (PR: [#11135](https://github.com/dotnet/razor/pull/11135))
+* Update Roslyn to 4.13.0-2.24557.5 (PR: [#7752](https://github.com/dotnet/vscode-csharp/pull/7752))
+  * Fix telemetry property value (PR: [#75813](https://github.com/dotnet/roslyn/pull/75813))
+  * Classify 'await' as a control keyword (PR: [#75782](https://github.com/dotnet/roslyn/pull/75782))
+  * Allow renaming with overload resolution when only one overload exists(PR: [#75752](https://github.com/dotnet/roslyn/pull/75752))
+  * Fix issue loading completion providers from `<Analyyzer>` project items (PR: [#75721](https://github.com/dotnet/roslyn/pull/75721))
+  * Expose code actions to Razor cohosting (PR: [#75711](https://github.com/dotnet/roslyn/pull/75711))
+  * Do not include source generated documents in related document results (PR: [#75718](https://github.com/dotnet/roslyn/pull/75718))
+  * Fix issue where inlay hints could not be resolved if multiple editors opened side by side (PR: [#75709](https://github.com/dotnet/roslyn/pull/75709))
+  * Reduce allocations in ProjectSystemProjectFactory.ConvertMetadataReferencesToProjectReferences_NoLock (PR: [#75646](https://github.com/dotnet/roslyn/pull/75646))
+  * Reduce memory and CPU costs due to SegmentedList usage (PR: [#75661](https://github.com/dotnet/roslyn/pull/75661))
+* Bump xamltools to 17.13.35506.24 (PR: [#7740](https://github.com/dotnet/vscode-csharp/pull/7740))
+* Bump xamltools to 17.13.35507.225 (PR: [#7755](https://github.com/dotnet/vscode-csharp/pull/7755))
+  * XAML IntelliseSense completions for Image.Source
 
 # 2.55.x
+* Update Razor to 9.0.0-preview.24557.10 (PR: [#7757](https://github.com/dotnet/vscode-csharp/pull/7757))
+  * Update VSTelemetryAPI version (#11181) (PR: [#11181](https://github.com/dotnet/razor/pull/11181))
+* Update Roslyn to 4.13.0-2.24557.6 (PR: [#7751](https://github.com/dotnet/vscode-csharp/pull/7751))
+  * Fix issue telemetry reporting incorrect property value (PR: [#75817](https://github.com/dotnet/roslyn/pull/75817))
 * Update Roslyn to 4.13.0-2.24531.3 (PR: [#7722](https://github.com/dotnet/vscode-csharp/pull/7722))
   * Proffer project system query service (PR: [#75682](https://github.com/dotnet/roslyn/pull/75682))
   * Ensure discards are initially soft selected in VSCode (PR: [#75655](https://github.com/dotnet/roslyn/pull/75655))

CONTRIBUTING.md

@@ -59,7 +59,7 @@ To debug integration tests
 1.  Import the `csharp-test-profile.code-profile` in VSCode to setup a clean profile in which to run integration tests.  This must be imported at least once to use the launch configurations (ensure the extensions are updated in the profile).
 2.  Open any integration test file and <kbd>F5</kbd> launch with the correct launch configuration selected.
     - For integration tests inside `test/lsptoolshost`, use either `Launch Current File slnWithCsproj Integration Tests` or `[DevKit] Launch Current File slnWithCsproj Integration Tests` (to run tests using C# + C# Dev Kit)
-    - For integration tests inside `test/razor`, use `Launch Current File BasicRazorApp2_1 Integration Tests`
+    - For integration tests inside `test/razor`, use `[Razor] Run Current File Integration Test`
     - For integration tests inside `test/omnisharp`, use one of the `Omnisharp:` current file profiles
 
 These will allow you to actually debug the test, but the 'Razor integration tests' configuration does not.

azure-pipelines-official.yml

@@ -27,6 +27,9 @@ parameters:
   - auto
   default: auto
 
+variables:
+  defaultDotnetVersion: '8.0.403'
+
 resources:
   repositories:
   - repository: 1ESPipelineTemplates
@@ -63,3 +66,4 @@ extends:
         isOfficial: true
         channel: ${{ parameters.channel }}
         signType: ${{ parameters.signType }}
+        dotnetVersion: $(defaultDotnetVersion)

azure-pipelines.yml

@@ -16,13 +16,32 @@ pr:
     - main
   paths:
     exclude:
-    - ./*.md
+    - ./*.md  
+
+# 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.
+schedules:
+  - cron: "0 0 * * *"
+    displayName: Daily Insiders Build
+    branches:
+      include:
+        - main
+
+variables:
+- name: defaultDotnetVersion
+  value: '8.0.403'
+- name: testVSCodeVersion
+  ${{ if eq( variables['Build.Reason'], 'Schedule' ) }}: 
+    value: insiders
+  ${{ else }}: 
+    value: stable
 
 stages:
 - template: azure-pipelines/build-all.yml
   parameters:
     isOfficial: false
     signType: test
+    dotnetVersion: $(defaultDotnetVersion)
 
 - stage:
   displayName: Test Linux (.NET 6)
@@ -31,7 +50,8 @@ stages:
   - template: azure-pipelines/test-matrix.yml
     parameters:
       # Prefer the dotnet from the container.
-      installDotNet: false
+      dotnetVersion: ''
+      testVSCodeVersion: $(testVSCodeVersion)
       installAdditionalLinuxDependencies: true
       pool:
         name: NetCore-Public
@@ -45,7 +65,8 @@ stages:
   - template: azure-pipelines/test-matrix.yml
     parameters:
       # Prefer the dotnet from the container.
-      installDotNet: false
+      dotnetVersion: ''
+      testVSCodeVersion: $(testVSCodeVersion)
       installAdditionalLinuxDependencies: true
       pool:
         name: NetCore-Public
@@ -58,7 +79,8 @@ stages:
   jobs:
   - template: azure-pipelines/test-matrix.yml
     parameters:
-      installDotNet: true
+      dotnetVersion: $(defaultDotnetVersion)
+      testVSCodeVersion: $(testVSCodeVersion)
       pool:
         name: NetCore-Public
         demands: ImageOverride -equals 1es-windows-2022-open
@@ -69,7 +91,8 @@ stages:
   jobs:
   - template: azure-pipelines/test-matrix.yml
     parameters:
-      installDotNet: true
+      dotnetVersion: $(defaultDotnetVersion)
+      testVSCodeVersion: $(testVSCodeVersion)
       pool:
         name: Azure Pipelines
         vmImage: macOS-13
@@ -90,3 +113,6 @@ stages:
       demands: ImageOverride -equals $(demandsName)
     steps:
     - template: azure-pipelines/test-omnisharp.yml
+      parameters:
+        dotnetVersion: $(defaultDotnetVersion)
+        testVSCodeVersion: $(testVSCodeVersion)

azure-pipelines/build-all.yml

@@ -4,6 +4,8 @@ parameters:
   default: 'default'
 - name: isOfficial
   type: boolean
+- name: dotnetVersion
+  type: string
 - name: channel
   values:
   - release
@@ -96,6 +98,7 @@ stages:
       versionNumberOverride: ${{ parameters.versionNumberOverride }}
       platform: linux
       isOfficial: ${{ parameters.isOfficial }}
+      dotnetVersion: ${{ parameters.dotnetVersion }}
       pool:
         ${{ if eq(parameters.isOfficial, true) }}:
           name: netcore1espool-internal
@@ -109,6 +112,7 @@ stages:
       versionNumberOverride: ${{ parameters.versionNumberOverride }}
       platform: windows
       isOfficial: ${{ parameters.isOfficial }}
+      dotnetVersion: ${{ parameters.dotnetVersion }}
       pool:
         ${{ if eq(parameters.isOfficial, true) }}:
           name: netcore1espool-internal
@@ -122,6 +126,7 @@ stages:
       versionNumberOverride: ${{ parameters.versionNumberOverride }}
       platform: darwin
       isOfficial: ${{ parameters.isOfficial }}
+      dotnetVersion: ${{ parameters.dotnetVersion }}
       pool:
         name: Azure Pipelines
         ${{ if eq(parameters.isOfficial, true) }}:

azure-pipelines/build.yml

@@ -8,6 +8,8 @@ parameters:
   type: object
 - name: isOfficial
   type: boolean
+- name: dotnetVersion
+  type: string
 
 jobs:
 - job: 'Build_${{ parameters.platform }}_vsixs'
@@ -27,6 +29,7 @@ jobs:
   - template: /azure-pipelines/prereqs.yml@self
     parameters:
       versionNumberOverride: ${{ parameters.versionNumberOverride }}
+      dotnetVersion: ${{ parameters.dotnetVersion}}
 
   - task: UsePythonVersion@0
     displayName: 'Use Python 3.11'

azure-pipelines/prereqs.yml

@@ -2,9 +2,8 @@ parameters:
   - name: versionNumberOverride
     type: string
     default: 'default'
-  - name: installDotNet
-    type: boolean
-    default: true
+  - name: dotnetVersion
+    type: string
 
 steps:
 
@@ -15,11 +14,11 @@ steps:
 
 # Some tests use predefined docker images with a specific version of .NET installed.
 # So we avoid installing .NET in those cases.
-- ${{ if eq(parameters.installDotNet, true) }}:
+- ${{ if parameters.dotnetVersion }}:
   - task: UseDotNet@2
     displayName: 'Install .NET SDK'
     inputs:
-      version: '8.0.403'
+      version: ${{ parameters.dotnetVersion }}
 
 - script: dotnet --info
   displayName: Display dotnet info

azure-pipelines/test-matrix.yml

@@ -4,11 +4,13 @@ parameters:
   - name: containerName
     type: string
     default: ''
-  - name: installDotNet
-    type: boolean
+  - name: dotnetVersion
+    type: string
   - name: installAdditionalLinuxDependencies
     type: boolean
     default: false
+  - name: testVSCodeVersion
+    type: string
 
 jobs:
 - job:
@@ -24,6 +26,7 @@ jobs:
   steps:
   - template: /azure-pipelines/test.yml@self
     parameters:
-      installDotNet: true
+      dotnetVersion: ${{ parameters.dotnetVersion }}
       installAdditionalLinuxDependencies: true
-      npmCommand: $(npmCommand)
+      npmCommand: $(npmCommand)
+      testVSCodeVersion: ${{ parameters.testVSCodeVersion }}