Merge pull request #6279 from dotnet/merge_main

Merge main to release

Author: dibarbet

.vscode/launch.json

@@ -138,7 +138,6 @@
             ],
             "env": {
                 "CODE_EXTENSIONS_PATH": "${workspaceRoot}",
-                "OSVC_SUITE": "slnWithCsproj",
             },
             "sourceMaps": true,
             "outFiles": [

CHANGELOG.md

@@ -9,6 +9,12 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 ## Latest
+* Update Roslyn version (PR: [#6264](https://github.com/dotnet/vscode-csharp/pull/6264))
+  * Upgrade MSBuildLocator to fix homebrew dotnet resolution (PR: [#69769](https://github.com/dotnet/roslyn/pull/69769))
+  * Fix reported ExeName / ExeVersion (PR: [#69771](https://github.com/dotnet/roslyn/pull/69771))
+* Add 1.x setting names to migrated settings descriptions (PR: [#6266](https://github.com/dotnet/vscode-csharp/pull/6266))
+
+## 2.0.436
 * Update Roslyn version (PR: [#6245](https://github.com/dotnet/vscode-csharp/pull/6245))
   * Fix import completion (PR: [#69691](https://github.com/dotnet/roslyn/pull/69691))
   * Reduce overhead on semantic token refresh requests (PR: [#69690](https://github.com/dotnet/roslyn/pull/69690))

CONTRIBUTING.md

@@ -49,7 +49,7 @@ VSIXs can be created using the gulp command `gulp vsix:release:package`.  This w
 
 To update the version of the roslyn server used by the extension do the following:
 1.  Find the the Roslyn signed build you want from [here](https://dnceng.visualstudio.com/internal/_build?definitionId=327&_a=summary).  Typically the latest successful build of main is fine.
-2.  In the official build stage, look for the `Publish Assets` step.  In there you will see it publishing the `Microsoft.CodeAnalysis.LanguageServer` package with some version, e.g. `4.6.0-3.23158.4`.  Take note of that version number.
+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.  Build and test the change (make sure to run `gulp installDependencies` to get the new version!).  If everything looks good, submit a PR.
-    * Adding new package versions might require authentication, run with the `--interactive` flag to login.  You may need to install [azure artifacts nuget credential provider](https://github.com/microsoft/artifacts-credprovider#installation-on-windows) to run interactive authentication.
+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.

azure-pipelines.yml

@@ -38,26 +38,28 @@ stages:
     strategy:
       matrix:
         linux:
-          demandsName: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
+          demandsName: 1es-ubuntu-2004-open
         windows:
-          demandsName: ImageOverride -equals 1es-windows-2022-open
+          demandsName: 1es-windows-2022-open
     pool:
       name: NetCore-Public
-      demands: $(demandsName)
+      demands: ImageOverride -equals $(demandsName)
     steps:
     - template: azure-pipelines/test.yml
 
-- stage: Test_Omnisharp
-  displayName: Test Omnisharp
+- stage: Test_OmniSharp
+  displayName: Test OmniSharp
   dependsOn: []
   jobs:
   - job: Test
     strategy:
       matrix:
         linux:
-          demandsName: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
+          demandsName: 1es-ubuntu-2004-open
+        windows:
+          demandsName: 1es-windows-2022-open
     pool:
       name: NetCore-Public
-      demands: $(demandsName)
+      demands: ImageOverride -equals $(demandsName)
     steps:
     - template: azure-pipelines/test-omnisharp.yml

azure-pipelines/test-omnisharp.yml

@@ -7,20 +7,16 @@ steps:
 
 - template: prereqs.yml
 
-- pwsh: |
-    if ($IsLinux) {
-      Write-Host "Activating screen emulation"
-      /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
-      $env:DISPLAY=':99.0'
-      Write-Host "Now running tests"
-    }
+- template: test-prereqs.yml
 
-    npm run omnisharptest
+- script: npm run omnisharptest
   displayName: 🧪 Run unit and integration tests
+  env:
+    DISPLAY: :99.0
 
 - task: PublishPipelineArtifact@1
   condition: failed()
   displayName: 'Upload integration test logs'
   inputs:
     targetPath: '$(Build.SourcesDirectory)/.vscode-test/user-data/logs'
-    artifactName: 'VSCode Test Logs ($(Agent.JobName)-$(System.JobAttempt))'
+    artifactName: 'VSCode Test OmniSharp Logs ($(Agent.JobName)-$(System.JobAttempt))'

azure-pipelines/test-prereqs.yml

@@ -0,0 +1,9 @@
+steps:
+
+# We need to download the roslyn language server for the current platform to run integration tests against it.
+- script: gulp installDependencies
+  displayName: 'Install Roslyn Language Server'
+
+- script: /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
+  displayName: 'Activate screen emulation'
+  condition: eq(variables['Agent.OS'], 'Linux')

azure-pipelines/test.yml

@@ -7,16 +7,12 @@ steps:
 
 - template: prereqs.yml
 
-- pwsh: |
-    if ($IsLinux) {
-      Write-Host "Activating screen emulation"
-      /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
-      $env:DISPLAY=':99.0'
-      Write-Host "Now running tests"
-    }
+- template: test-prereqs.yml
 
-    npm run test
+- script: npm run test
   displayName: 🧪 Run unit and integration tests
+  env:
+    DISPLAY: :99.0
 
 - task: PublishPipelineArtifact@1
   condition: failed()

baseJestConfig.ts

@@ -0,0 +1,15 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import type { Config } from 'jest';
+
+/**
+ * Defines a base project config that we can re-use across the project specific jest configs.
+ * We do this because jest generally does not inherit project configuration settings.
+ */
+export const baseProjectConfig: Config = {
+    preset: 'ts-jest',
+    testEnvironment: 'node',
+    transformIgnorePatterns: ['/dist/.+\\.js'],
+};

jest.config.ts

@@ -5,17 +5,11 @@
 import type { Config } from 'jest';
 
 const config: Config = {
-    verbose: true,
-    preset: 'ts-jest',
-    testEnvironment: 'node',
-    transformIgnorePatterns: ['/dist/.+\\.js'],
-    // We need to explicity ignore the out directory for modules - otherwise we'll get duplicate vscode module,
-    // the TS version from the __mocks__ directory and the compiled js version from the out directory.
-    modulePathIgnorePatterns: ['out'],
-    // Specify jest to only run tests in jest folders.
-    // We also have to include the __mocks__ folder.  That folder must be next to node_modules so we can't move it,
-    // but if we specify roots, jest won't automatically pick it up.  So we have to specify it here.
-    roots: ['<rootDir>/test/unitTests', '<rootDir>/omnisharptest/omnisharpJestTests', '<rootDir>/__mocks__'],
+    projects: [
+        '<rootDir>/test/unitTests/jest.config.ts',
+        '<rootDir>/test/integrationTests/jest.config.ts',
+        '<rootDir>/omnisharptest/omnisharpJestTests/jest.config.ts',
+    ],
 };
 
 export default config;

omnisharptest/omnisharpJestTests/jest.config.ts

@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import type { Config } from 'jest';
+import { baseProjectConfig } from '../../baseJestConfig';
+
+export const jestOmniSharpUnitTestProjectName = 'OmniSharp Unit Tests';
+
+/**
+ * Defines a jest project configuration for O# jest tests.
+ */
+const omnisharpConfig: Config = {
+    ...baseProjectConfig,
+    displayName: jestOmniSharpUnitTestProjectName,
+    // We need to explicity ignore the out directory for modules - otherwise we'll get duplicate vscode module,
+    // the TS version from the __mocks__ directory and the compiled js version from the out directory.
+    modulePathIgnorePatterns: ['out'],
+    // Specify jest to only run tests in jest folders.
+    // We also have to include the __mocks__ folder.  That folder must be next to node_modules so we can't move it,
+    // but if we specify roots, jest won't automatically pick it up.  So we have to specify it here.
+    roots: ['<rootDir>', '<rootDir>/../../__mocks__'],
+};
+
+export default omnisharpConfig;