Merge pull request #6193 from dibarbet/merge_main

Merge main to release

Author: dibarbet

.gitattributes

@@ -0,0 +1,2 @@
+# This is a generated file from vscode-l10n tool, and it always uses 'lf' and line ending. Set it to 'lf' so we don't get warning every time when localization file get changed.
+l10n/bundle.l10n.json text eol=lf

.vscode/launch.json

@@ -4,7 +4,7 @@
 
 First install:
 
-* Node.js ([v18.17.0 LTS](https://nodejs.org/de/blog/release/v18.17.0) is recommended).
+* Node.js ([v18.17.0 LTS](https://nodejs.org/en/blog/release/v18.17.0) is recommended).
 * Npm (The version shipped with node is fine)
 * .NET 7.0 SDK (dotnet should be on your path)
 

CONTRIBUTING.md

@@ -8,7 +8,7 @@ While it is possible to use the C# extension as a standalone extension, we highl
 2. Open a folder/workspace that contains a C# project (.csproj) and a C# solution (.sln) and the extension will activate.
 3. Whether you install C# Dev Kit or just the C# extension, the [.NET Runtime Installer Tool extension](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.vscode-dotnet-runtime) will be installed as a dependency.
 
-Note: If working on a solution that requires versions prior to .NET 6 or non-solution based projects, install a Full Framework runtime and [MSBuild tooling](https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2022).
+Note: If working on a solution that requires versions prior to .NET 6 or non-solution based projects, install a .NET Framework runtime and [MSBuild tooling](https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2022).
   * Set omnisharp.useModernNet to false and set dotnet.server.useOmnisharp to true
   * Uninstall or disable C# Dev Kit
   * Windows: .NET Framework along with [MSBuild Tools](https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2022)
@@ -29,11 +29,20 @@ For more information you can:
 ## How to use OmniSharp?
 If you don’t want to take advantage of the great Language Server features, you can revert back to using OmniSharp by going to the Extension settings and setting `dotnet.server.useOmnisharp` to true. Next, uninstall or disable C# Dev Kit. Finally, restart VS Code for this to take effect.
 
-
 ## Found a Bug?
-To file a new issue to include all the related config information directly from vscode by entering the command pallette with Ctrl+Shift+P (Cmd+Shift+P on macOS) and running CSharp: Report an issue command. This will open a browser window with all the necessary information related to the installed extensions, dotnet version, mono version, etc. Enter all the remaining information and hit submit. 
-Alternatively you could visit https://github.com/dotnet/vscode-csharp/issues  and file a new one.
-
+To file a new issue:
+
+1. Open the Command Palette with Ctrl+Shift+P (Cmd+Shift+P on macOS), type "Open Settings (UI)", and press Enter.
+2. Search for "trace" in the search bar. Under "Dotnet > Server: Trace" select "Trace" from the drop down. This will provide more output information.
+3. Reload the window by opening the Command Palette with Ctrl+Shift+P (Cmd+Shift+P on macOS), type "Reload Window", and press Enter.
+4. Next, check the C# logs in the Output Window by opening it with Ctrl+Shift+U (Cmd+Shift+U on macOS), and select C# from the dropdown.
+5. Select and copy all the text in the log, and then report the issue through VS Code.
+6. Open the Command Palette with Ctrl+Shift+P (Cmd+Shift+P on macOS), type “CSharp: Report an issue”, and press Enter.
+7. This will open a window with all the necessary information related to the C# extension, dotnet version, mono version, etc.
+8. Paste the previously copied C# log into the “Steps to Reproduce” field. Please also include a description of what you were doing/attempting to do at the time the problem occurred.
+9. Click the “Preview on GitHub” button, and then file the issue.
+
+Alternatively, you could visit https://github.com/dotnet/vscode-csharp/issues and file a new issue there.
 
 ## Contributing
 

README.md

@@ -22,5 +22,5 @@ steps:
     targetPath: '$(Build.SourcesDirectory)/vsix'
     artifactName: 'VSIXs - Attempt $(System.JobAttempt)'
 
-- script: npm run test:artifacts
+- script: npm run omnisharptest:artifacts
   displayName: 'Run artifacts tests'

azure-pipelines/build.yml

@@ -1,6 +1,20 @@
-trigger: none
+trigger:
+  branches:
+    include:
+    - main
+
 pr: none
 
+# localization result might not be ready when PR triggered the pipeline.
+# Run this weekly to make sure everything is localized.
+schedules:
+- cron: '0 12 * * 0'
+  displayName: Weekly localization run
+  always: true
+  branches:
+    include:
+    - main
+
 parameters:
   - name: publishLocalizationFile
     type: boolean

azure-pipelines/loc.yml

@@ -15,66 +15,110 @@ parameters:
 variables:
 # This is expected to provide VisualStudioMarketplacePAT to the release (https://code.visualstudio.com/api/working-with-extensions/publishing-extension#get-a-personal-access-token)
 - group: vscode-csharp release secrets
+# This is expected to provide pat to tag release.
+- group: DncEng-Partners-Tokens
 
-jobs:
-- job: PublishToMarketplace
-  pool:
-    vmImage: ubuntu-latest
-  steps:
-  - task: DownloadPipelineArtifact@2
-    displayName: '📦 Download artifacts from build pipeline.'
-    inputs:
-      buildType: 'specific'
-      project: 'internal'
-      definition: 1264
-      buildVersionToDownload: 'specific'
-      buildId: '$(resources.pipeline.officialBuildCI.runID)'
-      branchName: '$(resources.pipeline.officialBuildCI.sourceBranch)'
-  - pwsh: |
-      npm install --global vsce
-    displayName: 'Install vsce'
-  - pwsh: |
-      # Our build pipeline would generated build based on attempt number. Publishing the latest attempt.
-      $allArtifacts = Get-ChildItem -Path "VSIXs - Attempt*" | Sort-Object -Descending
-      if ($allArtifacts.Length -eq 0) {
-        throw "No Artifacts is downloaded."
-      }
+stages:
+- stage: PublishStage
+  jobs:
+  - deployment: PublishToMarketplace
+    displayName: PublishToMarketplace
+    environment: vscode-csharp-release-approvals
+    pool:
+      vmImage: ubuntu-latest
+    strategy:
+      runOnce:
+        deploy:
+          steps:
+          - download: 'none'
+          - task: DownloadPipelineArtifact@2
+            displayName: '📦 Download artifacts from build pipeline.'
+            inputs:
+              buildType: 'specific'
+              project: 'internal'
+              definition: 1264
+              buildVersionToDownload: 'specific'
+              buildId: '$(resources.pipeline.officialBuildCI.runID)'
+              branchName: '$(resources.pipeline.officialBuildCI.sourceBranch)'
+          - pwsh: |
+              npm install --global vsce
+            displayName: 'Install vsce'
+          - pwsh: |
+              # Our build pipeline would generated build based on attempt number. Publishing the latest attempt.
+              $allArtifacts = Get-ChildItem -Path "VSIXs - Attempt*" | Sort-Object -Descending
+              if ($allArtifacts.Length -eq 0) {
+                throw "No Artifacts is downloaded."
+              }
 
-      $publishArtifacts = $allArtifacts[0]
-      Write-Host "All artifacts: $($allArtifacts). Publishing $($publishArtifacts)."
+              $publishArtifacts = $allArtifacts[0]
+              Write-Host "All artifacts: $($allArtifacts). Publishing $($publishArtifacts)."
 
-      $additionalPublishArgs = , "publish"
-      # Artifacts are published to either pre-release or release based on the build branch, https://code.visualstudio.com/api/working-with-extensions/publishing-extension#prerelease-extensions
-      If ("$(resources.pipeline.officialBuildCI.sourceBranch)" -eq "refs/heads/main") {
-        $additionalPublishArgs += "--pre-release"
-        Write-Host "Publish to pre-release channel."
-      } ElseIf ("$(resources.pipeline.officialBuildCI.sourceBranch)" -eq "refs/heads/release") {
-        Write-Host "Publish to release channel."
-      } Else {
-        throw "Unexpected branch name: $(resources.pipeline.officialBuildCI.sourceBranch)."
-      }
-      $additionalPublishArgs += '--packagePath'
+              $basePublishArgs = , "publish"
+              # Artifacts are published to either pre-release or release based on the build branch, https://code.visualstudio.com/api/working-with-extensions/publishing-extension#prerelease-extensions
+              If ("$(resources.pipeline.officialBuildCI.sourceBranch)" -eq "refs/heads/main") {
+                $basePublishArgs += "--pre-release"
+                Write-Host "Publish to pre-release channel."
+              } ElseIf ("$(resources.pipeline.officialBuildCI.sourceBranch)" -eq "refs/heads/release") {
+                Write-Host "Publish to release channel."
+              } Else {
+                throw "Unexpected branch name: $(resources.pipeline.officialBuildCI.sourceBranch)."
+              }
+              $basePublishArgs += '--packagePath'
 
-      $platforms = "arm64", "x64", "ia32"
-      $allVsixs = Get-ChildItem $publishArtifacts *.vsix
-      foreach ($vsix in $allVsixs) {
-        foreach ($plat in $platforms) {
-          if ($vsix.Name.Contains($plat)) {
-              $additionalPublishArgs += $vsix
-          }
-        }
-      }
+              # Publish win32-ia32 last as recommended at https://code.visualstudio.com/api/working-with-extensions/publishing-extension#platformspecific-extensions
+              # Since validation is done asynchronously, we further take care to push the win32 variants in the first batch *first*,
+              # to give them the longest lead time possible before the second batch with just the win32-ia32 vsix is published.
+              $nonIA32PlatformArgs = $basePublishArgs + (Get-ChildItem $publishArtifacts\*.vsix -Include *x64*, *arm64* | Sort-Object Name -Descending |% { $_ })
+              $ia32PlatformArgs = $basePublishArgs + (Get-ChildItem $publishArtifacts\*.vsix -Include *ia32* | Sort-Object Name -Descending |% { $_ })
 
-      Write-Host "Command run is: vsce $($additionalPublishArgs)."
-      If ("${{ parameters.test }}" -eq "true") {
-        Write-Host "In test mode, command is printed instead of run."
-        Write-Host "🔒 Verify PAT."
-        vsce verify-pat ms-dotnettools
-      }
-      Else {
-        vsce @additionalPublishArgs
-      }
-    displayName: 🚀 Publish to Marketplace
-    workingDirectory: $(Pipeline.Workspace)
-    env:
-      VSCE_PAT: $(VSCodeMarketplacePAT)
+              If ("${{ parameters.test }}" -eq "true") {
+                Write-Host "In test mode, command is printed instead of run."
+                Write-Host "##[command]vsce $nonIA32PlatformArgs"
+                Write-Host "##[command]vsce $ia32PlatformArgs"
+
+                Write-Host "🔒 Verify PAT."
+                vsce verify-pat ms-dotnettools
+              }
+              Else {
+                Write-Host "##[command]vsce $nonIA32PlatformArgs"
+                vsce @nonIA32PlatformArgs
+                Write-Host "##[command]vsce $ia32PlatformArgs"
+                vsce @ia32PlatformArgs
+              }
+            displayName: 🚀 Publish to Marketplace
+            workingDirectory: $(Pipeline.Workspace)
+            env:
+              VSCE_PAT: $(VSCodeMarketplacePAT)
+- stage: 'TagRelease'
+  displayName: 'Tag release of vscode-csharp'
+  dependsOn: 'PublishStage'
+  condition: and(succeeded('PublishStage'), eq(variables['resources.pipeline.officialBuildCI.sourceBranch'], 'refs/heads/release'))
+  jobs:
+  - job: 'Tag'
+    pool:
+      vmImage: ubuntu-latest
+    steps:
+    - task: NodeTool@0
+      displayName: 'Install Node.js 18.x'
+      inputs:
+        versionSpec: '18.x'
+    - checkout: self
+      clean: true
+      submodules: true
+      fetchTags: false
+      fetchDepth: 0
+    - pwsh: |
+        git checkout $(resources.pipeline.officialBuildCI.sourceCommit)
+      displayName: 'Checkout to release branch'
+    - pwsh: |
+        npm ci
+        npm install
+        npm install -g gulp
+        gulp installDependencies
+      displayName: 'Install dependencies.'
+    - pwsh: |
+        # build number is generated by nerdbank git versioning and set to AzureDev
+        gulp createTags --releaseVersion $(resources.pipeline.officialBuildCI.runName) --releaseCommit $(resources.pipeline.officialBuildCI.sourceCommit) --dryRun ${{ parameters.test }}
+      env:
+        GitHubPAT: $(BotAccount-dotnet-bot-content-rw-grained-pat)
+      displayName: 'Create release tags'

azure-pipelines/release.yml

@@ -15,7 +15,7 @@ steps:
       Write-Host "Now running tests"
     }
 
-    npm run test
+    npm run omnisharptest
   displayName: 🧪 Run unit and integration tests
 
 - task: PublishPipelineArtifact@1

azure-pipelines/test.yml

@@ -11,6 +11,7 @@ require('./tasks/testTasks');
 require('./tasks/offlinePackagingTasks');
 require('./tasks/backcompatTasks');
 require('./tasks/localizationTasks');
+require('./tasks/createTagsTasks');
 
 // Disable warning about wanting an async function
 // tslint:disable-next-line

gulpfile.ts

@@ -15,6 +15,8 @@
   "Cannot resolve .NET debug configurations. The server is still initializing or has exited unexpectedly.": "Nelze přeložit konfigurace ladění .NET. Server se stále inicializuje nebo se neočekávaně ukončil.",
   "Cannot start collecting Razor logs when {0} is set to {1}. Please set {0} to {2} and then reload your VSCode environment and re-run the report Razor issue command.": "Když je {0} nastavené na {1}, nejde zahájit shromažďování protokolů Razor. Nastavte prosím {0} na {2}, znovu načtěte prostředí VSCode a opakujte příkaz pro nahlášení problémů s Razorem.",
   "Cannot stop Razor Language Server as it is already stopped.": "Jazykový server Razor se nedá zastavit, protože už je zastavený.",
+  "Choose": "Zvolit",
+  "Choose and set default": "Zvolit a nastavit výchozí",
   "Click {0}. This will copy all relevant issue information.": "Klikněte na {0}. Zkopírují se tím všechny relevantní informace o problému.",
   "Configuration \"{0}\" in launch.json does not have a {1} argument with {2} for remote process listing.": "Konfigurace „{0}“ v souboru launch.json nemá argument {1} s {2} pro výpis vzdáleného procesu.",
   "Copy C#": "Kopírovat kód C#",
@@ -28,6 +30,7 @@
   "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.",
   "Description of the problem": "Popis problému",
   "Disable message in settings": "Zakázat zprávu v nastavení",
+  "Do not load any": "Nic nenačítat",
   "Does not contain .NET Core projects.": "Neobsahuje projekty .NET Core.",
   "Don't Ask Again": "Příště už se neptat",
   "Enable launching a web browser when ASP.NET Core starts. For more information: {0}": "Povolit spuštění webového prohlížeče při spuštění ASP.NET Core. Další informace: {0}",
@@ -138,6 +141,7 @@
   "Yes": "Ano",
   "You must first start the data collection before copying.": "Před kopírováním je zapotřebí nejdříve spustit shromažďování dat.",
   "You must first start the data collection before stopping.": "Před zastavením je zapotřebí nejdříve spustit shromažďování dat.",
+  "Your workspace has multiple Visual Studio Solution files; please select one to get full IntelliSense.": "Váš pracovní prostor má více souborů řešení Visual Studio. Vyberte prosím jednu, abyste získali úplnou technologii IntelliSense.",
   "[ERROR] The debugger cannot be installed. The debugger requires macOS 10.12 (Sierra) or newer.": "[CHYBA] Ladicí program nelze nainstalovat. Ladicí program vyžaduje macOS 10.12 (Sierra) nebo novější.",
   "[ERROR] The debugger cannot be installed. Unknown platform.": "[CHYBA] Ladicí program nelze nainstalovat. Neznámá platforma.",
   "[ERROR]: C# Extension failed to install the debugger package.": "[CHYBA]: Rozšíření jazyka C# se nepodařilo nainstalovat balíček ladicího programu.",