[automated] Merge branch 'prerelease' => 'release' (#8065)

Author: dotnet-policy-service[bot]

Diff for: .config/1espt/PipelineAutobaseliningConfig.yml

@@ -50,3 +50,21 @@ pipelines:
           lastModifiedDate: 2024-03-27
         armory:
           lastModifiedDate: 2024-03-27
+  1424:
+    retail:
+      source:
+        credscan:
+          lastModifiedDate: 2025-02-05
+        eslint:
+          lastModifiedDate: 2025-02-05
+        psscriptanalyzer:
+          lastModifiedDate: 2025-02-05
+        armory:
+          lastModifiedDate: 2025-02-05
+      binary:
+        credscan:
+          lastModifiedDate: 2025-02-05
+        binskim:
+          lastModifiedDate: 2025-02-05
+        spotbugs:
+          lastModifiedDate: 2025-02-05

Diff for: .config/guardian/.gdnbaselines

@@ -14,10 +14,16 @@
     "26445e3e484940d2d58c2ffc32ab3895fca4b1589d66e2f2dee2fa01f2c479fb": {
       "signature": "26445e3e484940d2d58c2ffc32ab3895fca4b1589d66e2f2dee2fa01f2c479fb",
       "alternativeSignatures": [],
+      "target": "test/omnisharp/omnisharpUnitTests/testAssets/private.pem",
+      "line": 1,
       "memberOf": [
         "default"
       ],
-      "createdDate": "2024-09-09 19:35:36Z"
+      "tool": "credscan",
+      "ruleId": "CSCAN-GENERAL0020",
+      "createdDate": "2025-02-05 00:31:10Z",
+      "expirationDate": "2025-07-25 00:50:30Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2025-02-05 00:50:30Z"
     }
   }
-}
+}

Diff for: .eslintrc.js

@@ -58,8 +58,8 @@ module.exports = {
         "out/",
         "dist/",
         "wallaby.js",
-        "webpack.config.js",
         ".eslintrc.js",
+        "esbuild.js",
         "**/*.d.ts"
     ],
 };

Diff for: .github/ISSUE_TEMPLATE/bug_report.md

@@ -20,8 +20,10 @@ If the `CSharp: Report an issue` command doesn't appear, make sure that you have
 VS Code version:
 C# Extension version:
 
-## OmniSharp log
+## C# logs
+C# output window contents:
 
+See [this page](https://github.com/dotnet/vscode-csharp/blob/main/SUPPORT.md#collecting-general-logs) for collecting more detailed logs
 
 ## Steps to reproduce
 

Diff for: .github/policies/resourceManagement.yml

@@ -10,6 +10,29 @@ configuration:
 
     eventResponderTasks:
 
+    - description: Auto-approve/merge automated merge PRs
+      triggerOnOwnActions: false
+      if:
+      - payloadType: Pull_Request
+      - isPullRequest
+      - isActivitySender:
+          user: github-actions[bot]
+          issueAuthor: False
+      - or:
+        - titleContains:
+            pattern: "[automated] Merge branch"
+            isRegex: False
+        - titleContains:
+            pattern: "[automated] Update main version"
+            isRegex: False
+      - isAction:
+          action: Opened
+      then:
+      - approvePullRequest:
+          comment: Auto-approve
+      - enableAutoMerge:
+          mergeMethod: merge
+
     - description: Add "untriaged" label to issues when opened
       triggerOnOwnActions: false
       if:

Diff for: .github/workflows/backport.yml

@@ -0,0 +1,40 @@
+name: Backport PR to branch
+on:
+  issue_comment:
+    types: [created]
+  schedule:
+    # once a day at 13:00 UTC to cleanup old runs
+    - cron: '0 13 * * *'
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+  actions: write
+
+jobs:
+  backport:
+    if: ${{ contains(github.event.comment.body, '/backport to') || github.event_name == 'schedule' }}
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@main
+    with:
+      pr_description_template: |
+        Backport of #%source_pr_number% to %target_branch%
+
+        /cc %cc_users%
+
+        ## Customer Impact
+
+        ## Regression
+
+        - [ ] Yes
+        - [ ] No
+
+        [If yes, specify when the regression was introduced. Provide the PR or commit if known.]
+
+        ## Testing
+
+        [How was the fix verified? How was the issue missed previously? What tests were added?]
+
+        ## Risk
+
+        [High/Medium/Low. Justify the indication by mentioning how risks were measured and addressed.]

Diff for: .github/workflows/branch-snap.yml

@@ -31,5 +31,5 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: Update main version
-          title: 'Update main version'
+          title: '[automated] Update main version'
           branch: merge/update-main-version

Diff for: .vscode/launch.json

@@ -9,7 +9,7 @@
             "args": ["--extensionDevelopmentPath=${workspaceRoot}"],
             "sourceMaps": true,
             "outFiles": ["${workspaceRoot}/dist/*.js"],
-            "preLaunchTask": "buildDev"
+            "preLaunchTask": "packageDev"
         },
         {
             "name": "[Roslyn] Run Current File Integration Tests",
@@ -35,7 +35,7 @@
             "sourceMaps": true,
             "outFiles": ["${workspaceRoot}/dist/*.js", "${workspaceRoot}/out/test/**/*.js"],
             "resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
-            "preLaunchTask": "buildDev",
+            "preLaunchTask": "packageDev",
             "internalConsoleOptions": "openOnSessionStart"
         },
         {
@@ -62,7 +62,7 @@
             "sourceMaps": true,
             "outFiles": ["${workspaceRoot}/dist/*.js", "${workspaceRoot}/out/test/**/*.js"],
             "resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
-            "preLaunchTask": "buildDev",
+            "preLaunchTask": "packageDev",
             "internalConsoleOptions": "openOnSessionStart"
         },
         {
@@ -89,7 +89,7 @@
             "sourceMaps": true,
             "outFiles": ["${workspaceRoot}/dist/*.js", "${workspaceRoot}/out/test/**/*.js"],
             "resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
-            "preLaunchTask": "buildTest",
+            "preLaunchTask": "packageDev",
             "internalConsoleOptions": "openOnSessionStart"
         },
         {
@@ -115,7 +115,7 @@
             "sourceMaps": true,
             "outFiles": ["${workspaceRoot}/dist/*.js", "${workspaceRoot}/out/test/**/*.js"],
             "resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
-            "preLaunchTask": "buildTest"
+            "preLaunchTask": "packageDev"
         },
         {
             "name": "[O# LSP] Run Current File Integration Tests",
@@ -140,7 +140,7 @@
             "sourceMaps": true,
             "outFiles": ["${workspaceRoot}/dist/*.js", "${workspaceRoot}/out/test/**/*.js"],
             "resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
-            "preLaunchTask": "buildTest"
+            "preLaunchTask": "packageDev"
         },
         {
             "type": "node",
@@ -195,7 +195,7 @@
             "name": "Razor integration tests",
             "preLaunchTask": "build",
             "program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
-            "args": ["test:razorintegration"],
+            "args": ["test:integration:razor"],
             "cwd": "${workspaceFolder}"
         }
     ],

Diff for: .vscode/tasks.json

@@ -28,10 +28,20 @@
             }
         },
         {
-            "label": "buildTest",
+            "label": "package",
             "command": "npm",
             "type": "shell",
-            "args": ["run", "compileTest"],
+            "args": ["run", "package"],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "packageDev",
+            "command": "npm",
+            "type": "shell",
+            "args": ["run", "packageDev"],
             "group": {
                 "kind": "build",
                 "isDefault": true

Diff for: .vscodeignore

@@ -9,6 +9,7 @@
 !.razoromnisharp/**
 .rpt2_cache/**
 .config/**
+.devcontainer/**
 .github/**
 .vscode/**
 .vscode-test/**
@@ -51,8 +52,7 @@ package.json
 tsconfig.json
 version.json
 wallaby.js
-webpack.config.js
-
+esbuild.js
 !src/razor/language-configuration.json
 !src/razor/syntaxes/*