Merge branch 'main' into users/merlinbot/1es-pt-auto-baselining-pr

Author: JoeRobich

.config/guardian/TSAConfig.gdntsa

@@ -0,0 +1,15 @@
+{
+    "codebaseName": "VSCode-CSharp-GitHub",
+    "notificationAliases": [
+        "[email protected]"
+    ],
+    "codebaseAdmins": [
+        "REDMOND\\phillipa",
+        "REDMOND\\arkalyan"
+    ],
+    "instanceUrl": "https://devdiv.visualstudio.com",
+    "projectName": "DevDiv",
+    "areaPath": "DevDiv\\NET Developer Experience\\CSharp and VB IDE\\VSCode",
+    "iterationPath": "DevDiv",
+    "allTools": true
+}

.gitignore

@@ -4,13 +4,15 @@ node_modules
 out
 .roslyn/
 .roslynDevKit/
+.xamlTools/
 .omnisharp/
 .omnisharp-*/
 .vs/
 .debugger/
 .razor/
 .razoromnisharp/
 .razortelemetry/
+.razorDevKit/
 .vscode-test/
 dist/
 *.razor.json

.npmrc

@@ -0,0 +1,2 @@
+registry=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/
+always-auth=true

.vscode/launch.json

@@ -5,8 +5,8 @@
 !.roslynDevKit/**
 !.omnisharp/**
 !.razor/**
+!.razorDevKit/**
 !.razoromnisharp/**
-!.razortelemetry/**
 .rpt2_cache/**
 .github/**
 .vscode/**
@@ -52,5 +52,8 @@ webpack.config.js
 !src/razor/language-configuration.json
 !src/razor/syntaxes/*
 
+!src/xaml/language-configuration.json
+!src/xaml/syntaxes/*
+
 +RuntimeLicenses/dependencies/*
 coreclr-debug/install.log

.vscodeignore

@@ -22,9 +22,10 @@ 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.17.0 LTS](https://nodejs.org/en/blog/release/v18.17.0) is recommended).
+* Node.js v18 ([v18.17.0 LTS](https://nodejs.org/en/blog/release/v18.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 7.0 SDK (dotnet should be on your path)
+* .NET 8.0 SDK (dotnet should be on your path)
 
 Once you have these installed, you can navigate to the cloned vscode-csharp repository to proceed with building, running, and testing the repository.
 
@@ -146,6 +147,8 @@ To package this extension, we need to create VSIX Packages. The VSIX packages ca
 
 ## Updating the `Roslyn` Language Server Version
 
+In order to pull in new packages from upstreams into the msft_consumption feed we use for restoring, you will need to be a member of the 'CSharp VS Code Extension contributors' group in the [Azure Devops instance](https://dev.azure.com/azure-public/vside/_settings/teams).  
+
 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.neutral` package with some version, e.g. `4.6.0-3.23158.4`.  Take note of that version number.

CHANGELOG.md

@@ -0,0 +1,9 @@
+<Project>
+    <PropertyGroup>
+        <!--
+            Defines the lowest supported target framework for the extension.
+            Used by server download / integration tests to ensure they run when only this SDK is installed.
+        -->
+        <LowestSupportedTargetFramework>net6.0</LowestSupportedTargetFramework>
+    </PropertyGroup>
+</Project>

CONTRIBUTING.md

@@ -5,17 +5,49 @@ trigger:
     - release
     - prerelease
 pr: none
-
 parameters:
-  # Allows the version number to be set manually for a specific build.
-  # Useful when we need to create an updated extension version with no changes (for example to fix a bad partial release).
-  - name: versionNumberOverride
-    type: string
-    default: 'default'
+# Allows the version number to be set manually for a specific build.
+# Useful when we need to create an updated extension version with no changes (for example to fix a bad partial release).
+- name: versionNumberOverride
+  type: string
+  default: 'default'
+# Allows the marketplace release channel to be set manually for a specific build
+# Auto will determine the release channel based on the branch.
+- name: channel
+  values:
+  - release
+  - prerelease
+  - auto
+  default: auto
 
-stages:
-- template: azure-pipelines/build-all.yml
+resources:
+  repositories:
+  - repository: 1ESPipelineTemplates
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/release
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
   parameters:
-    versionNumberOverride: ${{ parameters.versionNumberOverride }}
-
-# TODO: add compliance, signing.
+    pool:
+      name: netcore1espool-internal
+      image: 1es-windows-2022
+      os: windows
+    sdl:
+      sourceAnalysisPool:
+        name: netcore1espool-internal
+        image: 1es-windows-2022
+        os: windows
+      policheck:
+        enabled: true
+      tsa:
+        enabled: true
+        configFile: '$(Build.SourcesDirectory)/.config/guardian/TSAConfig.gdntsa'
+    customBuildTags:
+    - ES365AIMigrationTooling
+    stages:
+    - template: /azure-pipelines/build-all.yml@self
+      parameters:
+        versionNumberOverride: ${{ parameters.versionNumberOverride }}
+        isOfficial: true
+        channel: ${{ parameters.channel }}

Directory.Build.props

@@ -8,35 +8,73 @@ trigger:
     - main
 
 pr:
-- feature/*
-- release
-- prerelease
-- main
+  branches:
+    include:
+    - feature/*
+    - release
+    - prerelease
+    - main
+  paths:
+    exclude:
+    - ./*.md
 
 stages:
 - template: azure-pipelines/build-all.yml
+  parameters:
+    isOfficial: false
 
-- stage: Test
-  displayName: Test
+- stage: Test_Linux_Stage
+  displayName: Test Linux
   dependsOn: []
   jobs:
-  - template: azure-pipelines/test.yml
-    parameters:
-      jobName: Linux
-      poolName: NetCore-Public
-      demandsName: 1es-ubuntu-2004-open
+  - job: Test_Linux_Job
+    displayName:  Test Linux
+    strategy:
+      matrix:
+        DotNet6:
+          containerName: mcr.microsoft.com/dotnet/sdk:6.0
+        DotNet7:
+          containerName: mcr.microsoft.com/dotnet/sdk:7.0
+        DotNet8:
+          containerName: mcr.microsoft.com/dotnet/sdk:8.0
+    pool:
+      name: NetCore-Public
+      demands: ImageOverride -equals 1es-ubuntu-2004-open
+    container: $[ variables['containerName'] ]
+    steps:
+    - template: azure-pipelines/test.yml
+      parameters:
+        # Prefer the dotnet from the container.
+        installDotNet: false
+        installAdditionalLinuxDependencies: true
 
-  - template: azure-pipelines/test.yml
-    parameters:
-      jobName: Windows
-      poolName: NetCore-Public
-      demandsName: 1es-windows-2022-open
+- stage: Test_Windows_Stage
+  displayName: Test Windows
+  dependsOn: []
+  jobs:
+  - job: Test_Windows_Job
+    displayName: Test Windows
+    pool:
+      name: NetCore-Public
+      demands: ImageOverride -equals 1es-windows-2022-open
+    steps:
+    - template: azure-pipelines/test.yml
+      parameters:
+        installDotNet: true
 
-  - template: azure-pipelines/test.yml
-    parameters:
-      jobName: MacOS
-      poolName: Azure Pipelines
-      vmImageName: macOS-13
+- stage: Test_MacOS_Stage
+  displayName: Test MacOS
+  dependsOn: []
+  jobs:
+  - job: Test_MacOS_Job
+    displayName: Test MacOS
+    pool:
+      name: Azure Pipelines
+      vmImage: macOS-13
+    steps:
+    - template: azure-pipelines/test.yml
+      parameters:
+        installDotNet: true
 
 - stage: Test_OmniSharp
   displayName: Test OmniSharp