Merge pull request #6995 from dotnet/prerelease

Merge prerelease to release
dotnet · Mar 25, 2024 · fd9d6fc · fd9d6fc
2 parents a4aafc3 + cfeb21f
commit fd9d6fc
Show file tree

Hide file tree

Showing 24 changed files with 541 additions and 472 deletions.
diff --git a/.config/1espt/PipelineAutobaseliningConfig.yml b/.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
diff --git a/.config/guardian/.gdnbaselines b/.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"
+    }
+  }
+}
diff --git a/.vscode/launch.json b/.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/75786463-0990-490f-b7fb-12625a4ea6f0/180d42a07c73a4a9e697844deff974a4/razorlanguageserver-linux-arm64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/8067cf03bc5e8bc0787224c9ecc7966e/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/01c3118ce7681fc099e0ac3a7d3bacbb/razorlanguageserver-linux-musl-x64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/8e57cb83c3bd75560c4a17336b074e5c/razorlanguageserver-linux-x64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/a00625534db057426d2228e228874f06/razorlanguageserver-osx-arm64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/b8b7057c3ce33d2bb0cd491d0db2b27f/razorlanguageserver-osx-x64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/75229770f1b565131f00892437f62ac2/razorlanguageserver-platformagnostic-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/d7797ce73b2d0cffbb33b94741ed2d26/razorlanguageserver-win-arm64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/e5a040b9889fc715d74690232b3830ff/razorlanguageserver-win-x64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/4f43ee6a33d8a4be4e4f9b0af8b4141f/razorlanguageserver-win-x86-7.0.0-preview.24165.1.zip",
-              "NEW_DEPS_VERSION": "7.0.0-preview.24165.1",
+              "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/74b76bfa424bd6a36b5fcbd11b801b45/razorlanguageserver-linux-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/b6fa76f8ccfa8053f56f1fa3d39e78c9/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/97b57265a3097b6128aaa4be297f1243/razorlanguageserver-linux-musl-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/fdf85820363515f55ce0f4e35a7fe780/razorlanguageserver-linux-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/48d3bef6b7f06634e53ca433be40e52a/razorlanguageserver-osx-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/581c065f415941a97c7687403da5d61c/razorlanguageserver-osx-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/b2940e8871ef222b0bc820b51ec44ed2/razorlanguageserver-platformagnostic-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/bbc8d2a30ba7da4e0eb4465a329b1fa1/razorlanguageserver-win-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/dc3bfe5f9473a09cb823d665193d4ff0/razorlanguageserver-win-x64-7.0.0-preview.24168.4.zip",
+              "NEW_DEPS_VERSION": "7.0.0-preview.24168.4",
               "NEW_DEPS_ID": "Razor"
           },
           "cwd": "${workspaceFolder}"
@@ -185,8 +185,8 @@
             "updatePackageDependencies"
         ],
         "env": {
-            "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/c2abf1081249b15fd4cdc8891ca5ea33/devkittelemetry-linux-arm64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/0051257b31161483f5948e703ec64e6a/devkittelemetry-linux-musl-arm64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/f163027e0885cee32f82ce2e08fde42e/devkittelemetry-linux-musl-x64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/1131d8f8b76726913012b2dafe62a96d/devkittelemetry-linux-x64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/daa21bc25bd780a3c8129b430b5c9c3f/devkittelemetry-osx-arm64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/fc14d7fe591b0d97a976d75c202f0628/devkittelemetry-osx-x64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/273a86e884dcc940a9bbc050bf31fd2e/devkittelemetry-platformagnostic-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/a3afc37a8f6fd12c5ff2f3c2975fee7b/devkittelemetry-win-arm64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/c56f49d55f76dbe6c88b590b6f66f1f1/devkittelemetry-win-x64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/e980f2cc28bbd493036a27d8d0261b63/devkittelemetry-win-x86-7.0.0-preview.24165.1.zip",
-            "NEW_DEPS_VERSION": "7.0.0-preview.24165.1",
+            "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/b9a6b44701b08cd5a8b2934260f5ad59/devkittelemetry-linux-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/3569c56beb063da89dff13444964e5ee/devkittelemetry-linux-musl-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/d0eb6050d4429ba1f833bb90549d6014/devkittelemetry-linux-musl-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/5c0781c22717cbf061552947d173035e/devkittelemetry-linux-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/962eebbee4f1618b8042745af0ee252d/devkittelemetry-osx-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/aeb2b93f02a901cc3b6f0a01db5ffefa/devkittelemetry-osx-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/addbbd1ec261f5576add7369416102c4/devkittelemetry-platformagnostic-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/973b8d03917bb4256ca01c91fe3638a7/devkittelemetry-win-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/95481d73dc1be495fccce0372813edac/devkittelemetry-win-x64-7.0.0-preview.24168.4.zip",
+            "NEW_DEPS_VERSION": "7.0.0-preview.24168.4",
             "NEW_DEPS_ID": "RazorTelemetry"
         },
         "cwd": "${workspaceFolder}"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,15 +4,30 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 ## Latest
+* 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.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.24151.1 (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))
   - Better using directive completiong (PR: [#9982](https://github.com/dotnet/razor/pull/9982))
+  - Add option to format code block open brace on new line (PR: [#10018](https://github.com/dotnet/razor/pull/10018) and [#6939](https://github.com/dotnet/vscode-csharp/pull/6939))
 
 ## 2.19.13
 * Fix `Attribute` snippet (PR: [#6879](https://github.com/dotnet/vscode-csharp/pull/6879))

diff --git a/azure-pipelines-official.yml b/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 }}
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -15,6 +15,8 @@ pr:
 
 stages:
 - template: azure-pipelines/build-all.yml
+  parameters:
+    isOfficial: false
 
 - stage: Test
   displayName: Test