Merge pull request #7012 from dibarbet/merge_main

Merge main into prerelease
dotnet · Mar 29, 2024 · 9dbac87 · 9dbac87
2 parents cfeb21f + 0e9009d
commit 9dbac87
Show file tree

Hide file tree

Showing 12 changed files with 3,000 additions and 2,953 deletions.
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1,2 @@
+registry=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/
+always-auth=true
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -169,8 +169,8 @@
               "updatePackageDependencies"
           ],
           "env": {
-              "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_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/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_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}"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,20 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 ## Latest
+* Add oboslete classification definitions to vs2019 themes (PR: [#7011](https://github.com/dotnet/vscode-csharp/pull/7011))
+* Bump Roslyn to 4.11.0-1.24179.11 (PR: [#7011](https://github.com/dotnet/vscode-csharp/pull/7011))
+  * Add feature to strike out obsolete symbols (PR: [#72156](https://github.com/dotnet/roslyn/pull/72156))
+  * Fix issue where some file changes would be ignored on Windows due to casing (PR: [#72555](https://github.com/dotnet/roslyn/pull/72555))
+  * Drop win32-ia32 language server support (PR: [#72605](https://github.com/dotnet/roslyn/pull/72605))
+  * Use built in Razor source generator instead of generator from SDK. (PR: [#72482](https://github.com/dotnet/roslyn/pull/72482))
+  * Always log LSP server processId and increase attach timeout (PR: [#72531](https://github.com/dotnet/roslyn/pull/72531))
+* 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))
@@ -17,6 +31,10 @@
 - 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))

diff --git a/omnisharptest/omnisharpIntegrationTests/testAssets/NuGet.config b/omnisharptest/omnisharpIntegrationTests/testAssets/NuGet.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- NuGet config for integration test projects.  Guards against a higher level NuGet.config from removing a required package source. -->
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
+  </packageSources>
+  <disabledPackageSources>
+    <clear />
+  </disabledPackageSources>
+</configuration>