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

Author: dotnet-policy-service[bot]

.github/workflows/branch-snap.yml

@@ -1,6 +1,12 @@
 name: Branch snap
 on:
-  workflow_dispatch
+  workflow_dispatch:
+    inputs:
+      releaseCandidate:
+        description: 'Is this a release candidate snap from main? (Will increment main version to be higher than next stable release)'
+        required: false
+        default: 'false'
+        type: boolean
 
 permissions:
   contents: write
@@ -13,23 +19,55 @@ jobs:
       configuration_file_path: '.config/snap-flow.json'
 
   bump-main-version:
+    needs: check-script
     if: github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     steps:
       - name: Check out
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Install NodeJS
         uses: actions/setup-node@v4
         with:
           node-version: '18.x'
       - name: Install dependencies 
         run: npm ci
       - name: Update version.json
-        run: npx gulp incrementVersion
+        run: |
+          if [ "${{ github.event.inputs.releaseCandidate }}" = "true" ]; then
+            npx gulp incrementVersion --releaseCandidate=true
+          else
+            npx gulp incrementVersion
+          fi
       - name: Create version update PR
         uses: peter-evans/create-pull-request@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: Update main version
           title: '[automated] Update main version'
           branch: merge/update-main-version
+
+  update-release-version:
+    needs: check-script
+    if: github.ref == 'refs/heads/prerelease'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out merge branch
+        uses: actions/checkout@v4
+        with:
+          ref: merge/prerelease-to-release
+          fetch-depth: 0
+      - name: Install NodeJS
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18.x'
+      - name: Install dependencies 
+        run: npm ci
+      - name: Update version.json for release
+        run: npx gulp updateVersionForStableRelease
+      - name: Create PR with version update
+        uses: peter-evans/create-pull-request@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commit-message: Update version for stable release
+          branch: merge/prerelease-to-release
+          base: release

CHANGELOG.md

@@ -3,6 +3,39 @@
 - 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.97.x
+* Add integration test for restore of file-based programs (PR: [#8470](https://github.com/dotnet/vscode-csharp/pull/8470))
+* Update setting documentation for on auto insert (PR: [#8742](https://github.com/dotnet/vscode-csharp/pull/8742))
+* Bump xamlTools to fix "Color" auto-completion and code navigation (PR: [#8740](https://github.com/dotnet/vscode-csharp/pull/8740))
+* Update VM image to macOS-15 in pipeline (PR: [#8741](https://github.com/dotnet/vscode-csharp/pull/8741))
+* Add instructions for creating private feedback (PR: [#8732](https://github.com/dotnet/vscode-csharp/pull/8732))
+* Implement tiered versioning scheme for branch snapping workflow (PR: [#8728](https://github.com/dotnet/vscode-csharp/pull/8728))
+* Bump xamlTools to 18.3.11128.18 (PR: [#8669](https://github.com/dotnet/vscode-csharp/pull/8740))
+* Update target framework in Razor integration test (PR: [#8729](https://github.com/dotnet/vscode-csharp/pull/8729))
+* Use global.json with rollforward instead of pipeline versions (PR: [#8722](https://github.com/dotnet/vscode-csharp/pull/8722))
+* Update RoslynCopilot url to 18.3.72-alpha (PR: [#8726](https://github.com/dotnet/vscode-csharp/pull/8726))
+* Add group ids to configuration groups (PR: [#8720](https://github.com/dotnet/vscode-csharp/pull/8720))
+* [WIP] Update job execution order for bump-main-version (PR: [#8717](https://github.com/dotnet/vscode-csharp/pull/8717))
+* Update CHANGELOG for version 2.97.x (PR: [#8716](https://github.com/dotnet/vscode-csharp/pull/8716))
+* Bump Roslyn to 5.3.0-2.25553.6 (PR: [#8743](https://github.com/dotnet/vscode-csharp/pull/8743))
+  * Support LSP includeDeclaration field in find all references (PR: [#80965](https://github.com/dotnet/roslyn/pull/80965))
+  * Add support for lineFoldingOnly folding ranges (PR: [#80955](https://github.com/dotnet/roslyn/pull/80955))
+  * Expand `#error version` output to include compiler assembly path and use full commit SHA everywhere (PR: [#80894](https://github.com/dotnet/roslyn/pull/80894))
+  * Fix culture-sensitive StringBuilder.Append and ToString calls across codebase and add banned symbols (PR: [#80800](https://github.com/dotnet/roslyn/pull/80800))
+  * Add support for autocompleting raw string quotes (PR: [#80871](https://github.com/dotnet/roslyn/pull/80871))
+  * Don't add parenthesis when committing type with accessible nested type using dot (PR: [#80846](https://github.com/dotnet/roslyn/pull/80846))
+  * Completion for `#:project` paths in file based programs (PR: [#80844](https://github.com/dotnet/roslyn/pull/80844))
+  * Allow semantic tokens in Razor to be better behaved (PR: [#80815](https://github.com/dotnet/roslyn/pull/80815))
+  * When searching for the original file from a PDB, only allow absolute paths (PR: [#80804](https://github.com/dotnet/roslyn/pull/80804))
+* Bump Razor to 10.0.0-preview.25552.2 (PR: [#8734](https://github.com/dotnet/vscode-csharp/pull/8734))
+  * Add CodeAction to simplify fully-qualified component tags (PR: [#12379](https://github.com/dotnet/razor/pull/12379))
+  * Fix component and component attribute rename in cohosting (PR: [#12374](https://github.com/dotnet/razor/pull/12374))
+  * Fix formatting of mixed indentation in VS Code (PR: [#12418](https://github.com/dotnet/razor/pull/12418))
+  * Allow cohosting quick info to show html tag information even when on a taghelper or component tag. (PR: [#12415](https://github.com/dotnet/razor/pull/12415))
+  * Fix(ish) formatting of RenderFragments (C# templates) (PR: [#12397](https://github.com/dotnet/razor/pull/12397))
+  * Drop Html edits that would split a C# literal across multiple lines (PR: [#12396](https://github.com/dotnet/razor/pull/12396))
+  * Fix completion resolve for provisional completion (PR: [#12403](https://github.com/dotnet/razor/pull/12403))
+
 # 2.96.x
 * Update Debugger to v2.95.0 (PR: [#8710](https://github.com/dotnet/vscode-csharp/pull/8710))
 * Remove default editor.formatOnType configuration for C# (PR: [#8709](https://github.com/dotnet/vscode-csharp/pull/8709))

CONTRIBUTING.md

@@ -64,9 +64,9 @@ To debug unit tests locally, press <kbd>F5</kbd> in VS Code with the "Launch Tes
 To debug integration tests
 1.  Import the `csharp-test-profile.code-profile` in VSCode to setup a clean profile in which to run integration tests.  This must be imported at least once to use the launch configurations (ensure the extensions are updated in the profile).
 2.  Open any integration test file and <kbd>F5</kbd> launch with the correct launch configuration selected.
-    - For integration tests inside `test/lsptoolshost`, use either `Launch Current File slnWithCsproj Integration Tests` or `[DevKit] Launch Current File slnWithCsproj Integration Tests` (to run tests using C# + C# Dev Kit)
+    - For integration tests inside `test/lsptoolshost`, use either `[Roslyn] Run Current File Integration Test` or `[DevKit] Launch Current File Integration Tests` (to run tests using C# + C# Dev Kit)
     - For integration tests inside `test/razor`, use `[Razor] Run Current File Integration Test`
-    - For integration tests inside `test/omnisharp`, use one of the `Omnisharp:` current file profiles
+    - For integration tests inside `test/omnisharp`, use one of the `[O#] Run Current File Integration Test` current file profiles
 
 These will allow you to actually debug the test, but the 'Razor integration tests' configuration does not.
 
@@ -196,15 +196,25 @@ More details for this are [here] (https://devdiv.visualstudio.com/DevDiv/_git/Vi
 ## Snapping for releases
 Extension releases on the marketplace are done from the prerelease and release branches (corresponding to the prerelease or release version of the extension).  Code flows from main -> prerelease -> release.  Every week we snap main -> prerelease.  Monthly, we snap prerelease -> release.
 
+### Versioning Scheme
+The extension follows a specific versioning scheme for releases:
+- **Prerelease versions**: Use standard minor version increments (e.g., 2.74, 2.75, 2.76...)
+- **Stable release versions**: Use the next tens version (e.g., 2.74 prerelease becomes 2.80 stable)
+- **Main branch after RC snap**: Jumps to one above the next stable version (e.g., if snapping 2.74 as RC, main becomes 2.81)
+
 ### Snap main -> prerelease
 The snap is done via the "Branch snap" github action.  To run the snap from main -> prerelease, run the action via "Run workflow" and choose main as the base branch.
 ![branch snap action](./docs/images/main_snap.png)
 
+When running the snap action, you can optionally check the "Is this a release candidate snap" checkbox. If checked:
+- The prerelease branch will receive the snapped code with the current version (e.g., 2.74)
+- The main branch version will be updated to be higher than the next stable release (e.g., 2.81, since the next stable would be 2.80)
+
 This will generate two PRs that must be merged.  One merging the main branch into prerelease, and the other bumps the version in main.
 ![generated prs](./docs/images/generated_prs.png)
 
 ### Snap prerelease -> release
-To snap from prerelease to release, run the same action but use **prerelease** as the workflow branch.  This will generate a single PR merging from prerelease to release.
+To snap from prerelease to release, run the same action but use **prerelease** as the workflow branch.  This will generate a PR merging from prerelease to release, and automatically update the version to the next stable release version (e.g., 2.74 -> 2.80) on the merge branch before the PR is merged.
 
 ### Marketplace release
 The marketplace release is managed by an internal AzDo pipeline.  On the pipeline page, hit run pipeline.  This will bring up the pipeline parameters to fill out:

SUPPORT.md

@@ -107,7 +107,7 @@ If you encounter issues with document classification (e.g., incorrect syntax hig
 For issues with diagnostics, please provide values of the background analysis scope options, `dotnet.backgroundAnalysis.analyzerDiagnosticsScope` and `dotnet.backgroundAnalysis.compilerDiagnosticsScope`
 ![background analysis settings](./docs/images/background_analysis.png)
 
-#### Language server crashing
+### Language server crashing
 
 If the language server crashes, general logs are often helpful for diagnosing the issue. However, in some cases, logs alone may not provide enough information and we may need a crash dump. Follow these steps to collect a crash dump:
 - Set the `dotnet.server.crashDumpPath` setting in VSCode to a user-writable folder where crash dumps can be saved.
@@ -117,7 +117,7 @@ If the language server crashes, general logs are often helpful for diagnosing th
 > [!WARNING]
 > The dump can contain detailed information on the project - generally we will provide an email so that it can be shared privately
 
-#### Recording a language server trace
+### Recording a language server trace
 
 When investigating performance issues, we may request a performance trace of the language server to diagnose what is causing the problem.  These are typically taken via [dotnet-trace](https://learn.microsoft.com/en-us/dotnet/core/diagnostics/dotnet-trace) (a cross platform tool to collect performance traces of .NET processes)
 
@@ -132,6 +132,16 @@ The C# extension has a built in command, `csharp.recordLanguageServerTrace` to h
 ![alt text](docs/images/recordTraceTerminal.png)
 5.  Share the trace.  Note that the trace may contain PII, so generally we will provide an email or other confidential way to share the trace with us.
 
+### Sharing information privately
+Detailed logs, dumps, traces, and other information can sometimes contain private information that you do not wish to share publicly.  Instead, you can utilize the Developer Community page to share these privately to Microsoft.
+
+1.  Go to https://developercommunity.visualstudio.com/dotnet/report
+2.  Fill in the issue title, reference the GitHub issue in the description, and upload the attachments
+![developer community feedback page](docs/images/developer_community_feedback.png)
+3.  Once created, a comment on the GitHub issue a link to the new Developer Community ticket.
+
+
+
 ## Microsoft Support Policy
 
 Support for this project is limited to the resources listed above.

azure-pipelines-official.yml

@@ -27,9 +27,6 @@ parameters:
   - auto
   default: auto
 
-variables:
-- template: /azure-pipelines/dotnet-variables.yml@self
-
 resources:
   repositories:
   - repository: 1ESPipelineTemplates
@@ -66,4 +63,3 @@ extends:
         isOfficial: true
         channel: ${{ parameters.channel }}
         signType: ${{ parameters.signType }}
-        dotnetVersion: $(defaultDotnetVersion)

azure-pipelines.yml

@@ -55,7 +55,6 @@ schedules:
         - main
 
 variables:
-- template: /azure-pipelines/dotnet-variables.yml@self
 - name: testVSCodeVersion
   ${{ if eq( variables['Build.Reason'], 'Schedule' ) }}: 
     value: insiders
@@ -67,52 +66,71 @@ stages:
   parameters:
     isOfficial: false
     signType: test
-    dotnetVersion: $(defaultDotnetVersion)
 
 - template: azure-pipelines/validate-build.yml
-  parameters:
-    dotnetVersion: $(defaultDotnetVersion)
 
 - stage:
   displayName: Test Linux (.NET 8)
   dependsOn: []
+  variables:
+    ROSLYN_SKIP_TEST_FILE_BASED_PROGRAMS: 'true'
   jobs:
   - template: azure-pipelines/test-matrix.yml
     parameters:
       os: linux
       # Prefer the dotnet from the container.
-      dotnetVersion: ''
+      installDotNet: false
       testVSCodeVersion: $(testVSCodeVersion)
       installAdditionalLinuxDependencies: true
       pool:
         name: NetCore-Public
         demands: ImageOverride -equals 1es-ubuntu-2004-open
-      containerName: mcr.microsoft.com/dotnet/sdk:8.0
+      containerName: mcr.microsoft.com/dotnet/sdk:8.0-noble
 
 - stage:
   displayName: Test Linux (.NET 9)
   dependsOn: []
+  variables:
+    ROSLYN_SKIP_TEST_FILE_BASED_PROGRAMS: 'true'
+  jobs:
+  - template: azure-pipelines/test-matrix.yml
+    parameters:
+      os: linux
+      # Prefer the dotnet from the container.
+      installDotNet: false
+      testVSCodeVersion: $(testVSCodeVersion)
+      installAdditionalLinuxDependencies: true
+      pool:
+        name: NetCore-Public
+        demands: ImageOverride -equals 1es-ubuntu-2004-open
+      containerName: mcr.microsoft.com/dotnet/sdk:9.0-noble
+
+- stage:
+  displayName: Test Linux (.NET 10)
+  dependsOn: []
   jobs:
   - template: azure-pipelines/test-matrix.yml
     parameters:
       os: linux
       # Prefer the dotnet from the container.
-      dotnetVersion: ''
+      installDotNet: false
       testVSCodeVersion: $(testVSCodeVersion)
       installAdditionalLinuxDependencies: true
       pool:
         name: NetCore-Public
         demands: ImageOverride -equals 1es-ubuntu-2004-open
-      containerName: mcr.microsoft.com/dotnet/sdk:9.0
+      containerName: mcr.microsoft.com/dotnet/sdk:10.0.100-rc.2-noble
 
 - stage: Test_Windows_Stage
   displayName: Test Windows
   dependsOn: []
+  variables:
+    ROSLYN_SKIP_TEST_FILE_BASED_PROGRAMS: 'true'
   jobs:
   - template: azure-pipelines/test-matrix.yml
     parameters:
       os: windows
-      dotnetVersion: $(defaultDotnetVersion)
+      installDotNet: true
       testVSCodeVersion: $(testVSCodeVersion)
       pool:
         name: NetCore-Public
@@ -121,15 +139,17 @@ stages:
 - stage: Test_MacOS_Stage
   displayName: Test MacOS
   dependsOn: []
+  variables:
+    ROSLYN_SKIP_TEST_FILE_BASED_PROGRAMS: 'true'
   jobs:
   - template: azure-pipelines/test-matrix.yml
     parameters:
       os: macos
-      dotnetVersion: $(defaultDotnetVersion)
+      installDotNet: true
       testVSCodeVersion: $(testVSCodeVersion)
       pool:
         name: Azure Pipelines
-        vmImage: macOS-13
+        vmImage: macOS-15
 
 - stage: Test_OmniSharp
   displayName: Test OmniSharp
@@ -148,5 +168,5 @@ stages:
     steps:
     - template: azure-pipelines/test-omnisharp.yml
       parameters:
-        dotnetVersion: $(defaultDotnetVersion)
+        installDotNet: true
         testVSCodeVersion: $(testVSCodeVersion)

azure-pipelines/build-vsix.yml

@@ -4,8 +4,6 @@ parameters:
   default: 'default'
 - name: isOfficial
   type: boolean
-- name: dotnetVersion
-  type: string
 - name: channel
   values:
   - release
@@ -128,7 +126,7 @@ stages:
     - template: /azure-pipelines/prereqs.yml@self
       parameters:
         versionNumberOverride: ${{ parameters.versionNumberOverride }}
-        dotnetVersion: ${{ parameters.dotnetVersion}}
+        installDotNet: true
 
     - task: UsePythonVersion@0
       displayName: 'Use Python 3.11'

azure-pipelines/build.yml

@@ -1,6 +1,6 @@
 parameters:
-- name: dotnetVersion
-  type: string
+- name: installDotNet
+  type: boolean
 
 steps:
 - checkout: self
@@ -10,7 +10,7 @@ steps:
   fetchDepth: 0
 - template: /azure-pipelines/prereqs.yml@self
   parameters:
-    dotnetVersion: ${{ parameters.dotnetVersion}}
+    installDotNet: ${{ parameters.installDotNet }}
 
 - pwsh: npm run package
   displayName: 'Build'

azure-pipelines/dotnet-variables.yml

@@ -2,8 +2,8 @@ parameters:
   - name: versionNumberOverride
     type: string
     default: 'default'
-  - name: dotnetVersion
-    type: string
+  - name: installDotNet
+    type: boolean
 
 steps:
 
@@ -14,11 +14,13 @@ steps:
 
 # Some tests use predefined docker images with a specific version of .NET installed.
 # So we avoid installing .NET in those cases.
-- ${{ if parameters.dotnetVersion }}:
+- ${{ if parameters.installDotNet }}:
   - task: UseDotNet@2
     displayName: 'Install .NET SDK'
     inputs:
-      version: ${{ parameters.dotnetVersion }}
+      useGlobalJson: true
+      workingDirectory: $(Build.SourcesDirectory)/msbuild
+      
 
 - script: dotnet --info
   displayName: Display dotnet info