[automated] Merge branch 'main' => 'prerelease' (#8051)

Author: dotnet-policy-service[bot]

.github/policies/resourceManagement.yml

@@ -10,6 +10,29 @@ configuration:
 
     eventResponderTasks:
 
+    - description: Auto-approve/merge automated merge PRs
+      triggerOnOwnActions: false
+      if:
+      - payloadType: Pull_Request
+      - isPullRequest
+      - isActivitySender:
+          user: github-actions[bot]
+          issueAuthor: False
+      - or:
+        - titleContains:
+            pattern: "[automated] Merge branch"
+            isRegex: False
+        - titleContains:
+            pattern: "[automated] Update main version"
+            isRegex: False
+      - isAction:
+          action: Opened
+      then:
+      - approvePullRequest:
+          comment: Auto-approve
+      - enableAutoMerge:
+          mergeMethod: merge
+
     - description: Add "untriaged" label to issues when opened
       triggerOnOwnActions: false
       if:

.github/workflows/branch-snap.yml

@@ -31,5 +31,5 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: Update main version
-          title: 'Update main version'
+          title: '[automated] Update main version'
           branch: merge/update-main-version

CHANGELOG.md

@@ -3,6 +3,30 @@
 - 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.69.x
+* Bump razor to 9.0.0-preview.25156.2 (PR: [#8047](https://github.com/dotnet/vscode-csharp/pull/8047))
+  * Enable FUSE by default
+  * Improve solution load performance (#11591) (PR: [#11591](https://github.com/dotnet/razor/pull/11591))
+  * Make logging fall into the pit of success (#11581) (PR: [#11581](https://github.com/dotnet/razor/pull/11581))
+* Bump xamlTools to 17.14.35904.287 (PR: [#8042](https://github.com/dotnet/vscode-csharp/pull/8042))
+* Update Roslyn to 4.14.0-3.25156.1 (PR: [#8049](https://github.com/dotnet/vscode-csharp/pull/8049))
+  * Don't use an implicit-object if the lang version doesn't support it (PR: [#77437](https://github.com/dotnet/roslyn/pull/77437))
+  * Fix issue where we were changing semantics when converting to a collection expr. (PR: [#77417](https://github.com/dotnet/roslyn/pull/77417))
+  * Detect and emit more idiomatic null check patterns (PR: [#77412](https://github.com/dotnet/roslyn/pull/77412))
+  * Partial events and constructors: IDE (PR: [#77337](https://github.com/dotnet/roslyn/pull/77337))
+  * Simplify keyword recommenders. (PR: [#77396](https://github.com/dotnet/roslyn/pull/77396))
+  * Remove async/await (PR: [#77397](https://github.com/dotnet/roslyn/pull/77397))
+  * Preserve encoding during DocumentState updates (PR: [#77354](https://github.com/dotnet/roslyn/pull/77354))
+  * Don't realize the SourceText in SyntaxTree.OverlapsHiddenPosition if not needed (PR: [#77334](https://github.com/dotnet/roslyn/pull/77334))
+  * Handle ModuleCancellationTokenExpression in AbstractFlow visitor (PR: [#77310](https://github.com/dotnet/roslyn/pull/77310))
+  * PERF: Reduce the number of nodes walked during import completion commit. (PR: [#77305](https://github.com/dotnet/roslyn/pull/77305))
+  * Allow expression body refactorings on non empty selections (PR: [#76969](https://github.com/dotnet/roslyn/pull/76969))
+  * Partial events and constructors: public API (PR: [#77202](https://github.com/dotnet/roslyn/pull/77202))
+  * Refresh diagnostics when fading options change (PR: [#77322](https://github.com/dotnet/roslyn/pull/77322))
+  * Reduce allocations during completion in FilterToVisibleAndBrowsableSymbols (PR: [#77315](https://github.com/dotnet/roslyn/pull/77315))
+  * Change override completion to select text after updating the buffer. (PR: [#76983](https://github.com/dotnet/roslyn/pull/76983))
+  * Fix false positive 'Unnecessary assignment of a value' (PR: [#77297](https://github.com/dotnet/roslyn/pull/77297))
+
 # 2.68.x
 * Update Razor to 9.0.0-preview.25125.9 (PR: [#8027](https://github.com/dotnet/vscode-csharp/pull/8027))
   * Don't send invalid ranges for diagnostics if they do not map (#11555) (PR: [#11555](https://github.com/dotnet/razor/pull/11555))

package.json

@@ -37,11 +37,11 @@
     }
   },
   "defaults": {
-    "roslyn": "4.14.0-2.25120.5",
+    "roslyn": "4.14.0-3.25156.1",
     "omniSharp": "1.39.12",
-    "razor": "9.0.0-preview.25125.9",
+    "razor": "9.0.0-preview.25156.2",
     "razorOmnisharp": "7.0.0-preview.23363.1",
-    "xamlTools": "17.14.35828.13"
+    "xamlTools": "17.14.35904.287"
   },
   "main": "./dist/extension",
   "l10n": "./l10n",
@@ -1519,7 +1519,7 @@
           "razor.languageServer.forceRuntimeCodeGeneration": {
             "type": "boolean",
             "scope": "machine-overridable",
-            "default": null,
+            "default": true,
             "description": "%configuration.razor.languageServer.forceRuntimeCodeGeneration%",
             "order": 90
           },

src/razor/src/razorLanguageServerOptionsResolver.ts

@@ -23,17 +23,7 @@ export function resolveRazorLanguageServerOptions(
     const usingOmniSharp =
         !getCSharpDevKit() && vscodeApi.workspace.getConfiguration().get<boolean>('dotnet.server.useOmnisharp');
 
-    const hotReload = vscodeApi.workspace.getConfiguration('csharp.experimental.debug').get<boolean>('hotReload');
-
-    let forceRuntimeCodeGeneration = serverConfig.get<boolean | null>('forceRuntimeCodeGeneration');
-
-    if (forceRuntimeCodeGeneration === null && hotReload) {
-        logger.logMessage(
-            'Hot Reload is enabled so treating "razor.languageServer.forceRuntimeCodeGeneration" as true. To override this set "razor.languageServer.forceRuntimeCodeGeneration" to true or false.'
-        );
-
-        forceRuntimeCodeGeneration = hotReload;
-    }
+    const forceRuntimeCodeGeneration = serverConfig.get<boolean>('forceRuntimeCodeGeneration');
 
     const suppressErrorToasts = serverConfig.get<boolean>('suppressLspErrorToasts');
     const useNewFormattingEngine = serverConfig.get<boolean>('useNewFormattingEngine');

test/lsptoolshost/integrationTests/codeactions.integration.test.ts

@@ -79,10 +79,12 @@ describe(`Code Actions Tests`, () => {
     test('Add accessibility modifiers applied', async () => {
         const actions = await getCodeActions(new vscode.Range(6, 16, 6, 19), 10);
 
-        expect(actions[0].title).toBe('Add accessibility modifiers');
-        expect(actions[0].edit).toBeDefined();
+        const action = actions.find((a) => a.title === 'Add accessibility modifiers');
 
-        await vscode.workspace.applyEdit(actions[0].edit!);
+        expect(action).toBeDefined();
+        expect(action!.edit).toBeDefined();
+
+        await vscode.workspace.applyEdit(action!.edit!);
 
         await expectText(vscode.window.activeTextEditor!.document, [
             'using System;',

version.json

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