Merge branch 'main' into dev/jordi1215/fix-casing-for-razorcomponentattribute

Author: Andrew Hall

.vscode/launch.json

@@ -170,7 +170,7 @@
           ],
           "env": {
               "NEW_DEPS_URLS": " https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/74b76bfa424bd6a36b5fcbd11b801b45/razorlanguageserver-linux-arm64-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/b6fa76f8ccfa8053f56f1fa3d39e78c9/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/97b57265a3097b6128aaa4be297f1243/razorlanguageserver-linux-musl-x64-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/fdf85820363515f55ce0f4e35a7fe780/razorlanguageserver-linux-x64-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/48d3bef6b7f06634e53ca433be40e52a/razorlanguageserver-osx-arm64-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/581c065f415941a97c7687403da5d61c/razorlanguageserver-osx-x64-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/b2940e8871ef222b0bc820b51ec44ed2/razorlanguageserver-platformagnostic-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/bbc8d2a30ba7da4e0eb4465a329b1fa1/razorlanguageserver-win-arm64-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/dc3bfe5f9473a09cb823d665193d4ff0/razorlanguageserver-win-x64-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/7ff9016973253dd93fa52aff5d631aa5/razorlanguageserver-win-x86-7.0.0-preview.24168.4.zip",
-              "NEW_DEPS_VERSION": "7.0.0-preview.24168.3",
+              "NEW_DEPS_VERSION": "7.0.0-preview.24168.4",
               "NEW_DEPS_ID": "Razor"
           },
           "cwd": "${workspaceFolder}"
@@ -185,8 +185,8 @@
             "updatePackageDependencies"
         ],
         "env": {
-            "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_URLS": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/37c9cbad7a9df0efa17d40da3b8ff303/devkittelemetry-linux-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/782d968486f5324e3ff0c7d5fbc31191/devkittelemetry-linux-musl-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/7fc42bdb835a845efb4ee7cc5cf606d9/devkittelemetry-linux-musl-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/b50efac289c46267b8e67318ab840ee4/devkittelemetry-linux-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/9f4cdc6489f81ee9d94c218a61bc19a0/devkittelemetry-osx-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/473295a389ea3331c39b6bab7e52d990/devkittelemetry-osx-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/9e99d301df6c535a4b5e031fbf3695d4/devkittelemetry-platformagnostic-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/36519b4fb02af42c26e5df12592999cc/devkittelemetry-win-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/c32a8e0f3ef1690f9b76dafabbfa8cae/devkittelemetry-win-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/5bf809c31472e7f6b734540f4f80c5f9/devkittelemetry-win-x86-7.0.0-preview.24161.6.zip",
+            "NEW_DEPS_VERSION": "7.0.0-preview.24161.6",
             "NEW_DEPS_ID": "RazorTelemetry"
         },
         "cwd": "${workspaceFolder}"

CHANGELOG.md

@@ -4,6 +4,35 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 ## Latest
+- Updated debugger to fix .NET debugging break with searchNuGetOrgSymbolServer enabled (PR: [#6937](https://github.com/dotnet/vscode-csharp/pull/6937))
+- Update Razor to add formatting option to force open brace onto the next line after a @code or @functions block (PR: [#10018](https://github.com/dotnet/razor/pull/10018))
+
+## 2.22.2
+- Update Roslyn to run on .NET 8 (PR: [#6920](https://github.com/dotnet/vscode-csharp/pull/6920))
+  * Upgrade language server to run on .NET 8 (PR: [#72247](https://github.com/dotnet/roslyn/pull/72247))
+  * Refactors LSP server extension assembly loading (PR: [#71862](https://github.com/dotnet/roslyn/pull/71862))
+  * Report better warnings and errors if build hosts exit abnormally (PR: [#71909](https://github.com/dotnet/roslyn/pull/71909))
+- Update Razor to 7.0.0-preview.24161.6 (PR: [#6922](https://github.com/dotnet/vscode-csharp/pull/6922))
+  - Upgrade language server to run on .NET 8 (PR: [#9981](https://github.com/dotnet/razor/pull/9981))
+  - Support inlay hints (PR: [#9904](https://github.com/dotnet/razor/pull/9904) and [#6857](https://github.com/dotnet/vscode-csharp/pull/6857))
+  - Don't ship as self-contained (PR: [#9891](https://github.com/dotnet/razor/pull/9891))
+  - Better using directive completiong (PR: [#9982](https://github.com/dotnet/razor/pull/9982))
+  - Add option to format code block open brace on new line (PR: [#10018](https://github.com/dotnet/razor/pull/10018) and [#6939](https://github.com/dotnet/vscode-csharp/pull/6939))
+  - Fix an issue that could cause numerous semantic tokens LSP failures on new projects (PR: [#10050](https://github.com/dotnet/razor/pull/10050))
+  - Fix an issue with running on .NET 9 preview builds (PR: [#10064](https://github.com/dotnet/razor/pull/10064))
+
+## 2.19.13
+* Fix `Attribute` snippet (PR: [#6879](https://github.com/dotnet/vscode-csharp/pull/6879))
+* Add grammar support for new Razor directives: rendermode, preservewhitespace and typeparam (PR: [#6887](https://github.com/dotnet/vscode-csharp/pull/6887))
+* Ensure failures to connect to the named pipe are propagated (PR: [#6881](https://github.com/dotnet/vscode-csharp/pull/6881))
+* Update Razor to 7.0.0-preview.24079.3 (PR: [#6841](https://github.com/dotnet/vscode-csharp/pull/6841))
+  * Fix an issue with component hover not showing enough information (PR: [dotnet/razor#9862](https://github.com/dotnet/razor/pull/9862))
+
+# 2.18.15
+* Fix regression in override completion (PR: [#6869](https://github.com/dotnet/vscode-csharp/pull/6869))
+* Update debugger to 2.18.0 release (PR: [#6853](https://github.com/dotnet/vscode-csharp/pull/6853))
+
+## 2.17.7
 * Update Roslyn to 4.10.0-2.24102.11 (PR: [#6847](https://github.com/dotnet/vscode-csharp/pull/6847))
   * Fix another issue loading .NET projects when only the 6.0 SDK is installed (PR: [#71881](https://github.com/dotnet/roslyn/pull/71881))
   * Fix request info leak when project loading is cancelled (PR: [#71737](https://github.com/dotnet/roslyn/pull/71737))

CONTRIBUTING.md

@@ -67,7 +67,7 @@ This section shows how to set up local Razor or Roslyn language servers for debu
 1. Clone the [Roslyn repository](https://github.com/dotnet/roslyn). This repository contains the Roslyn server implementation.
 2. Follow the build instructions provided in the repository.
 
-The server DLL is typically at `$roslynRepoRoot/artifacts/bin/Microsoft.CodeAnalysis.LanguageServer/Debug/net7.0/Microsoft.CodeAnalysis.LanguageServer.dll`, but this may vary based on the built configuration.
+The server DLL is typically at `$roslynRepoRoot/artifacts/bin/Microsoft.CodeAnalysis.LanguageServer/Debug/net8.0/Microsoft.CodeAnalysis.LanguageServer.dll`, but this may vary based on the built configuration.
 
 #### Razor
 
@@ -110,7 +110,7 @@ In your workspace `settings.json` file, add the following lines:
 
 ```json
 "dotnet.server.waitForDebugger": true,
-"dotnet.server.path": "<roslynRepoRoot>/artifacts/bin/Microsoft.CodeAnalysis.LanguageServer/Debug/net7.0/Microsoft.CodeAnalysis.LanguageServer.dll"
+"dotnet.server.path": "<roslynRepoRoot>/artifacts/bin/Microsoft.CodeAnalysis.LanguageServer/Debug/net8.0/Microsoft.CodeAnalysis.LanguageServer.dll"
 ```
 
 Replace <roslynRepoRoot> with the actual path to your Roslyn repository.

azure-pipelines-official.yml

@@ -3,6 +3,7 @@ trigger:
     include:
     - main
     - release
+    - prerelease
 pr: none
 
 parameters:

azure-pipelines.yml

@@ -4,11 +4,13 @@ trigger:
     include:
     - feature/*
     - release
+    - prerelease
     - main
 
 pr:
 - feature/*
 - release
+- prerelease
 - main
 
 stages:

azure-pipelines/loc.yml

@@ -20,67 +20,76 @@ parameters:
     type: boolean
     default: true
 
+resources:
+  repositories:
+  - repository: 1ESPipelineTemplates
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/release
+
 variables:
 # Variable group contains the PAT to LOC
 - group: OneLocBuildVariables
 
-stages:
-- stage: LocalizationStage
-  condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
-  jobs:
-  - job: Localization
+extends:
+  template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates
+  parameters:
     pool:
-      name: NetCore1ESPool-Internal
-      demands: ImageOverride -equals windows.vs2022preview.amd64
-    steps:
-    - task: NodeTool@0
-      displayName: 'Install Node.js 18.x'
-      inputs:
-        # Octokit client needs 18.x to have 'fetch' function.
-        versionSpec: '18.x'
-    - checkout: self
-      clean: true
-      submodules: true
-      fetchTags: false
-      fetchDepth: 0
-    - pwsh: | 
-        npm install
-        npm install -g gulp
-      displayName: 'Install tools'
-    - pwsh: npm run compile
-      displayName: 'Compile'
-    - pwsh: npm run l10nDevGenerateLocalizationBundle
-      displayName: 'Generate bundle.l10.json'
-    - pwsh: npm run l10nDevGenerateXlf
-      displayName: 'Generate xlf files from bundle.10n.json'
-    - task: OneLocBuild@2
-      env:
-        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-      inputs:
-        locProj: loc/LocProject.json
-        outDir: '$(Build.SourcesDirectory)/loc'
-        isCreatePrSelected: false
-        patVariable: $(dn-bot-ceapex-package-r)
-        packageSourceAuth: patAuth
-        lclSource: lclFilesfromPackage
-        LclPackageId: 'LCL-JUNO-PROD-VSCODECS'
-    - pwsh: npm run l10nDevImportXlf
-      displayName: 'Import xlf to json.'
-    - pwsh: gulp 'publish localization content' --userName dotnet-bot --email [email protected] --commitSha $(Build.SourceVersion) --targetRemoteRepo vscode-csharp --baseBranch 'main'
-      displayName: 'Create PR in GitHub.'
-      env:
-        GitHubPAT: $(BotAccount-dotnet-bot-repo-PAT)
-    - task: PublishBuildArtifacts@1
-      displayName: 'Publish Localization Files'
-      inputs:
-        PathtoPublish: '$(Build.SourcesDirectory)/loc'
-        PublishLocation: Container
-        ArtifactName: Loc
-      condition: ${{ parameters.publishLocalizationFile }}
-    - task: PublishBuildArtifacts@1
-      displayName: 'Publish l10n file'
-      inputs:
-        PathtoPublish: '$(Build.SourcesDirectory)/l10n'
-        PublishLocation: Container
-        ArtifactName: l10n
-      condition: ${{ parameters.publishLocalizationFile }}
+      name: NetCore1ESPool-Svc-Internal
+      image: 1es-windows-2022-pt
+      os: windows
+    stages:
+    - stage: LocalizationStage
+      condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
+      jobs:
+      - job: Localization
+        templateContext:
+          outputs:
+          - output: pipelineArtifact
+            displayName: LOC
+            targetPath: '$(Build.SourcesDirectory)/loc'
+            condition: ${{ parameters.publishLocalizationFile }}
+            artifactName: loc
+          - output: pipelineArtifact
+            displayName: l10n
+            targetPath: '$(Build.SourcesDirectory)/l10n'
+            condition: ${{ parameters.publishLocalizationFile }}
+            artifactName: l10n
+        steps:
+        - task: NodeTool@0
+          displayName: 'Install Node.js 18.x'
+          inputs:
+            # Octokit client needs 18.x to have 'fetch' function.
+            versionSpec: '18.x'
+        - checkout: self
+          clean: true
+          submodules: true
+          fetchTags: false
+          fetchDepth: 0
+        - pwsh: | 
+            npm install
+            npm install -g gulp
+          displayName: 'Install tools'
+        - pwsh: npm run compile
+          displayName: 'Compile'
+        - pwsh: npm run l10nDevGenerateLocalizationBundle
+          displayName: 'Generate bundle.l10.json'
+        - pwsh: npm run l10nDevGenerateXlf
+          displayName: 'Generate xlf files from bundle.10n.json'
+        - task: OneLocBuild@2
+          env:
+            SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+          inputs:
+            locProj: loc/LocProject.json
+            outDir: '$(Build.SourcesDirectory)/loc'
+            isCreatePrSelected: false
+            patVariable: $(dn-bot-ceapex-package-r)
+            packageSourceAuth: patAuth
+            lclSource: lclFilesfromPackage
+            LclPackageId: 'LCL-JUNO-PROD-VSCODECS'
+        - pwsh: npm run l10nDevImportXlf
+          displayName: 'Import xlf to json.'
+        - pwsh: gulp 'publish localization content' --userName dotnet-bot --email [email protected] --commitSha $(Build.SourceVersion) --targetRemoteRepo vscode-csharp --baseBranch 'main'
+          displayName: 'Create PR in GitHub.'
+          env:
+            GitHubPAT: $(BotAccount-dotnet-bot-repo-PAT)

azure-pipelines/prereqs.yml

@@ -16,7 +16,7 @@ steps:
 - task: UseDotNet@2
   displayName: 'Install .NET Core SDKs'
   inputs:
-    version: '7.x'
+    version: '8.x'
 
 - script: |
     dotnet tool install --tool-path $(Agent.BuildDirectory) nbgv

l10n/bundle.l10n.cs.json

@@ -31,7 +31,7 @@
   "Could not determine CSharp content": "Nepovedlo se určit obsah CSharp.",
   "Could not determine Html content": "Nepovedlo se určit obsah HTML.",
   "Could not find '{0}' in or above '{1}'.": "Nepovedlo se najít {0} v {1} ani výše.",
-  "Could not find Razor Language Server executable within directory '{0}'": "V adresáři {0} se nepovedlo najít spustitelný soubor jazykového serveru Razor.",
+  "Could not find Razor Language Server executable '{0}' within directory": "V adresáři se nepovedlo najít spustitelný soubor jazykového serveru Razor {0}.",
   "Could not find a process id to attach.": "Nepovedlo se najít ID procesu, který se má připojit.",
   "Could not locate .NET Core project in '{0}'. Assets were not generated.": "V umístění {0} se nepovedlo najít projekt .NET Core. Prostředky se nevygenerovaly.",
   "Couldn't create self-signed certificate. See output for more information.": "Certifikát podepsaný svým držitelem (self-signed certificate) se nepovedlo vytvořit. Další informace najdete ve výstupu.",
@@ -172,7 +172,6 @@
   "[WARNING]: x86 Windows is not supported by the .NET debugger. Debugging will not be available.": "[UPOZORNĚNÍ]: Ladicí program .NET nepodporuje systém Windows pro platformu x86. Ladění nebude k dispozici.",
   "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "Možnost dotnet.server.useOmharharp se změnila. Pokud chcete změnu použít, načtěte prosím znovu okno.",
   "pipeArgs must be a string or a string array type": "pipeArgs musí být řetězec nebo typ pole řetězců",
-  "{0} Keyword": "Klíčové slovo {0}",
   "{0} references": "Počet odkazů: {0}",
   "{0}, paste your issue contents as the body of the issue. Don't forget to fill out any details left unfilled.": "{0}, vložte obsah problému jako text problému. Nezapomeňte vyplnit všechny podrobnosti, které ještě vyplněné nejsou."
 }

l10n/bundle.l10n.de.json

@@ -31,7 +31,7 @@
   "Could not determine CSharp content": "Der CSharp-Inhalt konnte nicht bestimmt werden.",
   "Could not determine Html content": "Der HTML-Inhalt konnte nicht bestimmt werden.",
   "Could not find '{0}' in or above '{1}'.": "\"{0}\" wurde in oder über \"{1}\" nicht gefunden.",
-  "Could not find Razor Language Server executable within directory '{0}'": "Die ausführbare Datei des Razor-Sprachservers wurde im Verzeichnis \"{0}\" nicht gefunden.",
+  "Could not find Razor Language Server executable '{0}' within directory": "Die ausführbare Razor Language Server-Datei „{0}“ wurde im Verzeichnis nicht gefunden.",
   "Could not find a process id to attach.": "Es wurde keine anzufügende Prozess-ID gefunden.",
   "Could not locate .NET Core project in '{0}'. Assets were not generated.": "Das .NET Core-Projekt wurde in \"{0}\" nicht gefunden. Ressourcen wurden nicht generiert.",
   "Couldn't create self-signed certificate. See output for more information.": "Das selbstsignierte Zertifikat konnte nicht erstellt werden. Weitere Informationen finden Sie in der Ausgabe.",
@@ -172,7 +172,6 @@
   "[WARNING]: x86 Windows is not supported by the .NET debugger. Debugging will not be available.": "[WARNUNG]: x86 Windows wird vom .NET-Debugger nicht unterstützt. Debuggen ist nicht verfügbar.",
   "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "Die Option \"dotnet.server.useOmnisharp\" wurde geändert. Laden Sie das Fenster neu, um die Änderung anzuwenden.",
   "pipeArgs must be a string or a string array type": "pipeArgs muss eine Zeichenfolge oder ein Zeichenfolgenarraytyp sein.",
-  "{0} Keyword": "{0}-Schlüsselwort",
   "{0} references": "{0} Verweise",
   "{0}, paste your issue contents as the body of the issue. Don't forget to fill out any details left unfilled.": "{0}, fügen Sie den Inhalt des Problems als Textkörper des Problems ein. Vergessen Sie nicht, alle nicht ausgefüllten Details auszufüllen."
 }