Skip to content

Commit 0631bb6

Browse files
dibarbetdibarbet
authored
Merge branch 'main' into show_project_load_error
2 parents 2ba98ae + cb5f4d3 commit 0631bb6

File tree

3 files changed

+37
-22
lines changed

3 files changed

+37
-22
lines changed

‎.vscode/launch.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,9 @@
286286
"updatePackageDependencies"
287287
],
288288
"env": {
289-
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/6301924acc5020d6545f4573bbb70b88/razorlanguageserver-linux-arm64-7.0.0-preview.23301.2.zip,https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/4e07791acfef2a373dbe497ab2477d55/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23301.2.zip,https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/28003bc9d9c7fdfc288dd113be8fe64d/razorlanguageserver-linux-musl-x64-7.0.0-preview.23301.2.zip,https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/c22da9d1dbcbf7fd50bd893d845414d7/razorlanguageserver-linux-x64-7.0.0-preview.23301.2.zip,https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/4be79e180c7421f9234ffdbed655a83c/razorlanguageserver-osx-arm64-7.0.0-preview.23301.2.zip,https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/814246e6af4cf35db8151d0ee0e82021/razorlanguageserver-osx-x64-7.0.0-preview.23301.2.zip,https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/0b1fb7614fbe7a9a9cd2c5470c8865fa/razorlanguageserver-win-arm64-7.0.0-preview.23301.2.zip,https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/c51fc9fae3f6fa2b1992df6dd16f50d2/razorlanguageserver-win-x64-7.0.0-preview.23301.2.zip,https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/17ba6e72f65b30a6ddd68dade60343e8/razorlanguageserver-win-x86-7.0.0-preview.23301.2.zip",
290-
"NEW_DEPS_VERSION": "7.0.0-preview.23301.2"
289+
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/0b5b703dafc66d517ace9324e293f9aa/razorlanguageserver-linux-arm64-7.0.0-preview.23405.1.zip,https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/c1c045b721fdf40c190ee10368127a4a/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23405.1.zip,https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/90a1b16b52d8dd8b98830aa196d16b31/razorlanguageserver-linux-musl-x64-7.0.0-preview.23405.1.zip,https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/22c9d8ca5e32a811ae620d10b0f16600/razorlanguageserver-linux-x64-7.0.0-preview.23405.1.zip,https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/f5ac44bbec4ca39f238492db24613411/razorlanguageserver-osx-arm64-7.0.0-preview.23405.1.zip,https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/a0d3f3a01f1ebd902841b1540ef6c539/razorlanguageserver-osx-x64-7.0.0-preview.23405.1.zip,https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/6d8a1f682e858b3e13d3836cab18df37/razorlanguageserver-win-arm64-7.0.0-preview.23405.1.zip,https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/a04e8be09ea48c4e9e75b8e8fd93cd82/razorlanguageserver-win-x64-7.0.0-preview.23405.1.zip,https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/15b67c9b4e30357c37f57069f1abca19/razorlanguageserver-win-x86-7.0.0-preview.23405.1.zip",
290+
"NEW_DEPS_VERSION": "7.0.0-preview.23405.1",
291+
"NEW_DEPS_ID": "Razor"
291292
},
292293
"cwd": "${workspaceFolder}"
293294
}

‎package.json‎

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"defaults": {
3939
"roslyn": "4.8.0-1.23407.6",
4040
"omniSharp": "1.39.7",
41-
"razor": "7.0.0-preview.23328.2",
41+
"razor": "7.0.0-preview.23405.1",
4242
"razorOmnisharp": "7.0.0-preview.23363.1"
4343
},
4444
"main": "./dist/extension",
@@ -600,43 +600,46 @@
600600
{
601601
"id": "Razor",
602602
"description": "Razor Language Server (Windows / x64)",
603-
"url": "https://download.visualstudio.microsoft.com/download/pr/51d2bf3c-cb3c-4385-b59f-d4d6c9a96743/3b7fc7c2f06e48d78bec2125adcc41aa/razorlanguageserver-win-x64-7.0.0-preview.23328.2.zip",
603+
"url": "https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/a04e8be09ea48c4e9e75b8e8fd93cd82/razorlanguageserver-win-x64-7.0.0-preview.23405.1.zip",
604604
"installPath": ".razor",
605605
"platforms": [
606606
"win32"
607607
],
608608
"architectures": [
609609
"x86_64"
610-
]
610+
],
611+
"integrity": "A82B8CC0485F7D55B193B4FF2066E427E946C3607C21D140BFBC47C1D14F0DA4"
611612
},
612613
{
613614
"id": "Razor",
614615
"description": "Razor Language Server (Windows / x86)",
615-
"url": "https://download.visualstudio.microsoft.com/download/pr/51d2bf3c-cb3c-4385-b59f-d4d6c9a96743/d1b37bd821529147e7ffec08f98be17c/razorlanguageserver-win-x86-7.0.0-preview.23328.2.zip",
616+
"url": "https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/15b67c9b4e30357c37f57069f1abca19/razorlanguageserver-win-x86-7.0.0-preview.23405.1.zip",
616617
"installPath": ".razor",
617618
"platforms": [
618619
"win32"
619620
],
620621
"architectures": [
621622
"x86"
622-
]
623+
],
624+
"integrity": "B42C5D2F24E2F62BF3DF959AF1B3CA0465EE129332CFE7D08D2644F03708F21F"
623625
},
624626
{
625627
"id": "Razor",
626628
"description": "Razor Language Server (Windows / ARM64)",
627-
"url": "https://download.visualstudio.microsoft.com/download/pr/51d2bf3c-cb3c-4385-b59f-d4d6c9a96743/b2aa92ccbdf03761b6783bf123bfbe22/razorlanguageserver-win-arm64-7.0.0-preview.23328.2.zip",
629+
"url": "https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/6d8a1f682e858b3e13d3836cab18df37/razorlanguageserver-win-arm64-7.0.0-preview.23405.1.zip",
628630
"installPath": ".razor",
629631
"platforms": [
630632
"win32"
631633
],
632634
"architectures": [
633635
"arm64"
634-
]
636+
],
637+
"integrity": "A92321DC94E54A1CF3224B7309830ED7FCC7CE1ED72B23F02085F841D196D482"
635638
},
636639
{
637640
"id": "Razor",
638641
"description": "Razor Language Server (Linux / x64)",
639-
"url": "https://download.visualstudio.microsoft.com/download/pr/51d2bf3c-cb3c-4385-b59f-d4d6c9a96743/68986857aef04be58efab25ffd338a93/razorlanguageserver-linux-x64-7.0.0-preview.23328.2.zip",
642+
"url": "https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/22c9d8ca5e32a811ae620d10b0f16600/razorlanguageserver-linux-x64-7.0.0-preview.23405.1.zip",
640643
"installPath": ".razor",
641644
"platforms": [
642645
"linux"
@@ -646,12 +649,13 @@
646649
],
647650
"binaries": [
648651
"./rzls"
649-
]
652+
],
653+
"integrity": "ACC83200D0B7AF654D2242167184B2921CD063837477C9B1B47034B883CEF205"
650654
},
651655
{
652656
"id": "Razor",
653657
"description": "Razor Language Server (Linux ARM64)",
654-
"url": "https://download.visualstudio.microsoft.com/download/pr/51d2bf3c-cb3c-4385-b59f-d4d6c9a96743/c74964f4e130b50f9aef47d430c34a97/razorlanguageserver-linux-arm64-7.0.0-preview.23328.2.zip",
658+
"url": "https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/0b5b703dafc66d517ace9324e293f9aa/razorlanguageserver-linux-arm64-7.0.0-preview.23405.1.zip",
655659
"installPath": ".razor",
656660
"platforms": [
657661
"linux"
@@ -661,12 +665,13 @@
661665
],
662666
"binaries": [
663667
"./rzls"
664-
]
668+
],
669+
"integrity": "CF731EDC6FD31D64AEA38F0EAC47D053D8E01F16435EAB5582964A638A19A095"
665670
},
666671
{
667672
"id": "Razor",
668673
"description": "Razor Language Server (Linux musl / x64)",
669-
"url": "https://download.visualstudio.microsoft.com/download/pr/51d2bf3c-cb3c-4385-b59f-d4d6c9a96743/c204acfa0fd9d0e06fbcc3aac3ba846e/razorlanguageserver-linux-musl-x64-7.0.0-preview.23328.2.zip",
674+
"url": "https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/90a1b16b52d8dd8b98830aa196d16b31/razorlanguageserver-linux-musl-x64-7.0.0-preview.23405.1.zip",
670675
"installPath": ".razor",
671676
"platforms": [
672677
"linux-musl"
@@ -676,12 +681,13 @@
676681
],
677682
"binaries": [
678683
"./rzls"
679-
]
684+
],
685+
"integrity": "5219AE18BB0D56E7E2DE665CDDC3B35108AF17367CEB140115E4FA7C56AEAEDC"
680686
},
681687
{
682688
"id": "Razor",
683689
"description": "Razor Language Server (Linux musl ARM64)",
684-
"url": "https://download.visualstudio.microsoft.com/download/pr/51d2bf3c-cb3c-4385-b59f-d4d6c9a96743/7ad5dd2c8780d3e4eaaafb5352a21afa/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23328.2.zip",
690+
"url": "https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/c1c045b721fdf40c190ee10368127a4a/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23405.1.zip",
685691
"installPath": ".razor",
686692
"platforms": [
687693
"linux-musl"
@@ -691,12 +697,13 @@
691697
],
692698
"binaries": [
693699
"./rzls"
694-
]
700+
],
701+
"integrity": "8C4E81511C6D4E2F5B4F0A7CA3EBC7F9554BD98007DBE62463BA1F6901887A93"
695702
},
696703
{
697704
"id": "Razor",
698705
"description": "Razor Language Server (macOS / x64)",
699-
"url": "https://download.visualstudio.microsoft.com/download/pr/51d2bf3c-cb3c-4385-b59f-d4d6c9a96743/d7017a3e07d15f057353ab21b8710714/razorlanguageserver-osx-x64-7.0.0-preview.23328.2.zip",
706+
"url": "https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/a0d3f3a01f1ebd902841b1540ef6c539/razorlanguageserver-osx-x64-7.0.0-preview.23405.1.zip",
700707
"installPath": ".razor",
701708
"platforms": [
702709
"darwin"
@@ -706,12 +713,13 @@
706713
],
707714
"binaries": [
708715
"./rzls"
709-
]
716+
],
717+
"integrity": "456BB96B6C7234732DEEE73062426C4991932F61698E6D49B427B4870A6A9BEE"
710718
},
711719
{
712720
"id": "Razor",
713721
"description": "Razor Language Server (macOS ARM64)",
714-
"url": "https://download.visualstudio.microsoft.com/download/pr/51d2bf3c-cb3c-4385-b59f-d4d6c9a96743/a31700a64049f7c770a525662ef74f3c/razorlanguageserver-osx-arm64-7.0.0-preview.23328.2.zip",
722+
"url": "https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/f5ac44bbec4ca39f238492db24613411/razorlanguageserver-osx-arm64-7.0.0-preview.23405.1.zip",
715723
"installPath": ".razor",
716724
"platforms": [
717725
"darwin"
@@ -721,7 +729,8 @@
721729
],
722730
"binaries": [
723731
"./rzls"
724-
]
732+
],
733+
"integrity": "3E29F143169DF08B09E3A62FEE8C79535E21FA5B2D50F9AE15A142FD74DACE7F"
725734
},
726735
{
727736
"id": "RazorOmnisharp",
@@ -5025,4 +5034,4 @@
50255034
}
50265035
]
50275036
}
5028-
}
5037+
}

‎src/tools/updatePackageDependencies.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,11 @@ export async function updatePackageDependencies(): Promise<void> {
105105

106106
// First build the map
107107
packageJSON.runtimeDependencies.forEach((dependency) => {
108+
// If a packageId is specified, only look at dependencies for that package
109+
if (packageId && dependency.id.toLowerCase() !== packageId.toLowerCase()) {
110+
return;
111+
}
112+
108113
const fileName = getLowercaseFileNameFromUrl(dependency.url);
109114
const existingDependency = mapFileNameToDependency[fileName];
110115
if (existingDependency !== undefined) {

0 commit comments

Comments
 (0)