Merge prerelease to release

.github/copilot-instructions.md

@@ -0,0 +1,62 @@
+# Copilot Coding Agent Instructions for `vscode-csharp`
+
+## Project Overview
+- This is the official C# extension for Visual Studio Code, supporting C# development via OmniSharp and Roslyn-based language servers.
+- The codebase is TypeScript/JavaScript, with some JSON and configuration files. It integrates with .NET components and external language servers.
+
+## Architecture & Key Components
+- **src/**: Main extension source. Key subfolders:
+  - `lsptoolshost/`: Hosts LSP (Language Server Protocol) logic, including Copilot integration (`copilot/`), Roslyn, and Razor support.
+  - `omnisharp/`: Protocols and logic for OmniSharp-based language server.
+  - `razor/`: Razor language support and configuration.
+- **Copilot Integration**:
+  - `src/lsptoolshost/copilot/contextProviders.ts` and `relatedFilesProvider.ts` register C# context and related files providers for GitHub Copilot and Copilot Chat extensions.
+  - The Roslyn Copilot language server is managed as a downloadable component (see `package.json` and `CONTRIBUTING.md`).
+
+## Developer Workflows
+- **Build**: `npm run compile` (or use VS Code build task)
+- **Test**: `npm test` (runs Jest tests)
+- **Package**: `npm run package` (creates VSIX)
+- **Dependencies**: Use `gulp installDependencies` to fetch .NET/LS components
+- **Debugging**: See `docs/debugger/` for advanced .NET debugging, including runtime and external library debugging.
+- **Roslyn Copilot Language Server**: To update/test, see instructions in `CONTRIBUTING.md` (triggers pipeline, checks logs for install, etc.)
+
+## Infrastructure Tasks
+- **Tasks Directory**: Build automation is in `tasks/` using Gulp. Key modules:
+  - `testTasks.ts`: Test orchestration for unit/integration tests across components
+  - `offlinePackagingTasks.ts`: VSIX packaging for different platforms (`vsix:release:package:*`)
+  - `componentUpdateTasks.ts`: Automated updates for Roslyn Copilot components
+  - `snapTasks.ts`: Version bumping and changelog management for releases
+  - `gitTasks.ts`: Git operations for automated PR creation and branch management
+- **Adding New Tasks**: Create `.ts` file in `tasks/`, define `gulp.task()` functions, require in `gulpfile.ts`
+- **Task Patterns**: Use `projectPaths.ts` for consistent path references, follow existing naming conventions (`test:integration:*`, `vsix:*`, etc.)
+
+## Project Conventions & Patterns
+- **TypeScript**: Follows strict linting (`.eslintrc.js`), including header/license blocks and camelCase filenames (except for interfaces and special files).
+- **Component Downloads**: Language servers and debuggers are downloaded at runtime; see `package.json` for URLs and install logic.
+- **Copilot Providers**: Use `registerCopilotContextProviders` and `registerCopilotRelatedFilesProvider` to extend Copilot context for C#.
+- **Testing**: Prefer integration tests over unit tests for features. Structure follows:
+  - `test/lsptoolshost/integrationTests/` for Roslyn/LSP features
+  - `test/omnisharp/omnisharpIntegrationTests/` for OmniSharp features  
+  - `test/razor/razorIntegrationTests/` for Razor features
+  - Use `test/*/integrationTests/integrationHelpers.ts` for test setup utilities
+  - Tests use Jest with VS Code test environment and require workspace test assets
+  - Run with `npm run test:integration:*` commands (e.g., `npm run test:integration:csharp`)
+
+## Integration Points
+- **GitHub Copilot**: Extension registers C# context and related files providers if Copilot/Copilot Chat extensions are present.
+- **Roslyn Language Server**: Managed as a downloadable component, versioned in `package.json` and updated via pipeline.
+- **OmniSharp**: Legacy support, also downloaded as a component.
+
+## Examples
+- To add a new Copilot context provider: see `src/lsptoolshost/copilot/contextProviders.ts`.
+- To update Roslyn Copilot server: follow `CONTRIBUTING.md` > "Updating the Roslyn Copilot Language Server version".
+
+## References
+- [README.md](../README.md): User-facing overview and features
+- [CONTRIBUTING.md](../CONTRIBUTING.md): Dev setup, packaging, and advanced workflows
+- [package.json](../package.json): Component download logic, scripts
+- [src/lsptoolshost/copilot/](../src/lsptoolshost/copilot/): Copilot integration logic
+
+---
+For any unclear or incomplete sections, please provide feedback to improve these instructions.

.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
@@ -12,24 +18,56 @@ jobs:
     with:
       configuration_file_path: '.config/snap-flow.json'
 
-  create-pull-request:
+  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

.github/workflows/copilot-setup-steps.yml

@@ -0,0 +1,55 @@
+# GitHub Copilot setup steps for the C# VS Code extension
+# This file configures the environment for the GitHub Copilot coding agent
+
+name: "Copilot Setup Steps"
+
+# Automatically run the setup steps when they are changed to allow for easy validation, and
+# allow manual testing through the repository's "Actions" tab
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
+  pull_request:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
+
+jobs:
+  # The job MUST be called `copilot-setup-steps` or it will not be picked up by Copilot.
+  copilot-setup-steps:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read  # Read access to the repository contents (required for checkout)
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+
+      # Install Node.js (required for TypeScript compilation and npm packages)
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: 'npm'
+
+      # Install .NET SDK (required for some build components and MSBuild tasks)
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '8.0.x'
+
+      # Install npm dependencies
+      - name: Install dependencies
+        run: npm ci
+
+      # Install gulp globally (required for build tasks)
+      - name: Install gulp
+        run: npm install -g gulp
+
+      # Install vsce (needed for packaging tasks)
+      - name: Install vsce
+        run: npm install -g vsce
+
+      # Install server dependencies (needed for integration tests and running)
+      - name: Install dependencies
+        run: gulp installDependencies
+
+

.github/workflows/update-changelog.yml

@@ -0,0 +1,36 @@
+name: Update CHANGELOG
+on:
+  workflow_dispatch:
+  schedule:
+    # Runs every Tuesday at 9 PM Pacific Time (5 AM UTC Wednesday)
+    - cron: '0 5 * * 3'
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  update-changelog:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Install roslyn-tools
+        run: dotnet tool install -g Microsoft.RoslynTools --prerelease --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json
+      - name: Install NodeJS
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+      - name: Install dependencies
+        run: npm ci
+      - name: Update CHANGELOG
+        run: npx gulp updateChangelog
+      - name: Create update PR
+        uses: peter-evans/create-pull-request@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commit-message: Update ${{ github.ref_name }} CHANGELOG
+          title: '[automated] Update ${{ github.ref_name }} CHANGELOG'
+          branch: merge/update-${{ github.ref_name }}-changelog

.vscodeignore

@@ -8,7 +8,7 @@
 !.razorDevKit/**
 !.razoromnisharp/**
 !.razorExtension/**
-.rpt2_cache/**
+.azuredevops/**
 .config/**
 .devcontainer/**
 .github/**
@@ -22,8 +22,7 @@ src/**
 tasks/**
 test/**
 __mocks__/**
-jest.config.ts
-baseJestConfig.ts
+**/*.ts
 .prettierignore
 typings/**
 vsix/**
@@ -40,17 +39,13 @@ CODEOWNERS
 Directory.Build.props
 global.json
 NuGet.config
-gulpfile.ts
 !install.Lock
-ISSUE_TEMPLATE
 !README.md
 !CHANGELOG.md
 *.md
-CONTRIBUTING.md
 *.vscodeignore
 *.yml
 package-lock.json
-package.json
 tsconfig.json
 version.json
 wallaby.js

CHANGELOG.md

@@ -105,13 +105,13 @@
 
 # 2.93.x
 * Bump Roslyn to 5.0.0-2.25472.11 (PR: [#8646](https://github.com/dotnet/vscode-csharp/pull/8646))
-  * Fix handling edits in types nested in reloadable types(PR: [#80360](https://github.com/dotnet/roslyn/pull/80360))
-  * Remove CS1998 warning entirely and remove dependent C# code fix providers(PR: [#80144](https://github.com/dotnet/roslyn/pull/80144))
-  * Only restore based on assets file changes if the actual content changed(PR: [#80341](https://github.com/dotnet/roslyn/pull/80341))
+  * Fix handling edits in types nested in reloadable types (PR: [#80360](https://github.com/dotnet/roslyn/pull/80360))
+  * Remove CS1998 warning entirely and remove dependent C# code fix providers (PR: [#80144](https://github.com/dotnet/roslyn/pull/80144))
+  * Only restore based on assets file changes if the actual content changed (PR: [#80341](https://github.com/dotnet/roslyn/pull/80341))
   * Fix issue where build artifacts were added in source tree (PR: [#80324](https://github.com/dotnet/roslyn/pull/80324))
-  * Allow clients to send range ending at the line after the last line in the document(PR: [#80310](https://github.com/dotnet/roslyn/pull/80310))
-  * Don't show Razor diagnostics in Full Solution Analysis(PR: [#80296](https://github.com/dotnet/roslyn/pull/80296))
-  * Log project context in which document was found(PR: [#80202](https://github.com/dotnet/roslyn/pull/80202))
+  * Allow clients to send range ending at the line after the last line in the document (PR: [#80310](https://github.com/dotnet/roslyn/pull/80310))
+  * Don't show Razor diagnostics in Full Solution Analysis (PR: [#80296](https://github.com/dotnet/roslyn/pull/80296))
+  * Log project context in which document was found (PR: [#80202](https://github.com/dotnet/roslyn/pull/80202))
 * Bump Razor to 10.0.0-preview.25472.6 (PR: [#8639](https://github.com/dotnet/vscode-csharp/pull/8639))
   * Support view components in Go To Def (PR: [#12222](https://github.com/dotnet/razor/pull/12222))
   * Redirect the older named assembly too (PR: [#12239](https://github.com/dotnet/razor/pull/12239))
@@ -126,10 +126,10 @@
 
 # 2.91.x
 * Bump Roslyn to 5.0.0-2.25458.10 (PR: [#8588](https://github.com/dotnet/vscode-csharp/pull/8588))
-  * Move brace adjustment on enter to on auto insert in LSP(PR: [#80075](https://github.com/dotnet/roslyn/pull/80075))
-  * Avoid throwing when obsolete overload of GetUpdatesAsync is invoked with empty array(PR: [#80161](https://github.com/dotnet/roslyn/pull/80161))
-  * Bump patch version of MSBuild packages(PR: [#80156](https://github.com/dotnet/roslyn/pull/80156))
-  * Include category in Hot Reload log messages(PR: [#80160](https://github.com/dotnet/roslyn/pull/80160))
+  * Move brace adjustment on enter to on auto insert in LSP (PR: [#80075](https://github.com/dotnet/roslyn/pull/80075))
+  * Avoid throwing when obsolete overload of GetUpdatesAsync is invoked with empty array (PR: [#80161](https://github.com/dotnet/roslyn/pull/80161))
+  * Bump patch version of MSBuild packages (PR: [#80156](https://github.com/dotnet/roslyn/pull/80156))
+  * Include category in Hot Reload log messages (PR: [#80160](https://github.com/dotnet/roslyn/pull/80160))
   * Store client's version for open docs (PR: [#80064](https://github.com/dotnet/roslyn/pull/80064))
   * Pass global properties and the binary log path via RPC to BuildHost (PR: [#80094](https://github.com/dotnet/roslyn/pull/80094))
   * Don't switch runtime / design time solutions if cohosting is on (PR: [#80065](https://github.com/dotnet/roslyn/pull/80065))

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.