Update Razor and Roslyn

CHANGELOG.md

@@ -5,19 +5,35 @@
 
 # 2.112.x
 * Fix TFM detection for .NET 10+ to enable launch.json generation (PR: [#8873](https://github.com/dotnet/vscode-csharp/pull/8873))
-* Update Razor to 10.0.0-preview.25619.1 (PR: [#8867](https://github.com/dotnet/vscode-csharp/pull/8867))
+* Fix JavaScript highlighting in Razor files after C# control structures without braces (PR: [#8865](https://github.com/dotnet/vscode-csharp/pull/8865))
+* Update Razor to 10.0.0-preview.26059.2 (PR: [#8877](https://github.com/dotnet/vscode-csharp/pull/8877))
   * Encode double slash as underscore slash in hint names (PR: [#12597](https://github.com/dotnet/razor/pull/12597))
   * Navigate to a Razor file when GTD/FAR/GTI is run in C# on the class name (PR: [#12580](https://github.com/dotnet/razor/pull/12580))
   * Fix rename of components in the global namespace (PR: [#12577](https://github.com/dotnet/razor/pull/12577))
   * Return a document symbol representing the "Render" method for a Razor file (PR: [#12568](https://github.com/dotnet/razor/pull/12568))
-* Fix JavaScript highlighting in Razor files after C# control structures without braces (PR: [#8865](https://github.com/dotnet/vscode-csharp/pull/8865))
+  * Filter our html diagnostics when a tag helper attribute spans multiple lines (PR: [#12654](https://github.com/dotnet/razor/pull/12654))                                                                                                              
+  * Handle Html indentation ourselves, rather than using the IDE formatter (PR: [#12623](https://github.com/dotnet/razor/pull/12623))                                                                                                                    
+  * Add new option to control attribute indent style (PR: [#12625](https://github.com/dotnet/razor/pull/12625))                                                                                                                                          
+  * Fix formatting with adjacent C# templates (PR: [#12636](https://github.com/dotnet/razor/pull/12636))                                                                                                                                                 
+  * Emit the start of multiline implicit expressions the same as explicit. (PR: [#12624](https://github.com/dotnet/razor/pull/12624))                                                                                                                    
+  * Rename a .razor file when Roslyn renames the component type name (PR: [#12606](https://github.com/dotnet/razor/pull/12606))                                                                                                                          
+  * Rename component tags and type references when a Razor file is renamed (PR: [#12561](https://github.com/dotnet/razor/pull/12561))                                                                                                                    
+  * Handle conflict markers (PR: [#12642](https://github.com/dotnet/razor/pull/12642))                                                                                                                                                                   
+  * Fix cross project span and edit mapping (PR: [#12614](https://github.com/dotnet/razor/pull/12614))                                                                                                                                                   
+* Update Roslyn to 5.4.0-2.26060.1 (PR: [#8877](https://github.com/dotnet/vscode-csharp/pull/8877))  
+  * Add back async fixers (PR: [#81835](https://github.com/dotnet/roslyn/pull/81835))
+  * Fix crash in convert-if-to-switch (PR: [#81724](https://github.com/dotnet/roslyn/pull/81724))
+  * Add code-folding/structure-guides/sticky-scroll support for extension blocks (PR: [#81667](https://github.com/dotnet/roslyn/pull/81667))
+  * Improve go-to-def in situations where compiler returns multiple candidates. (PR: [#81583](https://github.com/dotnet/roslyn/pull/81583))
+  * Add willRenameFiles support, and an abstraction for extenders to implement (PR: [#81549](https://github.com/dotnet/roslyn/pull/81549))
+  * Support `// lang=c#` along with `// lang=c#-test` (PR: [#81558](https://github.com/dotnet/roslyn/pull/81558))
 
 # 2.111.x
 * Razor logging cleanup and documentation update (PR: [#8843](https://github.com/dotnet/vscode-csharp/pull/8843))
 * Create Razor tags based on the razorExtension component (PR: [#8830](https://github.com/dotnet/vscode-csharp/pull/8830))
 * Add second opt-out flag for file-based programs (PR: [#8823](https://github.com/dotnet/vscode-csharp/pull/8823))
 * Update extension to run on .NET 10 (PR: [#8839](https://github.com/dotnet/vscode-csharp/pull/8839))
-* Update Roslyn to 5.3.0-2.25604.5 (PR: [#8839](https://github.com/dotnet/vscode-csharp/pull/))
+* Update Roslyn to 5.3.0-2.25604.5 (PR: [#8839](https://github.com/dotnet/vscode-csharp/pull/8839))
   * Build our libraries against net10.0 (PR: [#81545](https://github.com/dotnet/roslyn/pull/81545))
   * Update Roslyn LSP server to .net10 (PR: [#81508](https://github.com/dotnet/roslyn/pull/81508))
   * Fix InvalidCastException in ConvertForToForEach with tuples (PR: [#81531](https://github.com/dotnet/roslyn/pull/81531))

package.json

@@ -40,9 +40,9 @@
     "workspace"
   ],
   "defaults": {
-    "roslyn": "5.3.0-2.25604.5",
+    "roslyn": "5.4.0-2.26060.1",
     "omniSharp": "1.39.14",
-    "razor": "10.0.0-preview.25619.1",
+    "razor": "10.0.0-preview.26059.2",
     "razorOmnisharp": "7.0.0-preview.23363.1",
     "xamlTools": "18.3.11128.18"
   },
@@ -1761,6 +1761,15 @@
             "default": false,
             "description": "%configuration.omnisharp.razor.format.codeBlockBraceOnNextLine%"
           },
+          "razor.format.attributeIndentStyle": {
+            "type": "string",
+            "default": "alignWithFirst",
+            "enum": [
+              "alignWithFirst",
+              "indentByOne"
+            ],
+            "description": "%configuration.omnisharp.razor.format.attributeIndentStyle%"
+          },
           "razor.completion.commitElementsWithSpace": {
             "type": "boolean",
             "scope": "window",

package.nls.json

@@ -129,6 +129,7 @@
   "configuration.omnisharp.razor.devmode": "Forces the extension to run in a mode that enables local Razor.VSCode development.",
   "configuration.omnisharp.razor.format.enable": "Enable/disable default Razor formatter.",
   "configuration.omnisharp.razor.format.codeBlockBraceOnNextLine": "Forces the open brace after an @code or @functions directive to be on the following line.",
+  "configuration.omnisharp.razor.format.attributeIndentStyle": "Specifies the indentation style for Html and component tag attributes in Razor files.",
   "configuration.omnisharp.razor.completion.commitElementsWithSpace": "Specifies whether to commit tag helper and component elements with a space.",
   "configuration.razor.languageServer.directory": "Overrides the path to the Razor Language Server directory.",
   "configuration.razor.languageServer.debug": "Specifies whether to wait for debug attach when launching the language server.",