Merge pull request #6638 from dibarbet/merge_main

Merge main into release

Author: dibarbet

.vscode/launch.json

@@ -41,7 +41,8 @@
                 "${workspaceFolder}/**",
                 "!**/node_modules/**"
             ],
-            "preLaunchTask": "buildDev"
+            "preLaunchTask": "buildDev",
+            "internalConsoleOptions": "openOnSessionStart"
         },
         {
             "name": "Launch Current File BasicRazorApp2_1 Integration Tests",
@@ -69,7 +70,8 @@
                 "${workspaceFolder}/**",
                 "!**/node_modules/**"
             ],
-            "preLaunchTask": "buildDev"
+            "preLaunchTask": "buildDev",
+            "internalConsoleOptions": "openOnSessionStart"
         },
         {
             "name": "Omnisharp: Launch Current File Integration Tests",
@@ -129,6 +131,17 @@
             ],
             "preLaunchTask": "buildDev"
         },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Debug gulp task",
+            "preLaunchTask": "build",
+            "program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
+            "args": [
+                "${input:gulpTaskName}"
+            ],
+            "cwd": "${workspaceFolder}"
+        },
         {
             "type": "node",
             "request": "launch",
@@ -212,7 +225,11 @@
                 "slnFilterWithCsproj",
                 "slnWithGenerator"
             ]
-            // type specific configuration attributes
+        },
+        {
+            "id": "gulpTaskName",
+            "description": "The name of the gulp task to debug",
+            "type": "promptString",
         }
     ]
 }

CHANGELOG.md

@@ -6,6 +6,18 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 ## Latest
+* Fix C# Debugger telemetry (PR: [#6627](https://github.com/dotnet/vscode-csharp/pull/6627))
+* Add support for deduping build diagnostics from C# Devkit (PR: [#6543](https://github.com/dotnet/vscode-csharp/pull/6543))
+* Update Roslyn to 4.9.0-1.23530.4 (PR: [#6603](https://github.com/dotnet/vscode-csharp/pull/6603))
+  * Enable NuGet restore commands `dotnet.restore.all` and `dotnet.restore.project` (PR: [#70588](https://github.com/dotnet/roslyn/pull/70588))
+  * Fix issue where server did not reload projects after NuGet restore (PR: [#70602](https://github.com/dotnet/roslyn/pull/70602))
+* Update debugger to 2.9.0 (PR: [#6623](https://github.com/dotnet/vscode-csharp/pull/6623))
+  * Flush `Console.Write` buffer more often (Fixes: [#6598](https://github.com/dotnet/vscode-csharp/issues/6598))
+  * Fix logpoint freezing on start (Fixes: [#6585](https://github.com/dotnet/vscode-csharp/issues/6585))
+  * Fix logpoints when using variables after breakpoint breaks (Fixes: [#583](https://github.com/microsoft/vscode-dotnettools/issues/583))
+* Update README.md to rename the Runtime dependency (PR: [#6617](https://github.com/dotnet/vscode-csharp/pull/6617))
+
+## 2.9.20
 * Bump Roslyn to 4.9.0-1.23526.14 (PR: [#6608](https://github.com/dotnet/vscode-csharp/pull/6608))
   * Fix some project loading issues caused by evaluation failures (PR: [#70496](https://github.com/dotnet/roslyn/pull/70496))
   * Ensure evaluation diagnostics are logged during project load (PR: [#70467](https://github.com/dotnet/roslyn/pull/70467))

README.md

@@ -6,7 +6,7 @@ While it is possible to use the C# extension as a standalone extension, we highl
 
 1. Installing [C# Dev Kit][csdevkitextension] will automatically install this extension as a required dependency.
 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.
+3. Whether you install C# Dev Kit or just the C# extension, the [.NET Install Tool](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 .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

azure-pipelines-official.yml

@@ -13,7 +13,7 @@ parameters:
     default: 'default'
 
 stages:
-- template: azure-pipelines/build.yml
+- template: azure-pipelines/build-all.yml
   parameters:
     versionNumberOverride: ${{ parameters.versionNumberOverride }}
 

azure-pipelines.yml

@@ -12,7 +12,7 @@ pr:
 - main
 
 stages:
-- template: azure-pipelines/build.yml
+- template: azure-pipelines/build-all.yml
 
 - stage: Test
   displayName: Test

azure-pipelines/build-all.yml

@@ -0,0 +1,25 @@
+parameters:
+- name: versionNumberOverride
+  type: string
+  default: 'default'
+
+stages:
+- stage: Build
+  displayName: 'Build VSIXs'
+  dependsOn: []
+  jobs:
+  - template: build.yml
+    parameters:
+      versionNumberOverride: ${{ parameters.versionNumberOverride }}
+      vmImageName: ubuntu-latest
+      platform: linux
+  - template: build.yml
+    parameters:
+      versionNumberOverride: ${{ parameters.versionNumberOverride }}
+      vmImageName: windows-latest
+      platform: windows
+  - template: build.yml
+    parameters:
+      versionNumberOverride: ${{ parameters.versionNumberOverride }}
+      vmImageName: macOS-latest
+      platform: darwin

azure-pipelines/build.yml

@@ -2,62 +2,70 @@ parameters:
 - name: versionNumberOverride
   type: string
   default: 'default'
+- name: vmImageName
+  type: string
+  default: ''
+- name: platform
+  type: string
+
+jobs:
+- job:
+  displayName: 'Build ${{ parameters.platform }} prerelease vsixs'
+  pool:
+    name: Azure Pipelines
+    vmImage: ${{ parameters.vmImageName }}
+  steps:
+  - checkout: self
+    clean: true
+    submodules: true
+    fetchTags: false
+    fetchDepth: 0
+
+  - template: prereqs.yml
+    parameters:
+      versionNumberOverride: ${{ parameters.versionNumberOverride }}
+
+  - script: gulp vsix:release:package:${{ parameters.platform }} --prerelease
+    displayName: 'Build VSIXs'
+
+  - task: PublishBuildArtifacts@1
+    # Run the publish step so we have vsix's even if the tests fail.
+    condition: succeededOrFailed()
+    displayName: 'Publish VSIXs'
+    inputs:
+      PathtoPublish: '$(Build.SourcesDirectory)/vsix'
+      ArtifactName: 'VSIX_Prerelease_$(System.JobAttempt)'
+
+  - script: npm run test:artifacts
+    displayName: 'Run artifacts tests'
+
+- job:
+  displayName: 'Build ${{ parameters.platform }} release vsixs'
+  pool:
+    name: Azure Pipelines
+    vmImage: ${{ parameters.vmImageName }}
+  steps:
+  - checkout: self
+    clean: true
+    submodules: true
+    fetchTags: false
+    fetchDepth: 0
+
+  - template: prereqs.yml
+    parameters:
+      versionNumberOverride: ${{ parameters.versionNumberOverride }}
+
+  - script: gulp vsix:release:package:${{ parameters.platform }}
+    displayName: 'Build VSIXs'
+
+  - task: PublishBuildArtifacts@1
+    # Run the publish step so we have vsix's even if the tests fail.
+    condition: succeededOrFailed()
+    displayName: 'Publish VSIXs'
+    inputs:
+      PathtoPublish: '$(Build.SourcesDirectory)/vsix'
+      ArtifactName: 'VSIX_Release_$(System.JobAttempt)'
 
-stages:
-- stage: Build
-  displayName: 'Build VSIXs'
-  jobs:
-  - job:
-    displayName: 'Build Prerelease VSIXs'
-    steps:
-    - checkout: self
-      clean: true
-      submodules: true
-      fetchTags: false
-      fetchDepth: 0
-
-    - template: prereqs.yml
-      parameters:
-        versionNumberOverride: ${{ parameters.versionNumberOverride }}
-
-    - script: gulp 'vsix:release:package' --prerelease
-      displayName: 'Build VSIXs'
-
-    - task: PublishPipelineArtifact@1
-      # Run the publish step so we have vsix's even if the tests fail.
-      condition: succeededOrFailed()
-      displayName: 'Publish VSIXs'
-      inputs:
-        targetPath: '$(Build.SourcesDirectory)/vsix'
-        artifactName: 'VSIX_Prerelease_$(System.JobAttempt)'
-
-    - script: npm run test:artifacts
-      displayName: 'Run artifacts tests'
-
-  - job:
-    displayName: 'Build Release VSIXs'
-    steps:
-    - checkout: self
-      clean: true
-      submodules: true
-      fetchTags: false
-      fetchDepth: 0
-
-    - template: prereqs.yml
-      parameters:
-        versionNumberOverride: ${{ parameters.versionNumberOverride }}
-
-    - script: gulp 'vsix:release:package'
-      displayName: 'Build VSIXs'
-
-    - task: PublishPipelineArtifact@1
-      # Run the publish step so we have vsix's even if the tests fail.
-      condition: succeededOrFailed()
-      displayName: 'Publish VSIXs'
-      inputs:
-        targetPath: '$(Build.SourcesDirectory)/vsix'
-        artifactName: 'VSIX_Release_$(System.JobAttempt)'
-
-    - script: npm run test:artifacts
-      displayName: 'Run artifacts tests'
+  - script: npm run test:artifacts
+    displayName: 'Run artifacts tests'
 

azure-pipelines/loc.yml

@@ -45,7 +45,6 @@ stages:
       fetchDepth: 0
     - pwsh: | 
         npm install
-        npm install -g @vscode/l10n-dev
         npm install -g gulp
       displayName: 'Install tools'
     - pwsh: npm run compile

azure-pipelines/test-omnisharp.yml

@@ -14,6 +14,17 @@ steps:
   env:
     DISPLAY: :99.0
 
+- task: PublishTestResults@2
+  condition: succeededOrFailed()
+  displayName: 'Publish Test Results'
+  inputs:
+    testResultsFormat: 'JUnit'
+    testResultsFiles: '*junit.xml'
+    searchFolder: '$(Build.SourcesDirectory)/out'
+    publishRunAttachments: true
+    mergeTestResults: true
+    testRunTitle: OmniSharp $(Agent.JobName) (Attempt $(System.JobAttempt))
+
 - task: PublishPipelineArtifact@1
   condition: failed()
   displayName: 'Upload integration test logs'

azure-pipelines/test.yml

@@ -36,6 +36,17 @@ jobs:
     env:
       DISPLAY: :99.0
 
+  - task: PublishTestResults@2
+    condition: succeededOrFailed()
+    displayName: 'Publish Test Results'
+    inputs:
+      testResultsFormat: 'JUnit'
+      testResultsFiles: '*junit.xml'
+      searchFolder: '$(Build.SourcesDirectory)/out'
+      publishRunAttachments: true
+      mergeTestResults: true
+      testRunTitle: $(Agent.JobName) (Attempt $(System.JobAttempt))
+
   - task: PublishPipelineArtifact@1
     condition: failed()
     displayName: 'Upload integration test logs'