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

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

Author: dibarbet

.config/guardian/.gdnbaselines

@@ -1,8 +1,8 @@
 {
-  "hydrated": true,
+  "hydrated": false,
   "properties": {
     "helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines",
-    "hydrationStatus": "This file contains identifying data. It is **NOT** safe to check into your repo. To dehydrate this file, run `guardian dehydrate --help` and follow the guidance."
+    "hydrationStatus": "This file does not contain identifying data. It is safe to check into your repo. To hydrate this file with identifying data, run `guardian hydrate --help` and follow the guidance."
   },
   "version": "1.0.0",
   "baselines": {
@@ -16,13 +16,9 @@
     "26445e3e484940d2d58c2ffc32ab3895fca4b1589d66e2f2dee2fa01f2c479fb": {
       "signature": "26445e3e484940d2d58c2ffc32ab3895fca4b1589d66e2f2dee2fa01f2c479fb",
       "alternativeSignatures": [],
-      "target": "test/omnisharp/omnisharpUnitTests/testAssets/private.pem",
-      "line": 1,
       "memberOf": [
         "default"
       ],
-      "tool": "credscan",
-      "ruleId": "CSCAN-GENERAL0020",
       "createdDate": "2024-09-09 19:35:36Z"
     }
   }

.eslintrc.js

@@ -4,7 +4,7 @@ module.exports = {
     },
     extends: [
         "eslint:recommended",
-        "plugin:@typescript-eslint/recommended"
+        "plugin:@typescript-eslint/recommended",
     ],
     parser: "@typescript-eslint/parser",
     parserOptions: {
@@ -33,6 +33,7 @@ module.exports = {
         ],
         "@typescript-eslint/no-namespace": "off",
         "@typescript-eslint/promise-function-async": "error",
+        "@typescript-eslint/no-floating-promises": "error",
         "prefer-promise-reject-errors": "error",
         "curly": "error",
         "prettier/prettier": [ "error", { "endOfLine": "auto" } ],

CHANGELOG.md

@@ -4,6 +4,14 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 # 2.50.x
+* Update Roslyn to 4.13.0-1.24477.2 (PR: [#<>](https://github.com/dotnet/vscode-csharp/pull/<>))
+  * Use MSBuild globs to determine which file changes are relevant (PR: [#75139](https://github.com/dotnet/roslyn/pull/75139))
+  * Allow <code> in DocComments to render as a block in Hover response (PR: [#75215](https://github.com/dotnet/roslyn/pull/75215))
+  * Ignore irrelevant exceptions when reporting LSP server NFW (PR: [#75150](https://github.com/dotnet/roslyn/pull/75150))
+* Bumped xamltools to 17.12.35326.17 (PR: [#7610](https://github.com/dotnet/vscode-csharp/pull/7610))
+* Do not remove documents if they are not files (PR: [#7607](https://github.com/dotnet/vscode-csharp/pull/7607))
+* Support copilot registerRelatedFilesProvider API (PR: [#7605](https://github.com/dotnet/vscode-csharp/pull/7605))
+* Update Debugger packages to v2.50.0 (PR: [#7597](https://github.com/dotnet/vscode-csharp/pull/7597))
 
 # 2.49.x
 * Update Razor to 9.0.0-preview.24467.1

azure-pipelines-official.yml

@@ -50,6 +50,10 @@ extends:
       tsa:
         enabled: true
         configFile: '$(Build.SourcesDirectory)/.config/guardian/TSAConfig.gdntsa'
+      codeSignValidation:
+        # VCTools dlls are signed with the Phone cert, which isn't accepted by the CodeSign policy.
+        # Can be removed once https://dev.azure.com/devdiv/DevDiv/_workitems/edit/2093995 is fixed.
+        additionalTargetsGlobPattern: '-|**\msdia140.dll;-|**\msvc*.dll;-|**\vcruntime*.dll'
     customBuildTags:
     - ES365AIMigrationTooling
     stages:

l10n/bundle.l10n.json

@@ -29,13 +29,13 @@
   "Can't parse envFile {0} because of {1}": "Can't parse envFile {0} because of {1}",
   "Open envFile": "Open envFile",
   "Yes": "Yes",
-  "Not Now": "Not Now",
-  "More Information": "More Information",
-  "The selected launch configuration is configured to launch a web browser but no trusted development certificate was found. Create a trusted self-signed certificate?": "The selected launch configuration is configured to launch a web browser but no trusted development certificate was found. Create a trusted self-signed certificate?",
   "Self-signed certificate sucessfully {0}": "Self-signed certificate sucessfully {0}",
   "Couldn't create self-signed certificate. {0}\ncode: {1}\nstdout: {2}": "Couldn't create self-signed certificate. {0}\ncode: {1}\nstdout: {2}",
   "Show Output": "Show Output",
   "Couldn't create self-signed certificate. See output for more information.": "Couldn't create self-signed certificate. See output for more information.",
+  "Not Now": "Not Now",
+  "More Information": "More Information",
+  "The selected launch configuration is configured to launch a web browser but no trusted development certificate was found. Create a trusted self-signed certificate?": "The selected launch configuration is configured to launch a web browser but no trusted development certificate was found. Create a trusted self-signed certificate?",
   "No executable projects": "No executable projects",
   "Select the project to launch": "Select the project to launch",
   "Invalid project index": "Invalid project index",
@@ -140,8 +140,8 @@
   "OmniSharp requires a complete install of Mono (including MSBuild) to provide language services when `omnisharp.useModernNet` is disabled in Settings. Please install the latest Mono and restart.": "OmniSharp requires a complete install of Mono (including MSBuild) to provide language services when `omnisharp.useModernNet` is disabled in Settings. Please install the latest Mono and restart.",
   "Download Mono": "Download Mono",
   "Open settings": "Open settings",
-  "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change",
   "Reload Window": "Reload Window",
+  "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change",
   "C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "C# configuration has changed. Would you like to relaunch the Language Server with your changes?",
   "Restart Language Server": "Restart Language Server",
   "project.json is no longer a supported project format for .NET Core applications.": "project.json is no longer a supported project format for .NET Core applications.",