[automated] Merge branch 'main' => 'prerelease' (#8037)

Author: dibarbet

.eslintrc.js

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

.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
 

.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.]

.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}"
         }
     ],

.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

.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/*
 

CHANGELOG.md

@@ -3,6 +3,14 @@
 - Diagnostics related feature requests and improvements [#5951](https://github.com/dotnet/vscode-csharp/issues/5951)
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
+# 2.68.x
+* Update Razor to 9.0.0-preview.25125.9 (PR: [#8027](https://github.com/dotnet/vscode-csharp/pull/8027))
+  * Don't send invalid ranges for diagnostics if they do not map (#11555) (PR: [#11555](https://github.com/dotnet/razor/pull/11555))
+  * Fix file path service, and integration tests (#11556) (PR: [#11556](https://github.com/dotnet/razor/pull/11556))
+  * Add ParserOptions and CodeGenerationOptions properties to RazorCodeDocument and rationalize options configuration (#11526) (PR: [#11526](https://github.com/dotnet/razor/pull/11526))
+  * Fix parsing of quotes in attribute names (#11543) (PR: [#11543](https://github.com/dotnet/razor/pull/11543))
+  * Bump xamlTools to 17.14.35828.13 (PR: [#8032](https://github.com/dotnet/vscode-csharp/pull/8032))
+
 # 2.67.x
 * Update Razor to 9.0.0-preview.25125.9 (PR: [#8027](https://github.com/dotnet/vscode-csharp/pull/8027))
   * Don't send invalid ranges for diagnostics if they do not map (#11555) (PR: [#11555](https://github.com/dotnet/razor/pull/11555))

CONTRIBUTING.md

@@ -36,6 +36,7 @@ Follow these steps to build, run, and test the repository:
 #### Building
 
 1. Run `npm install -g vsts-npm-auth`, then run `vsts-npm-auth -config .npmrc` - This command will configure your credentials for the next command.
+   a.  If you have already authenticated before, but the token expired, you may need to run `vsts-npm-auth -config .npmrc -f` instead.
 2. Run `npm i` - This command installs the project dependencies.
 3. Run `npm i -g gulp` - This command installs Gulp globally.
 4. Run `gulp installDependencies` - This command downloads the various dependencies as specified by the version in the [package.json](package.json) file.
@@ -51,7 +52,8 @@ After completing the build steps:
 
 #### Testing
 
-To run all tests, execute `npm run test`.
+To run all unit tests, execute `npm run test:unit`.
+To run all integration tests execute `npm run test:integration`
 
 To debug unit tests locally, press <kbd>F5</kbd> in VS Code with the "Launch Tests" debug configuration selected.
 

azure-pipelines/prereqs.yml

@@ -40,6 +40,3 @@ steps:
     npm ci
     npm i -g gulp
   displayName: 'Install dependencies'
-
-- script: npm run compile
-  displayName: 'Compile'

azure-pipelines/profiling.yml

@@ -56,4 +56,5 @@ extends:
           parameters:
             dotnetVersion: $(defaultDotnetVersion)
             npmCommand: profiling
-            testVSCodeVersion: stable
+            testVSCodeVersion: stable
+            isIntegration: true