Merge branch 'main' into merge/release-to-main

Author: dibarbet

.config/guardian/.gdnbaselines

@@ -1,29 +1,29 @@
 {
+  "hydrated": true,
   "properties": {
-    "helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines"
+    "helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines",
+    "hydrationStatus": "This file contains identifying data. It is **NOT** safe to check into your repo. To dehydrate this file, run `guardian dehydrate --help` and follow the guidance."
   },
   "version": "1.0.0",
   "baselines": {
     "default": {
       "name": "default",
-      "createdDate": "2024-03-18 18:32:58Z",
-      "lastUpdatedDate": "2024-03-18 18:32:58Z"
+      "createdDate": "2024-09-09 19:35:36Z",
+      "lastUpdatedDate": "2024-09-09 19:35:36Z"
     }
   },
   "results": {
-    "d6ffb0614846153cf3cc5936d0444ed9eda6fe6854febb4c8ea59243c120b223": {
-      "signature": "d6ffb0614846153cf3cc5936d0444ed9eda6fe6854febb4c8ea59243c120b223",
+    "26445e3e484940d2d58c2ffc32ab3895fca4b1589d66e2f2dee2fa01f2c479fb": {
+      "signature": "26445e3e484940d2d58c2ffc32ab3895fca4b1589d66e2f2dee2fa01f2c479fb",
       "alternativeSignatures": [],
-      "target": "omnisharptest/omnisharpUnitTests/testAssets/private.pem",
+      "target": "test/omnisharp/omnisharpUnitTests/testAssets/private.pem",
       "line": 1,
       "memberOf": [
         "default"
       ],
       "tool": "credscan",
       "ruleId": "CSCAN-GENERAL0020",
-      "createdDate": "2024-06-27 21:30:23Z",
-      "expirationDate": "2024-12-14 21:44:58Z",
-      "justification": "This error is baselined with an expiration date of 180 days from 2024-06-27 21:44:58Z"
+      "createdDate": "2024-09-09 19:35:36Z"
     }
   }
-}
+}

.devcontainer/Dockerfile

@@ -0,0 +1,9 @@
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.192.0/containers/dotnet/.devcontainer/base.Dockerfile
+
+FROM mcr.microsoft.com/dotnet/sdk:8.0
+
+# Set up machine requirements to build the repo
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    && apt-get -y install --no-install-recommends curl git gnupg \
+    && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
+    && apt-get install -y nodejs

.devcontainer/devcontainer.json

@@ -0,0 +1,56 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/dotnetcore
+{
+  "name": "vscode-csharp",
+  "build": {
+    "dockerfile": "Dockerfile",
+    // Set the context to the workspace folder to allow us to copy files from it.
+    "context": ".."
+  },
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "files.associations": {
+          "*.csproj": "msbuild",
+          "*.fsproj": "msbuild",
+          "*.globalconfig": "ini",
+          "*.manifest": "xml",
+          "*.nuspec": "xml",
+          "*.pkgdef": "ini",
+          "*.projitems": "msbuild",
+          "*.props": "msbuild",
+          "*.resx": "xml",
+          "*.rsp": "Powershell",
+          "*.ruleset": "xml",
+          "*.settings": "xml",
+          "*.shproj": "msbuild",
+          "*.slnf": "json",
+          "*.targets": "msbuild",
+          "*.vbproj": "msbuild",
+          "*.vsixmanifest": "xml",
+          "*.vstemplate": "xml",
+          "*.xlf": "xml",
+          "*.yml": "azure-pipelines"
+        },
+        // ms-vscode.powershell settings
+        "powershell.promptToUpdatePowerShell": false,
+        "powershell.integratedConsole.showOnStartup": false,
+        "powershell.startAutomatically": false,
+        // ms-azure-devops.azure-pipelines settings
+        "azure-pipelines.customSchemaFile": ".vscode/dnceng-schema.json"
+      },
+      "extensions": [
+        "ms-dotnettools.csharp",
+        "ms-dotnettools.csdevkit",
+        "EditorConfig.EditorConfig",
+        "ms-vscode.powershell",
+        "tintoy.msbuild-project-tools",
+        "ms-azure-devops.azure-pipelines",
+        "dbaeumer.vscode-eslint",
+        "esbenp.prettier-vscode",
+        "orta.vscode-jest"
+      ]
+    }
+  },
+  "postCreateCommand": "npm ci && npx gulp installDependencies"
+}

.devcontainer/devinit.json

@@ -0,0 +1,7 @@
+{
+    "run": [
+        {
+            "tool": "require-dotnetcoresdk"
+        }
+    ]
+  } 

.vscode/dneng-schema.json

@@ -17,12 +17,14 @@
             "request": "launch",
             "runtimeExecutable": "${execPath}",
             "args": [
-                // Create a temp profile that has no extensions / user settings.
-                // This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
-                "--profile-temp",
-                "${workspaceRoot}/test/integrationTests/testAssets/slnWithCsproj/.vscode/lsp_tools_host_slnWithCsproj.code-workspace",
+                // Launch VSCode using a specific profile to ensure that user settings are not used.
+                // This profile must be imported into vscode before running this launch configuration.
+                // The profile can be found under /test/csharp-standalone-profile.
+                "--profile",
+                "csharp-standalone-profile",
+                "${workspaceRoot}/test/lsptoolshost/integrationTests/testAssets/slnWithCsproj/.vscode/lsp_tools_host_slnWithCsproj.code-workspace",
                 "--extensionDevelopmentPath=${workspaceRoot}",
-                "--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
+                "--extensionTestsPath=${workspaceRoot}/out/test/lsptoolshost/integrationTests"
             ],
             "env": {
                 "CODE_EXTENSIONS_PATH": "${workspaceRoot}",
@@ -40,12 +42,14 @@
             "request": "launch",
             "runtimeExecutable": "${execPath}",
             "args": [
-                // Create a temp profile that has no extensions / user settings.
-                // This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
-                "--profile-temp",
-                "${workspaceRoot}/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/.vscode/lsp_tools_host_BasicRazorApp2_1.code-workspace",
+                // Launch VSCode using a specific profile to ensure that user settings are not used.
+                // This profile must be imported into vscode before running this launch configuration.
+                // The profile can be found under /test/csharp-standalone-profile.
+                "--profile",
+                "csharp-standalone-profile",
+                "${workspaceRoot}/test/razor/razorIntegrationTests/testAssets/BasicRazorApp2_1/.vscode/lsp_tools_host_BasicRazorApp2_1.code-workspace",
                 "--extensionDevelopmentPath=${workspaceRoot}",
-                "--extensionTestsPath=${workspaceRoot}/out/test/razorIntegrationTests"
+                "--extensionTestsPath=${workspaceRoot}/out/test/razor/razorIntegrationTests"
             ],
             "env": {
                 "CODE_EXTENSIONS_PATH": "${workspaceRoot}",
@@ -63,12 +67,14 @@
             "request": "launch",
             "runtimeExecutable": "${execPath}",
             "args": [
-                // Create a temp profile that has no extensions / user settings.
-                // This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
-                "--profile-temp",
-                "${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/${input:omnisharpAssetName}/.vscode/omnisharp_${input:omnisharpAssetName}.code-workspace",
+                // Launch VSCode using a specific profile to ensure that user settings are not used.
+                // This profile must be imported into vscode before running this launch configuration.
+                // The profile can be found under /test/csharp-standalone-profile.
+                "--profile",
+                "csharp-standalone-profile",
+                "${workspaceRoot}/test/omnisharp/omnisharpIntegrationTests/testAssets/${input:omnisharpAssetName}/.vscode/omnisharp_${input:omnisharpAssetName}.code-workspace",
                 "--extensionDevelopmentPath=${workspaceRoot}",
-                "--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
+                "--extensionTestsPath=${workspaceRoot}/out/test/omnisharp/omnisharpIntegrationTests"
             ],
             "env": {
                 "CODE_EXTENSIONS_PATH": "${workspaceRoot}",
@@ -86,12 +92,14 @@
             "request": "launch",
             "runtimeExecutable": "${execPath}",
             "args": [
-                // Create a temp profile that has no extensions / user settings.
-                // This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
-                "--profile-temp",
-                "${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/${input:omnisharpAssetName}/.vscode/omnisharp_lsp_${input:omnisharpAssetName}.code-workspace",
+                // Launch VSCode using a specific profile to ensure that user settings are not used.
+                // This profile must be imported into vscode before running this launch configuration.
+                // The profile can be found under /test/csharp-standalone-profile.
+                "--profile",
+                "csharp-standalone-profile",
+                "${workspaceRoot}/test/omnisharp/omnisharpIntegrationTests/testAssets/${input:omnisharpAssetName}/.vscode/omnisharp_lsp_${input:omnisharpAssetName}.code-workspace",
                 "--extensionDevelopmentPath=${workspaceRoot}",
-                "--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
+                "--extensionTestsPath=${workspaceRoot}/out/test/omnisharp/omnisharpIntegrationTests"
             ],
             "env": {
                 "CODE_EXTENSIONS_PATH": "${workspaceRoot}",

.vscode/launch.json

@@ -18,7 +18,6 @@ server/**
 src/**
 tasks/**
 test/**
-omnisharptest/**
 __mocks__/**
 jest.config.ts
 baseJestConfig.ts

.vscodeignore

@@ -4,18 +4,41 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 # Latest
+* Bump xamltools to 17.12.35311.18 (PR: [#7549](https://github.com/dotnet/vscode-csharp/pull/7549))
+  * XAML color swatches
+
+# 2.47.x
+* Update Roslyn to 4.12.0-3.24456.2 (PR: [#7525](https://github.com/dotnet/vscode-csharp/pull/7525))
+  * Avoid BuildHost crash in Mono due to missing types (PR: [#74994](https://github.com/dotnet/roslyn/pull/74994))
+* Turn off word suggestions in XAML completions (PR: [#7516](https://github.com/dotnet/vscode-csharp/pull/7516))
+* Bump xamltools to 17.12.35305.252 (PR: [#7521](https://github.com/dotnet/vscode-csharp/pull/7521))
+  * XAML editor enabled various lightbulbs related to x:DataType, BindingContext and Bindings.
+
+# 2.46.x
+* Update Roslyn to 4.12.0-3.24430.2 (PR: [#7496](https://github.com/dotnet/vscode-csharp/pull/7496))
+* Bump Razor to 9.0.0-preview.24427.2  (PR: [#7471](https://github.com/dotnet/vscode-csharp/pull/7471))
+  * Suppress unique ids (#10791) (PR: [#10791](https://github.com/dotnet/razor/pull/10791))
+  * Self-versioned documents (#10747) (PR: [#10747](https://github.com/dotnet/razor/pull/10747))
+  * Remove ItemCollection from CodeRenderingContext (#10764) (PR: [#10764](https://github.com/dotnet/razor/pull/10764))
+  * Moving formatting service to common layer (#10761) (PR: [#10761](https://github.com/dotnet/razor/pull/10761))
+  * Allow LSP and cohosting to provide specialized methods to get a syntax tree (#10765) (PR: [#10765](https://github.com/dotnet/razor/pull/10765))
+  * Update NOTICE.txt (#10768) (PR: [#10768](https://github.com/dotnet/razor/pull/10768))
+  * Allow @@ as a fallback (#10752) (PR: [#10752](https://github.com/dotnet/razor/pull/10752))
+  * Support component rename from an end tag (#10762) (PR: [#10762](https://github.com/dotnet/razor/pull/10762))
+* Bump xamltools to 17.12.35230.10 (PR: [#7493](https://github.com/dotnet/vscode-csharp/pull/7493))
+
+# 2.45.25
 * Bump Roslyn to 4.12.0-2.24461.7 (PR: [#7544](https://github.com/dotnet/vscode-csharp/pull/7544))
   * Fix crash when closing source link documents (PR: [#75047](https://github.com/dotnet/roslyn/pull/75047))
   * Add option to disable source link (PR: [#75047](https://github.com/dotnet/roslyn/pull/75047))
   * Fix issue navigating from source link documents (PR: [#75033](https://github.com/dotnet/roslyn/pull/75033))
 * Fix exception applying fix all code action (PR: [#7537](https://github.com/dotnet/vscode-csharp/pull/7537))
 
-# 2.45.20
+# 2.45.17
 * Fix check for rzls being present (PR: [#7462](https://github.com/dotnet/vscode-csharp/pull/7462))
 * Bump Razor to 9.0.0-preview.24418.1 (PR: [#7456](https://github.com/dotnet/vscode-csharp/pull/7456))
   * Don't add already known documents to the misc files project (#10753) (PR: [#10753](https://github.com/dotnet/razor/pull/10753))
   * Remove ItemCollection from TagHelperDescriptorProviderContext (#10720) (PR: [#10720](https://github.com/dotnet/razor/pull/10720))
-  * Cohost inlay hint support (#10672) (PR: [#10672](https://github.com/dotnet/razor/pull/10672))
   * Fix excerpt service to allow for multi line verbatim strings (#10675) (PR: [#10675](https://github.com/dotnet/razor/pull/10675))
   * Fix attribute parsing recovery (#10620) (PR: [#10620](https://github.com/dotnet/razor/pull/10620))
   * Turn off trailing whitespace triming in strings (#10646) (PR: [#10646](https://github.com/dotnet/razor/pull/10646))
@@ -32,7 +55,7 @@
 * Added XAML Hot Reload support for x:FactoryMethod and x:Arguments
 * Bump xamltools to 17.12.35304.30 (PR: [#7507](https://github.com/dotnet/vscode-csharp/pull/7508))
 
-# 2.44.x
+# 2.44.19
 * Bump Roslyn to 4.12.0-2.24416.3 (PR: [#7448](https://github.com/dotnet/vscode-csharp/pull/7448))
   * Use EnableCodeStyleSeverity instead of AnalysisLevel to control new diagnostic severity behavior (PR: [#73843](https://github.com/dotnet/roslyn/pull/73843))
   * Cleanup LSP error reporting (PR: [#74530](https://github.com/dotnet/roslyn/pull/74530))
@@ -59,7 +82,7 @@
 * Task 2187810: [VS Code] Add OnEnter rules to indent tags (PR: [#7426](https://github.com/dotnet/vscode-csharp/pull/7426))
 * Fix completion handler bug that causes language server to crash (#7401) (PR: [#7406](https://github.com/dotnet/vscode-csharp/pull/7406))
 
-# 2.41.x
+# 2.41.26
 * Bump Roslyn to 4.12.0-1.24376.3 (PR: [#7393](https://github.com/dotnet/vscode-csharp/pull/7393))
   * Fix race condition in LSP FindAllReferences when linked files were involved.(PR: [#74566](https://github.com/dotnet/roslyn/pull/74566))
   * Fix dll load issue when loading Razor projects in VSCode (PR: [#74570](https://github.com/dotnet/roslyn/pull/74570))
@@ -86,7 +109,7 @@
   * `dotnet.implementType.insertionBehavior` to `dotnet.typeMembers.memberInsertionLocation`
   * `dotnet.implementType.propertyGenerationBehavior` to `dotnet.typeMembers.propertyGenerationBehavior`
 
-# 2.39.x
+# 2.39.29
 * Add language status bar item displaying project context for open files (PR: [#7321](https://github.com/dotnet/vscode-csharp/pull/7321), PR: [#7333](https://github.com/dotnet/vscode-csharp/pull/7333))
 * Add language status bar item for workspace status (C# standalone) (PR: [#7254](https://github.com/dotnet/vscode-csharp/pull/7254), PR: [#7329])https://github.com/dotnet/vscode-csharp/pull/7329))
 * Update Razor to 9.0.0-preview.24365.1 (PR: [#7354](https://github.com/dotnet/vscode-csharp/pull/7354))

CHANGELOG.md

@@ -22,7 +22,7 @@ Setting up your local development environment for the vscode-csharp repository i
 
 Before you start, make sure you have the following software installed on your machine:
 
-* Node.js v18 ([v18.17.0 LTS](https://nodejs.org/en/blog/release/v18.17.0)).
+* Node.js v20 ([v20.17.0 LTS](https://nodejs.org/en/blog/release/v20.17.0)).
   * Note - Building with higher major versions of Node.js is not advised - it may work but we do not test it.
 * Npm (The version shipped with node is fine)
 * .NET 8.0 SDK (dotnet should be on your path)
@@ -36,9 +36,10 @@ Follow these steps to build, run, and test the repository:
 #### Building
 
 1. Run `npm i` - This command installs the project dependencies.
-2. Run `npm i -g gulp` - This command installs Gulp globally.
-3. Run `gulp installDependencies` - This command downloads the various dependencies as specified by the version in the [package.json](package.json) file.
-4. Run `code .` - This command opens the project in Visual Studio Code.
+2. Run `vsts-npm-auth -config .npmrc` - This command will configure your credentials for the next command.
+3. Run `npm i -g gulp` - This command installs Gulp globally.
+4. Run `gulp installDependencies` - This command downloads the various dependencies as specified by the version in the [package.json](package.json) file.
+5. Run `code .` - This command opens the project in Visual Studio Code.
 
 #### Running
 
@@ -50,12 +51,16 @@ After completing the build steps:
 
 #### Testing
 
-To run tests:
+To run all tests, execute `npm run test`.
 
-1. Execute `npm run test` or press <kbd>F5</kbd> in VS Code with the "Launch Tests" debug configuration selected.
-2. For integration tests, select either of the two 'current file' integration tests (one for roslyn and one for razor), from the drop-down and press <kbd>F5</kbd> to start debugging:
-- For Roslyn Server: `Launch Current File slnWithCsproj Integration Tests`
-- For Razor Server:  `Launch Current File BasicRazorApp2_1 Integration Tests`
+To debug unit tests locally, press <kbd>F5</kbd> in VS Code with the "Launch Tests" debug configuration selected.
+
+To debug integration tests
+1.  Import the `csharp-standalone-profile.code-profile` in VSCode to setup a clean profile in which to run integration tests.  This must be imported at least once to use the launch configurations.
+2.  Open any integration test file and <kbd>F5</kbd> launch with the correct launch configuration selected.
+    - For integration tests inside `test/lsptoolshost`, use `Launch Current File slnWithCsproj Integration Tests`
+    - For integration tests inside `test/razor`, use `Launch Current File BasicRazorApp2_1 Integration Tests`
+    - For integration tests inside `test/omnisharp`, use one of the `Omnisharp:` current file profiles
 
 These will allow you to actually debug the test, but the 'Razor integration tests' configuration does not.
 
@@ -141,6 +146,11 @@ Or, in VSCode settings (`Ctrl+,`):
 3. Enable `razor.languageServer.debug`.
 4. Set `razor.server.trace` to `Debug`. This gives you more detailed log messages in the output window.
 
+### Updating NPM packages
+We use the .NET eng AzDo artifacts feed https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet-public-npm/npm/registry/ with upstreams to the public npm registry.
+Auth is required in order to pull new packages from the upstream.  This can be done by running `vsts-npm-auth -config .npmrc`.
+If you need to renew authorization, you can force it via `vsts-npm-auth -config .npmrc -F`
+
 ## Creating VSIX Packages for the Extension
 
 To package this extension, we need to create VSIX Packages. The VSIX packages can be created using the gulp command `gulp vsix:release:package`. This will create all the platform specific VSIXs that you can then install manually in VSCode.

CONTRIBUTING.md

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscodeAdapter from '../src/vscodeAdapter';
-import { getFakeVsCode } from '../test/unitTests/fakes';
+import { getFakeVsCode } from '../test/fakes';
 
 // This module creates a manual mock for the vscode module for running in unit tests.
 // Jest will automatically pick this up as it is in the __mocks__ directory next to node_modules.