Merge pull request #5879 from davidwengier/BumpRazor

Bump Razor to 7.0.0-preview.23301.2

Author: davidwengier

.vscode/launch.json

@@ -285,6 +285,21 @@
                 "NEW_DEPS_VERSION": "1.39.7"
             },
             "cwd": "${workspaceFolder}"
-        }
+        },
+        {
+          "type": "node",
+          "request": "launch",
+          "name": "Update razor package dependencies",
+          "preLaunchTask": "build",
+          "program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
+          "args": [
+              "updatePackageDependencies"
+          ],
+          "env": {
+              "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",
+              "NEW_DEPS_VERSION": "7.0.0-preview.23301.2"
+          },
+          "cwd": "${workspaceFolder}"
+      }
     ]
 }

package.json

@@ -38,7 +38,7 @@
   "defaults": {
     "roslyn": "4.7.0-3.23328.5",
     "omniSharp": "1.39.7",
-    "razor": "7.0.0-preview.23275.2"
+    "razor": "7.0.0-preview.23301.2"
   },
   "main": "./dist/extension",
   "brokeredServices": [
@@ -589,43 +589,46 @@
     {
       "id": "Razor",
       "description": "Razor Language Server (Windows / x64)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/badc9874-13de-4e0c-bad3-ea51383f5a51/477b855ceecec09efb2045364090418d/razorlanguageserver-win-x64-7.0.0-preview.23275.2.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/c51fc9fae3f6fa2b1992df6dd16f50d2/razorlanguageserver-win-x64-7.0.0-preview.23301.2.zip",
       "installPath": ".razor",
       "platforms": [
         "win32"
       ],
       "architectures": [
         "x86_64"
-      ]
+      ],
+      "integrity": "BE0001FDAEB075CE4F9148308C09CF97E85DB3BCBFBE0C2A3D70987D8D265047"
     },
     {
       "id": "Razor",
       "description": "Razor Language Server (Windows / x86)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/badc9874-13de-4e0c-bad3-ea51383f5a51/24405c0cf69106fdb63e48b2612c1416/razorlanguageserver-win-x86-7.0.0-preview.23275.2.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/17ba6e72f65b30a6ddd68dade60343e8/razorlanguageserver-win-x86-7.0.0-preview.23301.2.zip",
       "installPath": ".razor",
       "platforms": [
         "win32"
       ],
       "architectures": [
         "x86"
-      ]
+      ],
+      "integrity": "0B423120E2D59DCB80E2D0C0728CDA89C6F57C34A587317E561BE031896D3A03"
     },
     {
       "id": "Razor",
       "description": "Razor Language Server (Windows / ARM64)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/badc9874-13de-4e0c-bad3-ea51383f5a51/e5b0a15d0b9d2ba3e3014315b6ea9407/razorlanguageserver-win-arm64-7.0.0-preview.23275.2.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/0b1fb7614fbe7a9a9cd2c5470c8865fa/razorlanguageserver-win-arm64-7.0.0-preview.23301.2.zip",
       "installPath": ".razor",
       "platforms": [
         "win32"
       ],
       "architectures": [
         "arm64"
-      ]
+      ],
+      "integrity": "D6252149E17C1A4B7E84814DBFAC0375C5A3854462A3E48D1ED76608311CCECE"
     },
     {
       "id": "Razor",
       "description": "Razor Language Server (Linux / x64)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/badc9874-13de-4e0c-bad3-ea51383f5a51/057b76d69f86efcc7c23d4bc7272bd94/razorlanguageserver-linux-x64-7.0.0-preview.23275.2.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/c22da9d1dbcbf7fd50bd893d845414d7/razorlanguageserver-linux-x64-7.0.0-preview.23301.2.zip",
       "installPath": ".razor",
       "platforms": [
         "linux"
@@ -635,12 +638,13 @@
       ],
       "binaries": [
         "./rzls"
-      ]
+      ],
+      "integrity": "793D8848E7DEB4B425443C7432EAB80AA377FB17325FB535083632349C64A8D7"
     },
     {
       "id": "Razor",
       "description": "Razor Language Server (Linux ARM64)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/badc9874-13de-4e0c-bad3-ea51383f5a51/77b20657f7b71760d4befa8f5b48bb1c/razorlanguageserver-linux-arm64-7.0.0-preview.23275.2.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/6301924acc5020d6545f4573bbb70b88/razorlanguageserver-linux-arm64-7.0.0-preview.23301.2.zip",
       "installPath": ".razor",
       "platforms": [
         "linux"
@@ -650,12 +654,13 @@
       ],
       "binaries": [
         "./rzls"
-      ]
+      ],
+      "integrity": "4238ADC8127496554DA12242AB3EB116129A367D94DF9CF85559C973F8A6F61B"
     },
     {
       "id": "Razor",
       "description": "Razor Language Server (Linux musl / x64)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/badc9874-13de-4e0c-bad3-ea51383f5a51/cd9dc77613f131dbbd573f9bd35b783b/razorlanguageserver-linux-musl-x64-7.0.0-preview.23275.2.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/28003bc9d9c7fdfc288dd113be8fe64d/razorlanguageserver-linux-musl-x64-7.0.0-preview.23301.2.zip",
       "installPath": ".razor",
       "platforms": [
         "linux-musl"
@@ -665,12 +670,13 @@
       ],
       "binaries": [
         "./rzls"
-      ]
+      ],
+      "integrity": "62761B4DDDA46636B011BF486D501C3A7128C067D7ED21D61FDB1B9D267CEC63"
     },
     {
       "id": "Razor",
       "description": "Razor Language Server (Linux musl ARM64)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/badc9874-13de-4e0c-bad3-ea51383f5a51/50520a9da2d929c6963e1d43e1c1f278/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23275.2.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/4e07791acfef2a373dbe497ab2477d55/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23301.2.zip",
       "installPath": ".razor",
       "platforms": [
         "linux-musl"
@@ -680,12 +686,13 @@
       ],
       "binaries": [
         "./rzls"
-      ]
+      ],
+      "integrity": "01F5F6F3C20120168EE271CACB9BB9E2E39AD8789CCFB35758A82B85BC0C829C"
     },
     {
       "id": "Razor",
       "description": "Razor Language Server (macOS / x64)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/badc9874-13de-4e0c-bad3-ea51383f5a51/8e3b2bda0270673beb7bf6afe8acceb9/razorlanguageserver-osx-x64-7.0.0-preview.23275.2.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/814246e6af4cf35db8151d0ee0e82021/razorlanguageserver-osx-x64-7.0.0-preview.23301.2.zip",
       "installPath": ".razor",
       "platforms": [
         "darwin"
@@ -695,12 +702,13 @@
       ],
       "binaries": [
         "./rzls"
-      ]
+      ],
+      "integrity": "F9C8B47DF76FE93BFAD400FECD5A811AFC98CFA517F7127AB29ED777290577A0"
     },
     {
       "id": "Razor",
       "description": "Razor Language Server (macOS ARM64)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/badc9874-13de-4e0c-bad3-ea51383f5a51/49828192b55eaa95e02aa58bcaaf9313/razorlanguageserver-osx-arm64-7.0.0-preview.23275.2.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/4be79e180c7421f9234ffdbed655a83c/razorlanguageserver-osx-arm64-7.0.0-preview.23301.2.zip",
       "installPath": ".razor",
       "platforms": [
         "darwin"
@@ -710,7 +718,8 @@
       ],
       "binaries": [
         "./rzls"
-      ]
+      ],
+      "integrity": "9E259438B2485D9AA0D65C9E55247C418FCB045BD2E01FBE5E3A9CBFB430F874"
     }
   ],
   "engines": {
@@ -4888,4 +4897,4 @@
       }
     ]
   }
-}
+}

src/tools/updatePackageDependencies.ts

@@ -20,7 +20,7 @@ interface PackageJSONFile {
     };
 }
 
-const dottedVersionRegExp = /[0-9]+\.[0-9]+\.[0-9]+/g;
+const dottedVersionRegExp = /[0-9]+\.[0-9]+\.[0-9]+[-a-zA-Z0-9.]*/g;
 const dashedVersionRegExp = /[0-9]+-[0-9]+-[0-9]+/g;
 
 export async function updatePackageDependencies(): Promise<void> {
@@ -47,7 +47,7 @@ export async function updatePackageDependencies(): Promise<void> {
         return;
     }
 
-    if (!/^[0-9]+\.[0-9]+\.[0-9]+$/.test(newVersion)) {
+    if (!/^[0-9]+\.[0-9]+\.[0-9]+[-a-zA-Z0-9.]*$/.test(newVersion)) {
         throw new Error("Unexpected 'NEW_DEPS_VERSION' value. Expected format similar to: 1.2.3.");
     }