Merge branch 'main' into dev/maryamariyan/sourcegen-bkpoint

Author: Andrew Hall

.config/1espt/PipelineAutobaseliningConfig.yml

@@ -0,0 +1,35 @@
+## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.
+
+pipelines:
+  1275:
+    retail:
+      source:
+        credscan:
+          lastModifiedDate: 2024-03-18
+        eslint:
+          lastModifiedDate: 2024-03-18
+        armory:
+          lastModifiedDate: 2024-03-18
+      binary:
+        credscan:
+          lastModifiedDate: 2024-03-18
+        binskim:
+          lastModifiedDate: 2024-03-18
+  1264:
+    retail:
+      source:
+        credscan:
+          lastModifiedDate: 2024-03-19
+        eslint:
+          lastModifiedDate: 2024-03-19
+        psscriptanalyzer:
+          lastModifiedDate: 2024-03-19
+        armory:
+          lastModifiedDate: 2024-03-19
+      binary:
+        credscan:
+          lastModifiedDate: 2024-03-19
+        binskim:
+          lastModifiedDate: 2024-03-19
+        spotbugs:
+          lastModifiedDate: 2024-03-19

.config/guardian/.gdnbaselines

@@ -0,0 +1,29 @@
+{
+  "properties": {
+    "helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines"
+  },
+  "version": "1.0.0",
+  "baselines": {
+    "default": {
+      "name": "default",
+      "createdDate": "2024-03-18 18:32:58Z",
+      "lastUpdatedDate": "2024-03-18 18:32:58Z"
+    }
+  },
+  "results": {
+    "d6ffb0614846153cf3cc5936d0444ed9eda6fe6854febb4c8ea59243c120b223": {
+      "signature": "d6ffb0614846153cf3cc5936d0444ed9eda6fe6854febb4c8ea59243c120b223",
+      "alternativeSignatures": [],
+      "target": "omnisharptest/omnisharpUnitTests/testAssets/private.pem",
+      "line": 1,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-GENERAL0020",
+      "createdDate": "2024-03-19 17:56:07Z",
+      "expirationDate": "2024-09-05 18:18:29Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2024-03-19 18:18:29Z"
+    }
+  }
+}

.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

@@ -153,7 +153,7 @@
             ],
             "env": {
                 "NEW_DEPS_ID": "OmniSharp",
-                "NEW_DEPS_URLS": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x86-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-arm64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x86-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-arm64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-musl-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-musl-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x86-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-arm64-net6.0-1.39.11.zip",
+                "NEW_DEPS_URLS": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x86-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-arm64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-arm64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-musl-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-musl-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-arm64-net6.0-1.39.11.zip",
                 "OLD_DEPS_VERSION": "1.39.10",
                 "NEW_DEPS_VERSION": "1.39.11",
             },
@@ -169,8 +169,8 @@
               "updatePackageDependencies"
           ],
           "env": {
-              "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/4b87ad9c650d1a126028ddf321ceb414/razorlanguageserver-linux-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/800035f453a9940e55d8ae7d809e17cb/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/ed8daaefd18671d15ea5e8c7443be63e/razorlanguageserver-linux-musl-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/b22635192b6ec100594d9cb43714d9a1/razorlanguageserver-linux-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/0fa0001436d8d25e8f280e00fef66f39/razorlanguageserver-osx-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/0dbaf11941ee43e084794fa342ee4988/razorlanguageserver-osx-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/9464bb3e526dc42e36558275a02eb723/razorlanguageserver-platformagnostic-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/c4313f9a64c8f0cfc017bf3fc14e1d41/razorlanguageserver-win-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/041b809043c733b8f5948a148488f1c1/razorlanguageserver-win-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/5adbc50be4338beeeb83777f9b00903f/razorlanguageserver-win-x86-7.0.0-preview.24154.7.zip",
-              "NEW_DEPS_VERSION": "7.0.0-preview.24154.7",
+              "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/d5be2742-99d9-442b-ba28-8c9c64de88e7/1860e8fe11872d9dfd7165d7eae3597d/razorlanguageserver-linux-arm64-7.0.0-preview.24175.3.zip,https://download.visualstudio.microsoft.com/download/pr/d5be2742-99d9-442b-ba28-8c9c64de88e7/73b9c9c57d5518a05a89c754dfaae8d4/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24175.3.zip,https://download.visualstudio.microsoft.com/download/pr/d5be2742-99d9-442b-ba28-8c9c64de88e7/d3c9613d66ad9beedc02e24e3f0ed302/razorlanguageserver-linux-musl-x64-7.0.0-preview.24175.3.zip,https://download.visualstudio.microsoft.com/download/pr/d5be2742-99d9-442b-ba28-8c9c64de88e7/3228534d690bda2e0261790a0a7bf9a8/razorlanguageserver-linux-x64-7.0.0-preview.24175.3.zip,https://download.visualstudio.microsoft.com/download/pr/d5be2742-99d9-442b-ba28-8c9c64de88e7/be3e610daa38f1c4b0848256c6392f36/razorlanguageserver-osx-arm64-7.0.0-preview.24175.3.zip,https://download.visualstudio.microsoft.com/download/pr/d5be2742-99d9-442b-ba28-8c9c64de88e7/aa05d02de40e721a169c4c2622eda9ca/razorlanguageserver-osx-x64-7.0.0-preview.24175.3.zip,https://download.visualstudio.microsoft.com/download/pr/d5be2742-99d9-442b-ba28-8c9c64de88e7/6d1ec2d06b58e70e164923c7afa81bc5/razorlanguageserver-platformagnostic-7.0.0-preview.24175.3.zip,https://download.visualstudio.microsoft.com/download/pr/d5be2742-99d9-442b-ba28-8c9c64de88e7/8a25847c282c29e808ffbef3e1420d00/razorlanguageserver-win-arm64-7.0.0-preview.24175.3.zip,https://download.visualstudio.microsoft.com/download/pr/d5be2742-99d9-442b-ba28-8c9c64de88e7/6e2578460774f15bced049d9d72020e1/razorlanguageserver-win-x64-7.0.0-preview.24175.3.zip",
+              "NEW_DEPS_VERSION": "7.0.0-preview.24175.3",
               "NEW_DEPS_ID": "Razor"
           },
           "cwd": "${workspaceFolder}"
@@ -185,8 +185,8 @@
             "updatePackageDependencies"
         ],
         "env": {
-            "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/8a2ecaefa3a40739894c902e6a2864d8/devkittelemetry-linux-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/32f28eb9d870a91dc2b36b2557371501/devkittelemetry-linux-musl-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/846487d0048f3fe00ea88f3800cf5f89/devkittelemetry-linux-musl-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/1460a276de692bdcad14313d26e8b38d/devkittelemetry-linux-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/d41e665b57cb8fd50909b3e4349c6842/devkittelemetry-osx-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/64efd8e7029567ffc0997d8ae7e11c54/devkittelemetry-osx-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/a2f7d9d5a9aa2c2af9a305c654ae284b/devkittelemetry-platformagnostic-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/2dc101f74e9f3547698f6e211ac87071/devkittelemetry-win-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/4aa2c18116fdc4c8bfa6e8dd11787949/devkittelemetry-win-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/826f6210f23a3bac8f05e599da1c0145/devkittelemetry-win-x86-7.0.0-preview.24154.7.zip",
-            "NEW_DEPS_VERSION": "7.0.0-preview.24154.7",
+            "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/d5be2742-99d9-442b-ba28-8c9c64de88e7/6b41ddb024bfee47992a0b4d5f8ef0e1/devkittelemetry-linux-arm64-7.0.0-preview.24175.3.zip,https://download.visualstudio.microsoft.com/download/pr/d5be2742-99d9-442b-ba28-8c9c64de88e7/bc19e6cbb7d098824b80592e327a3d26/devkittelemetry-linux-musl-arm64-7.0.0-preview.24175.3.zip,https://download.visualstudio.microsoft.com/download/pr/d5be2742-99d9-442b-ba28-8c9c64de88e7/bd70cd20bb79387ea83a0b0548e67fd3/devkittelemetry-linux-musl-x64-7.0.0-preview.24175.3.zip,https://download.visualstudio.microsoft.com/download/pr/d5be2742-99d9-442b-ba28-8c9c64de88e7/733da378a1332e8514981ba0045bea6b/devkittelemetry-linux-x64-7.0.0-preview.24175.3.zip,https://download.visualstudio.microsoft.com/download/pr/d5be2742-99d9-442b-ba28-8c9c64de88e7/72a931e50ae1f99a5dcb6aad9a79a2a8/devkittelemetry-osx-arm64-7.0.0-preview.24175.3.zip,https://download.visualstudio.microsoft.com/download/pr/d5be2742-99d9-442b-ba28-8c9c64de88e7/65b32224373413c608a3627b8784a75c/devkittelemetry-osx-x64-7.0.0-preview.24175.3.zip,https://download.visualstudio.microsoft.com/download/pr/d5be2742-99d9-442b-ba28-8c9c64de88e7/7ae52e3961b64bd158e7f0580b9f3f6a/devkittelemetry-platformagnostic-7.0.0-preview.24175.3.zip,https://download.visualstudio.microsoft.com/download/pr/d5be2742-99d9-442b-ba28-8c9c64de88e7/0053a029fe51abe51c2c10a50979a208/devkittelemetry-win-arm64-7.0.0-preview.24175.3.zip,https://download.visualstudio.microsoft.com/download/pr/d5be2742-99d9-442b-ba28-8c9c64de88e7/9cb17a23cfa811a57ebef544f6aa53ac/devkittelemetry-win-x64-7.0.0-preview.24175.3.zip",
+            "NEW_DEPS_VERSION": "7.0.0-preview.24175.3",
             "NEW_DEPS_ID": "RazorTelemetry"
         },
         "cwd": "${workspaceFolder}"

CHANGELOG.md

@@ -4,11 +4,36 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 ## Latest
+* Bump razor and update changelog (PR: [#7005](https://github.com/dotnet/vscode-csharp/pull/7005))
+  * Tweak RazorConfigurationFormatter to account for serialization format change (PR: [#10157](https://github.com/dotnet/razor/pull/10157))
+  * Use PooledArrayBuilder<SyntaxToken> throughout parsers and tokenizer (PR [#10095](https://github.com/dotnet/razor/pull/10095))
+  * Fix hot path string allocations from ProjectKey (PR: [#10138](https://github.com/dotnet/razor/pull/10138))
+  * Disable latest runtime patch (PR: [#10133](https://github.com/dotnet/razor/pull/10133))
+    
+## 2.23.x
+* Rename RazorComponentAttribute semantic token to razorComponentAttribute (PR: [#6867](https://github.com/dotnet/vscode-csharp/pull/6867))
+* Drop win32-ia32 platform support (PR: [#6983](https://github.com/dotnet/vscode-csharp/pull/6983))
+* Fix some issues with casing when comparing Razor files (PR: [#6974](https://github.com/dotnet/vscode-csharp/pull/6974))
+* Do not timeout on connecting to the server if waitForDebugger is set (PR: [#6969](https://github.com/dotnet/vscode-csharp/pull/6969))
+* Bump Razor and update changelog (PR: [#6965](https://github.com/dotnet/vscode-csharp/pull/6965))
+  * Fix an issue that could cause numerous semantic tokens LSP failures on new projects (PR: [#10050](https://github.com/dotnet/razor/pull/10050))
+  * Fix an issue with running on .NET 9 preview builds (PR: [#10064](https://github.com/dotnet/razor/pull/10064))
+* Update Debugger Packages to v2.19.17 (PR: [#6958](https://github.com/dotnet/vscode-csharp/pull/6958))
+
+## 2.23.2
+- Updated debugger to fix .NET debugging break with searchNuGetOrgSymbolServer enabled (PR: [#6937](https://github.com/dotnet/vscode-csharp/pull/6937))
+- Update Razor to add formatting option to force open brace onto the next line after a @code or @functions block (PR: [#10018](https://github.com/dotnet/razor/pull/10018))
+
+## 2.22.5
+* Update Razor to 7.0.0-preview.24165.1 (PR: [#6922](https://github.com/dotnet/vscode-csharp/pull/6922))
+  * Fix casing issues that cause missing components in Razor files (PR: [#10050](https://github.com/dotnet/razor/pull/10050))
+
+## 2.22.2
 - Update Roslyn to run on .NET 8 (PR: [#6920](https://github.com/dotnet/vscode-csharp/pull/6920))
   * Upgrade language server to run on .NET 8 (PR: [#72247](https://github.com/dotnet/roslyn/pull/72247))
   * Refactors LSP server extension assembly loading (PR: [#71862](https://github.com/dotnet/roslyn/pull/71862))
   * Report better warnings and errors if build hosts exit abnormally (PR: [#71909](https://github.com/dotnet/roslyn/pull/71909))
-- Update Razor to 7.0.0-preview.24154.7 (PR: [#6922](https://github.com/dotnet/vscode-csharp/pull/6922))
+- Update Razor to 7.0.0-preview.24161.6 (PR: [#6922](https://github.com/dotnet/vscode-csharp/pull/6922))
   - Upgrade language server to run on .NET 8 (PR: [#9981](https://github.com/dotnet/razor/pull/9981))
   - Support inlay hints (PR: [#9904](https://github.com/dotnet/razor/pull/9904) and [#6857](https://github.com/dotnet/vscode-csharp/pull/6857))
   - Don't ship as self-contained (PR: [#9891](https://github.com/dotnet/razor/pull/9891))

azure-pipelines-official.yml

@@ -5,17 +5,39 @@ 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-pt
+      os: windows
+    customBuildTags:
+    - ES365AIMigrationTooling
+    stages:
+    - template: /azure-pipelines/build-all.yml@self
+      parameters:
+        versionNumberOverride: ${{ parameters.versionNumberOverride }}
+        isOfficial: true
+        channel: ${{ parameters.channel }}

azure-pipelines.yml

@@ -15,6 +15,8 @@ pr:
 
 stages:
 - template: azure-pipelines/build-all.yml
+  parameters:
+    isOfficial: false
 
 - stage: Test
   displayName: Test