Skip to content

Commit 39028a3

Browse files
davidwengierdavidwengier
authored
Merge pull request #6291 from davidwengier/RazorFormatting
Bump Razor to 7.0.0-preview.23455.5
2 parents 0e63b4a + 7ea877e commit 39028a3

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

‎.vscode/launch.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,8 @@
285285
"updatePackageDependencies"
286286
],
287287
"env": {
288-
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/4aca138f5c6299422e240dcc50689a67/razorlanguageserver-linux-arm64-7.0.0-preview.23423.3.zip,https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/eee386c129c18ba1705fe411cb981a20/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23423.3.zip,https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/7d1e4e0bf72de43dc272d22de2486633/razorlanguageserver-linux-musl-x64-7.0.0-preview.23423.3.zip,https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/b9653cb6c40f965986266f70ae7dab25/razorlanguageserver-linux-x64-7.0.0-preview.23423.3.zip,https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/679c6fe63c016298914264c33326f2ea/razorlanguageserver-osx-arm64-7.0.0-preview.23423.3.zip,https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/74f8a06bc496f54b37466c382c6744ee/razorlanguageserver-osx-x64-7.0.0-preview.23423.3.zip,https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/695b332017bfa81af74787904979fde8/razorlanguageserver-win-arm64-7.0.0-preview.23423.3.zip,https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/a48c3e83b44a34ddb295099c55e31e7e/razorlanguageserver-win-x64-7.0.0-preview.23423.3.zip,https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/e188fa3cbd9a5601701d0f8de0705496/razorlanguageserver-win-x86-7.0.0-preview.23423.3.zip",
289-
"NEW_DEPS_VERSION": "7.0.0-preview.23423.3",
288+
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/5320a329751f981f4c994adcbbaf1831/razorlanguageserver-linux-arm64-7.0.0-preview.23455.5.zip,https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/ad506dfb1de131553eeb5dffdd83f44d/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23455.5.zip,https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/1fe6ed4de9370a8fff70df1133db7889/razorlanguageserver-linux-musl-x64-7.0.0-preview.23455.5.zip,https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/8f59b89a029f07d4e5c20b9c2af4ca21/razorlanguageserver-linux-x64-7.0.0-preview.23455.5.zip,https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/350f666a3a714c2c77d0e79e92238ad7/razorlanguageserver-osx-arm64-7.0.0-preview.23455.5.zip,https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/0b9c653ee9c2815280877865013ab2e4/razorlanguageserver-osx-x64-7.0.0-preview.23455.5.zip,https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/f9ab8a6e654818635e0cd9e3115b59fc/razorlanguageserver-win-arm64-7.0.0-preview.23455.5.zip,https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/43a6adc38859d6cf4d524239b9c3ccf9/razorlanguageserver-win-x64-7.0.0-preview.23455.5.zip,https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/b3a60e667dc67edd38d2a7dd1d6ee139/razorlanguageserver-win-x86-7.0.0-preview.23455.5.zip",
289+
"NEW_DEPS_VERSION": "7.0.0-preview.23455.5",
290290
"NEW_DEPS_ID": "Razor"
291291
},
292292
"cwd": "${workspaceFolder}"

‎CHANGELOG.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## Known Issues
2-
2+
33
- Diagnostics related feature requests and improvements [#5951](https://github.com/dotnet/vscode-csharp/issues/5951)
44
- [O# Parity] FixAll support for code fixes and refactorings [#5735](https://github.com/dotnet/vscode-csharp/issues/5735)
55
- [O# Parity] Nuget restore [#5725](https://github.com/dotnet/vscode-csharp/issues/5725)
@@ -12,6 +12,8 @@
1212
* Includes better support for .NET 8 and .NET Framework-targeting projects (PR: [#69616](https://github.com/dotnet/roslyn/pull/69616))
1313
* This should fix a number of reports where projects don't have full IntelliSense. .NET Framework projects on Windows should load without errors. .NET Framework targeting projects on Mac and Linux which would use Mono are still processed as if they are .NET Core projects and may not load correctly; support for Mono is coming in a future update.
1414
* Fix issues where some projects fail to load being unable to find NuGet.Frameworks (PR: [#69824](https://github.com/dotnet/roslyn/pull/69824))
15+
* Update Razor to 7.0.0-preview.23455.5 (PR: [#6291](https://github.com/dotnet/vscode-csharp/pull/6291))
16+
* Fixes issue reading razor.format.enable and other options (PR: [dotnet/razor#9240](https://github.com/dotnet/razor/issues/9240))
1517

1618
## 2.0.448
1719
* Update Roslyn version (PR: [#6264](https://github.com/dotnet/vscode-csharp/pull/6264))
@@ -47,7 +49,7 @@
4749
* Fix issue resolving .NET 7 runtimes from path (PR: [#6175](https://github.com/dotnet/vscode-csharp/pull/6175))
4850
* Fix URI issue when loading Razor files (PR: [#6168](https://github.com/dotnet/vscode-csharp/pull/6168))
4951
* Bump Razor to 7.0.0-preview.23417.3 (PR: [#6165](https://github.com/dotnet/vscode-csharp/pull/6165))
50-
* Fix various textDocument/foldingRange issues (PR: [#9134](https://github.com/dotnet/razor/pull/9134))
52+
* Fix various textDocument/foldingRange issues (PR: [#9134](https://github.com/dotnet/razor/pull/9134))
5153
* Clarify dotnet path option description (PR: [#6164](https://github.com/dotnet/vscode-csharp/pull/6164))
5254
* Handle multiple dotnet on path and symlinks (PR: [#6152](https://github.com/dotnet/vscode-csharp/pull/6152))
5355
* Localize Roslyn options (PR: [#6136](https://github.com/dotnet/vscode-csharp/pull/6136))

‎package.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"defaults": {
4040
"roslyn": "4.8.0-3.23455.11",
4141
"omniSharp": "1.39.7",
42-
"razor": "7.0.0-preview.23423.3",
42+
"razor": "7.0.0-preview.23455.5",
4343
"razorOmnisharp": "7.0.0-preview.23363.1"
4444
},
4545
"main": "./dist/extension",
@@ -613,46 +613,46 @@
613613
{
614614
"id": "Razor",
615615
"description": "Razor Language Server (Windows / x64)",
616-
"url": "https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/a48c3e83b44a34ddb295099c55e31e7e/razorlanguageserver-win-x64-7.0.0-preview.23423.3.zip",
616+
"url": "https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/43a6adc38859d6cf4d524239b9c3ccf9/razorlanguageserver-win-x64-7.0.0-preview.23455.5.zip",
617617
"installPath": ".razor",
618618
"platforms": [
619619
"win32"
620620
],
621621
"architectures": [
622622
"x86_64"
623623
],
624-
"integrity": "A7815AE5A9BEFE7EB5C0006343341A38D0F7A662865DAD21F0842E064322C186"
624+
"integrity": "01AC16CE66A293E8AEDE43947B41C46A24A35DCD5B23CBB966CA3FFB37894DC0"
625625
},
626626
{
627627
"id": "Razor",
628628
"description": "Razor Language Server (Windows / x86)",
629-
"url": "https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/e188fa3cbd9a5601701d0f8de0705496/razorlanguageserver-win-x86-7.0.0-preview.23423.3.zip",
629+
"url": "https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/b3a60e667dc67edd38d2a7dd1d6ee139/razorlanguageserver-win-x86-7.0.0-preview.23455.5.zip",
630630
"installPath": ".razor",
631631
"platforms": [
632632
"win32"
633633
],
634634
"architectures": [
635635
"x86"
636636
],
637-
"integrity": "D543C2E513F93F91AEDD95AE2A410747D71D3E7CF4D32E0FA31F8B7691109F6F"
637+
"integrity": "059FA2081952AAD7CD1E6407B2D47D9AAEEA0F17EA35380ED5B3B26FDD0ED52F"
638638
},
639639
{
640640
"id": "Razor",
641641
"description": "Razor Language Server (Windows / ARM64)",
642-
"url": "https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/695b332017bfa81af74787904979fde8/razorlanguageserver-win-arm64-7.0.0-preview.23423.3.zip",
642+
"url": "https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/f9ab8a6e654818635e0cd9e3115b59fc/razorlanguageserver-win-arm64-7.0.0-preview.23455.5.zip",
643643
"installPath": ".razor",
644644
"platforms": [
645645
"win32"
646646
],
647647
"architectures": [
648648
"arm64"
649649
],
650-
"integrity": "DF2E2F442BE365DE390F7402CE69E5514D91D379A4A755133B696CC2972CFE53"
650+
"integrity": "80F748457356E766685B17195CE70430938D55783AC976E5BC78395EE2B20622"
651651
},
652652
{
653653
"id": "Razor",
654654
"description": "Razor Language Server (Linux / x64)",
655-
"url": "https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/b9653cb6c40f965986266f70ae7dab25/razorlanguageserver-linux-x64-7.0.0-preview.23423.3.zip",
655+
"url": "https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/8f59b89a029f07d4e5c20b9c2af4ca21/razorlanguageserver-linux-x64-7.0.0-preview.23455.5.zip",
656656
"installPath": ".razor",
657657
"platforms": [
658658
"linux"
@@ -663,12 +663,12 @@
663663
"binaries": [
664664
"./rzls"
665665
],
666-
"integrity": "87D1357F1BCDCBA9D775677B5ADFFE22D87B013155B3ADBDA69F9CEA0F5C0FCF"
666+
"integrity": "D3D7BAB056AADD815E9B2D6F85BEF8CF0BEA1D5F662E6E7D07CA484C1AF25934"
667667
},
668668
{
669669
"id": "Razor",
670670
"description": "Razor Language Server (Linux ARM64)",
671-
"url": "https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/4aca138f5c6299422e240dcc50689a67/razorlanguageserver-linux-arm64-7.0.0-preview.23423.3.zip",
671+
"url": "https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/5320a329751f981f4c994adcbbaf1831/razorlanguageserver-linux-arm64-7.0.0-preview.23455.5.zip",
672672
"installPath": ".razor",
673673
"platforms": [
674674
"linux"
@@ -679,12 +679,12 @@
679679
"binaries": [
680680
"./rzls"
681681
],
682-
"integrity": "9E8C75DBEA512D7FCE5D96D240D57E6C12161EDFE7482A8F68F99BD5019F3EC1"
682+
"integrity": "8C520CB788B3D31A519EF98E64BFEF80DC0142438DB91927588B03969A19805C"
683683
},
684684
{
685685
"id": "Razor",
686686
"description": "Razor Language Server (Linux musl / x64)",
687-
"url": "https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/7d1e4e0bf72de43dc272d22de2486633/razorlanguageserver-linux-musl-x64-7.0.0-preview.23423.3.zip",
687+
"url": "https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/1fe6ed4de9370a8fff70df1133db7889/razorlanguageserver-linux-musl-x64-7.0.0-preview.23455.5.zip",
688688
"installPath": ".razor",
689689
"platforms": [
690690
"linux-musl"
@@ -695,12 +695,12 @@
695695
"binaries": [
696696
"./rzls"
697697
],
698-
"integrity": "AD36EAA27AC75EF161E4642454B995FFE71751ED7B89C6B4233D1D577CB763A6"
698+
"integrity": "A8F2D1297BB16226394777BCB6149ED46E08339F639DB46395AFA9109CA59740"
699699
},
700700
{
701701
"id": "Razor",
702702
"description": "Razor Language Server (Linux musl ARM64)",
703-
"url": "https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/eee386c129c18ba1705fe411cb981a20/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23423.3.zip",
703+
"url": "https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/ad506dfb1de131553eeb5dffdd83f44d/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23455.5.zip",
704704
"installPath": ".razor",
705705
"platforms": [
706706
"linux-musl"
@@ -711,12 +711,12 @@
711711
"binaries": [
712712
"./rzls"
713713
],
714-
"integrity": "EC8279752254F33AECC5D59E7D02DC93BB37EF2740CC63ACFF0DB78725BF169C"
714+
"integrity": "4A3A1D3239B0005E3185212E3A77CAAFD52B540C71C9D82FB8EB9998F1ADC29B"
715715
},
716716
{
717717
"id": "Razor",
718718
"description": "Razor Language Server (macOS / x64)",
719-
"url": "https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/74f8a06bc496f54b37466c382c6744ee/razorlanguageserver-osx-x64-7.0.0-preview.23423.3.zip",
719+
"url": "https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/0b9c653ee9c2815280877865013ab2e4/razorlanguageserver-osx-x64-7.0.0-preview.23455.5.zip",
720720
"installPath": ".razor",
721721
"platforms": [
722722
"darwin"
@@ -727,12 +727,12 @@
727727
"binaries": [
728728
"./rzls"
729729
],
730-
"integrity": "FE3356F653A786A5442E99AA6FE19DD9215962F9B926AD2E723596A5B6E3C135"
730+
"integrity": "D3259D7AFDD5C5B0D25BEBB9E6C00EF8F5ACF0932E902E58CDD9FA10E3BB5EE9"
731731
},
732732
{
733733
"id": "Razor",
734734
"description": "Razor Language Server (macOS ARM64)",
735-
"url": "https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/679c6fe63c016298914264c33326f2ea/razorlanguageserver-osx-arm64-7.0.0-preview.23423.3.zip",
735+
"url": "https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/350f666a3a714c2c77d0e79e92238ad7/razorlanguageserver-osx-arm64-7.0.0-preview.23455.5.zip",
736736
"installPath": ".razor",
737737
"platforms": [
738738
"darwin"
@@ -743,7 +743,7 @@
743743
"binaries": [
744744
"./rzls"
745745
],
746-
"integrity": "594EAE393087FD002829041B261D6777CBA17E612783C548E1B9B2D20BE97E54"
746+
"integrity": "9B28F0F60F2365A25505D6A9C40104A6CEB07D9AD5322609313177C001639C36"
747747
},
748748
{
749749
"id": "RazorOmnisharp",

‎src/razor/src/razorLanguageServerClient.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,6 @@ export class RazorLanguageServerClient implements vscode.Disposable {
248248
args.push('project.razor.vscode.json');
249249
args.push('--DelegateToCSharpOnDiagnosticPublish');
250250
args.push('true');
251-
args.push('--SupportsDelegatedCodeActions');
252-
args.push('true');
253251
args.push('--UpdateBuffersForClosedDocuments');
254252
args.push('true');
255253
}

0 commit comments

Comments
 (0)