Merge pull request #6770 from davidwengier/RazorLogging

Rename razor.trace to razor.server.trace, and use LogLevel values, to match Roslyn (and VS Code conventions)

Author: davidwengier

.vscode/launch.json

@@ -169,8 +169,8 @@
               "updatePackageDependencies"
           ],
           "env": {
-              "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/c272788e7d4dae4b7ddaac5f51f98a78/razorlanguageserver-linux-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/9391972405d093eaa406482ffe73925e/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/7d68e714a49ffa67169bdb2f979d9625/razorlanguageserver-linux-musl-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/9c1986fb1da8db7882cc4af6e624a92e/razorlanguageserver-linux-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/374d6a0c0ae5b043fa424a89e740e82e/razorlanguageserver-osx-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/44eced55816edabb41d131eec4db442b/razorlanguageserver-osx-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/1e21370d7aa085b5ef9da0708e73707d/razorlanguageserver-platformagnostic-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/2b08591e0a9532a95cbb4d961e543624/razorlanguageserver-win-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/b6fc013fa813d42c44ffe33bc31742f9/razorlanguageserver-win-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/21e60c5e4f6423182ea9725cd3d28668/razorlanguageserver-win-x86-7.0.0-preview.23616.1.zip",
-              "NEW_DEPS_VERSION": "7.0.0-preview.23616.1",
+              "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/57a8b1dc12af90bdc1b8e0036d4b5cf8/razorlanguageserver-linux-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/b59d0eb28baf935dcb81dc1aa91b8b37/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/b6de6303a02473ba8fbe4d127d3d0827/razorlanguageserver-linux-musl-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/a9c955bc5b09ee22f82309ec821ea630/razorlanguageserver-linux-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/0ad87856a78cf034b5e30423f51f42ca/razorlanguageserver-osx-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/d7dbdd01e9d1fc74e44de8bf5c2c3cf4/razorlanguageserver-osx-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/2d81ded18f0c7efa1c7e37489093a613/razorlanguageserver-platformagnostic-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/3f8fd08587afa3b615886dd745723497/razorlanguageserver-win-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/5d025f318cb834236a06439eb37ce889/razorlanguageserver-win-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/adb8c2855e48de8cdd7e39eb669583fd/razorlanguageserver-win-x86-7.0.0-preview.23627.2.zip",
+              "NEW_DEPS_VERSION": "7.0.0-preview.23627.2",
               "NEW_DEPS_ID": "Razor"
           },
           "cwd": "${workspaceFolder}"
@@ -185,8 +185,8 @@
             "updatePackageDependencies"
         ],
         "env": {
-            "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/2cb789acba83c4d4080cf10b3e91720c/devkittelemetry-linux-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/7dc0d68d9ed50a0de44894d0ac7d9fa9/devkittelemetry-linux-musl-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/7f3d45705e5ce18781dc69a7bb1084b9/devkittelemetry-linux-musl-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/91916990f7b25c357bb577c60c00e9f5/devkittelemetry-linux-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/09ae5baf1e9f1c894ba269aa4484ca48/devkittelemetry-osx-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/3ab2d6e1d3bdc5575075d9a062a24166/devkittelemetry-osx-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/40b4a00152d07869d12ce44b96572d4c/devkittelemetry-platformagnostic-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/6d5a093349b5e749c44457cb758f718f/devkittelemetry-win-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/7e92c77e99d0291a9ab78c8c993315a2/devkittelemetry-win-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/902166e7b43e0a87a62bc9c39aa21c7b/devkittelemetry-win-x86-7.0.0-preview.23616.1.zip",
-            "NEW_DEPS_VERSION": "7.0.0-preview.23616.1",
+            "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/43f1ef568ef88acabea9c481f26fcf7b/devkittelemetry-linux-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/c4ff4d3e1476e78f2d73b48e26c69ef6/devkittelemetry-linux-musl-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/310f2c0528251ca3b879b62f7a434446/devkittelemetry-linux-musl-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/fa99bc6fb3d16f8c44f0ad61023e0589/devkittelemetry-linux-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/6d1472e8f350ab8f388c343db7760c9f/devkittelemetry-osx-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/5576ccdc7e3157c034a89ba13a63c915/devkittelemetry-osx-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/e1a9519ed126c32b21eb79758a09d7a6/devkittelemetry-platformagnostic-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/c3b220e7bcc471a816c6d6ba0dc351b0/devkittelemetry-win-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/7933e8f488ff35ed9204db2aaabe6e3b/devkittelemetry-win-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/e2017d3c8ae1a52ced7b31936b2a9d19/devkittelemetry-win-x86-7.0.0-preview.23627.2.zip",
+            "NEW_DEPS_VERSION": "7.0.0-preview.23627.2",
             "NEW_DEPS_ID": "RazorTelemetry"
         },
         "cwd": "${workspaceFolder}"

CHANGELOG.md

@@ -6,7 +6,8 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 ## Latest
-* Update Razor to 7.0.0-preview.23616.1 (PR: [#6760](https://github.com/dotnet/vscode-csharp/pull/6760)
+* Update Razor to 7.0.0-preview.23627.2 (PR: [#6770](https://github.com/dotnet/vscode-csharp/pull/6770)
+  * Fixed issue where Razor trace level was ignored. New `razor.server.trace` setting created that is not ignored (PR: [dotnet/razor#9745](https://github.com/dotnet/razor/pull/9745))
 * Update Roslyn to 4.9.0-3.23611.3 (PR: [#6736](https://github.com/dotnet/vscode-csharp/pull/6736))
 * Update OmniSharp to 1.39.11 (PR: [#6771](https://github.com/dotnet/vscode-csharp/pull/6771))
   * Fix loading AspNetCore projects by shipping the AspNetCore EA library

CONTRIBUTING.md

@@ -39,7 +39,7 @@ https://github.com/dotnet/razor contains the server implementation.  Follow the
 
 depending on which configuration is built.  Then, launch the extension here and change the VSCode setting `razor.languageServer.directory` to point to the Razor executable path you built above and reload the window.
 
-If you need to debug the server, you can set the VSCode setting `razor.languageServer.debug` to true.  This will trigger a `Debugger.Launch()` on the server side as it starts. You can also set `razor.trace` to `Verbose` to get more log messages in the output window
+If you need to debug the server, you can set the VSCode setting `razor.languageServer.debug` to true.  This will trigger a `Debugger.Launch()` on the server side as it starts. You can also set `razor.server.trace` to `Debug` to get more log messages in the output window
 
 ### Creating VSIXs
 
@@ -52,4 +52,4 @@ To update the version of the roslyn server used by the extension do the followin
 2.  In the official build stage, look for the `Publish Assets` step.  In there you will see it publishing the `Microsoft.CodeAnalysis.LanguageServer.neutral` package with some version, e.g. `4.6.0-3.23158.4`.  Take note of that version number.
 3.  In the [package.json](package.json) inside the `defaults` section update the `roslyn` key to point to the version number you found above in step 2.
 4.  Ensure that version of the package is in the proper feeds by running `gulp updateRoslynVersion`. Note: you may need to install the [Azure Artifacts NuGet Credential Provider](https://github.com/microsoft/artifacts-credprovider#installation-on-windows) to run interactive authentication.
-5.  Build and test the change. If everything looks good, submit a PR.
+5.  Build and test the change. If everything looks good, submit a PR.

l10n/bundle.l10n.json

@@ -47,7 +47,7 @@
   "Downloading Razor Telemetry Package": "Downloading Razor Telemetry Package",
   "Cannot load Razor language server because the directory was not found: '{0}'": "Cannot load Razor language server because the directory was not found: '{0}'",
   "Could not find '{0}' in or above '{1}'.": "Could not find '{0}' in or above '{1}'.",
-  "Invalid trace setting for Razor language server. Defaulting to '{0}'": "Invalid trace setting for Razor language server. Defaulting to '{0}'",
+  "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'",
   "Could not find Razor Language Server executable within directory '{0}'": "Could not find Razor Language Server executable within directory '{0}'",
   "Server failed to start after retrying 5 times.": "Server failed to start after retrying 5 times.",
   "Razor Language Server failed to start unexpectedly, please check the 'Razor Log' and report an issue.": "Razor Language Server failed to start unexpectedly, please check the 'Razor Log' and report an issue.",