Merge pull request #7527 from dotnet/merge/main-to-prerelease

[automated] Merge branch 'main' => 'prerelease'

.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"
+        }
+    ]
+  } 

CHANGELOG.md

@@ -4,6 +4,13 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 # Latest
+* 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))

CONTRIBUTING.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/v20.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
 

azure-pipelines/release.yml

@@ -89,13 +89,14 @@ extends:
                     $publishArtifacts = $allArtifacts[0]
                     Write-Host "All artifacts: $($allArtifacts). Publishing $($publishArtifacts)."
 
-                    $basePublishArgs = , "publish --azure-credential"
+                    $basePublishArgs = , "publish"
                     If ( $uploadPrerelease ) {
                       $basePublishArgs += "--pre-release"
                       Write-Host "Publish to pre-release channel."
                     } Else {
                       Write-Host "Publish to release channel."
                     }
+                    $basePublishArgs += '--azure-credential'
                     $basePublishArgs += '--packagePath'
                     $publishArgs = $basePublishArgs + (Get-ChildItem $publishArtifacts\*.vsix | Sort-Object Name -Descending |% { $_ })