Skip to content

Commit

Permalink
[automated] Merge branch 'prerelease' => 'release' (#7837)
Browse files Browse the repository at this point in the history
  • Loading branch information
dibarbet authored Dec 2, 2024
2 parents 6ca2cfa + 5053fe6 commit 6518ff0
Show file tree
Hide file tree
Showing 104 changed files with 1,390 additions and 518 deletions.
25 changes: 25 additions & 0 deletions .github/policies/resourceManagement.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
id:
name: GitOps.PullRequestIssueManagement
description: GitOps.PullRequestIssueManagement primitive
owner:
resource: repository
disabled: false
where:
configuration:
resourceManagementConfiguration:

eventResponderTasks:

- description: Add "untriaged" label to issues when opened
triggerOnOwnActions: false
if:
- payloadType: Issues
- or:
- isAction:
action: Opened
then:
- addLabel:
label: untriaged

onFailure:
onSuccess:
8 changes: 4 additions & 4 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"internalConsoleOptions": "openOnSessionStart"
},
{
"name": "Launch Current File BasicRazorApp2_1 Integration Tests",
"name": "[Razor] Run Current File Integration Test",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
Expand All @@ -76,7 +76,7 @@
// The profile can be found under /test/csharp-test-profile.
"--profile",
"csharp-test-profile",
"${workspaceRoot}/test/razor/razorIntegrationTests/testAssets/BasicRazorApp2_1/.vscode/lsp_tools_host_BasicRazorApp2_1.code-workspace",
"${workspaceRoot}/test/razor/razorIntegrationTests/testAssets/RazorApp/.vscode/RazorApp.code-workspace",
"--extensionDevelopmentPath=${workspaceRoot}",
"--extensionTestsPath=${workspaceRoot}/out/test/razor/razorIntegrationTests",
"--log",
Expand All @@ -89,7 +89,7 @@
"sourceMaps": true,
"outFiles": ["${workspaceRoot}/dist/*.js", "${workspaceRoot}/out/test/**/*.js"],
"resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
"preLaunchTask": "buildDev",
"preLaunchTask": "buildTest",
"internalConsoleOptions": "openOnSessionStart"
},
{
Expand Down Expand Up @@ -204,7 +204,7 @@
"id": "omnisharpAssetName",
"description": "The name of the asset folder to use for the OmniSharp integration test.",
"type": "pickString",
"options": ["singleCsproj", "BasicRazorApp2_1", "slnWithCsproj", "slnFilterWithCsproj", "slnWithGenerator"]
"options": ["singleCsproj", "RazorApp", "slnWithCsproj", "slnFilterWithCsproj", "slnWithGenerator"]
},
{
"id": "gulpTaskName",
Expand Down
96 changes: 49 additions & 47 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,48 +1,50 @@
{
"version": "2.0.0",
"presentation": {
"echo": true,
"reveal": "always",
"focus": false,
"panel": "shared"
},
"tasks": [
{
"label": "build",
"command": "npm",
"type": "shell",
"args": [
"run",
"compile"
],
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "buildDev",
"command": "npm",
"type": "shell",
"args": [
"run",
"compileDev"
],
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "test",
"command": "echo",
"group": {
"kind": "test",
"isDefault": true
},
"args": [
"Run tests in VS Code by launching the debugger with the 'Launch Tests' configuration."
]
},
]
}
"version": "2.0.0",
"presentation": {
"echo": true,
"reveal": "always",
"focus": false,
"panel": "shared"
},
"tasks": [
{
"label": "build",
"command": "npm",
"type": "shell",
"args": ["run", "compile"],
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "buildDev",
"command": "npm",
"type": "shell",
"args": ["run", "compileDev"],
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "buildTest",
"command": "npm",
"type": "shell",
"args": ["run", "compileTest"],
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "test",
"command": "echo",
"group": {
"kind": "test",
"isDefault": true
},
"args": ["Run tests in VS Code by launching the debugger with the 'Launch Tests' configuration."]
}
]
}
59 changes: 59 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,65 @@

- 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)
* Bump xamltools to 17.13.35521.31 (PR: [#7814](https://github.com/dotnet/vscode-csharp/pull/7814))

# 2.58.x
* Update Razor to 9.0.0-preview.24569.4 (PR: [#7805](https://github.com/dotnet/vscode-csharp/pull/7805))
* Allow logging level to be changed in rzls (#11228) (PR: [#11228](https://github.com/dotnet/razor/pull/11228))
* [Fuse] bind-Value:attribute support (#11214) (PR: [#11214](https://github.com/dotnet/razor/pull/11214))
* Handle skipped trivia in the C# tokenizer (#11207) (PR: [#11207](https://github.com/dotnet/razor/pull/11207))
* Add support for refreshing opened source generated files (PR: [#7791](https://github.com/dotnet/vscode-csharp/pull/7791))
* Update Roslyn to 4.13.0-2.24569.1 (PR: [#7791](https://github.com/dotnet/vscode-csharp/pull/7791))
* Support unbound generic types in 'nameof' operator. (PR: [#75368](https://github.com/dotnet/roslyn/pull/75368))
* Include list of processes that lock file in `can't write file` error message (PR: [#75946](https://github.com/dotnet/roslyn/pull/75946))
* Add server side support for refreshing source generated files (PR: [#75939](https://github.com/dotnet/roslyn/pull/75939))

# 2.57.x
* Update Razor to 9.0.0-preview.24565.1 (PR: [#7793])(https://github.com/dotnet/vscode-csharp/pull/7793)
* Fine tuning of what types of project update affect what state (#11213) (PR: [#11213](https://github.com/dotnet/razor/pull/11213))
* Fix request duration logging (#11198) (PR: [#11198](https://github.com/dotnet/razor/pull/11198))
* Update ProjectWorkspaceState and HostProject at the same time (#11191) (PR: [#11191](https://github.com/dotnet/razor/pull/11191))
* Update Roslyn to 4.13.0-2.24565.3 (PR: [#7792](https://github.com/dotnet/vscode-csharp/pull/7792))
* Add support for go to type definition (PR: [#75819](https://github.com/dotnet/roslyn/pull/75819))
* Reduce formatting allocations when scrolling (PR: [#75912](https://github.com/dotnet/roslyn/pull/75912))
* Improve go-to-impl with error conditions (PR: [#75913](https://github.com/dotnet/roslyn/pull/75913))
* Update 'use simple using statement' to support global statements (PR: [#75921](https://github.com/dotnet/roslyn/pull/75921))
* Fix case where we were erroneously offering to convert a dictionary to use a collection expression. (PR: [#75897](https://github.com/dotnet/roslyn/pull/75897))
* Recover better when a user uses commas in a for-statement instead of semicolons (PR: [#75632](https://github.com/dotnet/roslyn/pull/75632))
* Do not run 'remove unnecessary imports' on generated code (PR: [#74762](https://github.com/dotnet/roslyn/pull/74762))
* improve goto-def on an invalid override (PR: [#75901](https://github.com/dotnet/roslyn/pull/75901))
* Fix formatting of simplify-linq-expression (PR: [#75860](https://github.com/dotnet/roslyn/pull/75860))
* Add new line before 'where' constraints in Quick Info (PR: [#60545](https://github.com/dotnet/roslyn/pull/60545))
* Increase default server start timeout to 2minutes (PR: [#7788](https://github.com/dotnet/vscode-csharp/pull/7788))
* Update Razor to 9.0.0-preview.24561.3 (PR: [#7748](https://github.com/dotnet/vscode-csharp/pull/7748))
* Add feature flag to turn on the new Roslyn tokenizer (PR: [#11185](https://github.com/dotnet/razor/pull/11185))
* Fix Razor preview panel button colors to have more visible contrast ratio (PR: [#7766](https://github.com/dotnet/vscode-csharp/pull/7766))
* Bump xamltools to 17.13.35513.19 (PR: [#7777](https://github.com/dotnet/vscode-csharp/pull/7777))

# 2.56.x
* Update Roslyn to 4.13.0-2.24561.3 (PR: [#7765](https://github.com/dotnet/vscode-csharp/pull/7765))
* Update Razor to fix serialization issue loading projects (PR: [#75794](https://github.com/dotnet/roslyn/pull/75794))
* Update Razor to 9.0.0-preview.24557.11 (PR: [#7756](https://github.com/dotnet/vscode-csharp/pull/7756))
* Fix FUSE hook up in VS Code (#11175) (PR: [#11175](https://github.com/dotnet/razor/pull/11175))
* Update VSTelemetryAPI version (#11181) (PR: [#11181](https://github.com/dotnet/razor/pull/11181))
* Improvements for Assumed.Unreachable(...) (#11155) (PR: [#11155](https://github.com/dotnet/razor/pull/11155))
* Better logging for named pipe (#11144) (PR: [#11144](https://github.com/dotnet/razor/pull/11144))
* Fix code actions (and code actions integration tests) (#11141) (PR: [#11141](https://github.com/dotnet/razor/pull/11141))
* Fix some things for extract component (#11137) (PR: [#11137](https://github.com/dotnet/razor/pull/11137))
* More CodeAction moves in preparation for cohosting (#11135) (PR: [#11135](https://github.com/dotnet/razor/pull/11135))
* Update Roslyn to 4.13.0-2.24557.5 (PR: [#7752](https://github.com/dotnet/vscode-csharp/pull/7752))
* Fix telemetry property value (PR: [#75813](https://github.com/dotnet/roslyn/pull/75813))
* Classify 'await' as a control keyword (PR: [#75782](https://github.com/dotnet/roslyn/pull/75782))
* Allow renaming with overload resolution when only one overload exists(PR: [#75752](https://github.com/dotnet/roslyn/pull/75752))
* Fix issue loading completion providers from `<Analyyzer>` project items (PR: [#75721](https://github.com/dotnet/roslyn/pull/75721))
* Expose code actions to Razor cohosting (PR: [#75711](https://github.com/dotnet/roslyn/pull/75711))
* Do not include source generated documents in related document results (PR: [#75718](https://github.com/dotnet/roslyn/pull/75718))
* Fix issue where inlay hints could not be resolved if multiple editors opened side by side (PR: [#75709](https://github.com/dotnet/roslyn/pull/75709))
* Reduce allocations in ProjectSystemProjectFactory.ConvertMetadataReferencesToProjectReferences_NoLock (PR: [#75646](https://github.com/dotnet/roslyn/pull/75646))
* Reduce memory and CPU costs due to SegmentedList usage (PR: [#75661](https://github.com/dotnet/roslyn/pull/75661))
* Bump xamltools to 17.13.35506.24 (PR: [#7740](https://github.com/dotnet/vscode-csharp/pull/7740))
* Bump xamltools to 17.13.35507.225 (PR: [#7755](https://github.com/dotnet/vscode-csharp/pull/7755))
* XAML IntelliseSense completions for Image.Source

# 2.55.x
* Update Razor to 9.0.0-preview.24557.10 (PR: [#7757](https://github.com/dotnet/vscode-csharp/pull/7757))
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ 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/razor`, use `Launch Current File BasicRazorApp2_1 Integration Tests`
- 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

These will allow you to actually debug the test, but the 'Razor integration tests' configuration does not.
Expand Down
4 changes: 4 additions & 0 deletions azure-pipelines-official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ parameters:
- auto
default: auto

variables:
defaultDotnetVersion: '8.0.403'

resources:
repositories:
- repository: 1ESPipelineTemplates
Expand Down Expand Up @@ -63,3 +66,4 @@ extends:
isOfficial: true
channel: ${{ parameters.channel }}
signType: ${{ parameters.signType }}
dotnetVersion: $(defaultDotnetVersion)
37 changes: 32 additions & 5 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,33 @@ pr:
- main
paths:
exclude:
- ./*.md
- ./*.md
- .github/*

# Run a scheduled build every night on main to run tests against insiders VSCode.
# The variable testVSCodeVersion is set to insiders based on the build reason.
schedules:
- cron: "0 0 * * *"
displayName: Daily Insiders Build
branches:
include:
- main

variables:
- name: defaultDotnetVersion
value: '8.0.403'
- name: testVSCodeVersion
${{ if eq( variables['Build.Reason'], 'Schedule' ) }}:
value: insiders
${{ else }}:
value: stable

stages:
- template: azure-pipelines/build-all.yml
parameters:
isOfficial: false
signType: test
dotnetVersion: $(defaultDotnetVersion)

- stage:
displayName: Test Linux (.NET 6)
Expand All @@ -31,7 +51,8 @@ stages:
- template: azure-pipelines/test-matrix.yml
parameters:
# Prefer the dotnet from the container.
installDotNet: false
dotnetVersion: ''
testVSCodeVersion: $(testVSCodeVersion)
installAdditionalLinuxDependencies: true
pool:
name: NetCore-Public
Expand All @@ -45,7 +66,8 @@ stages:
- template: azure-pipelines/test-matrix.yml
parameters:
# Prefer the dotnet from the container.
installDotNet: false
dotnetVersion: ''
testVSCodeVersion: $(testVSCodeVersion)
installAdditionalLinuxDependencies: true
pool:
name: NetCore-Public
Expand All @@ -58,7 +80,8 @@ stages:
jobs:
- template: azure-pipelines/test-matrix.yml
parameters:
installDotNet: true
dotnetVersion: $(defaultDotnetVersion)
testVSCodeVersion: $(testVSCodeVersion)
pool:
name: NetCore-Public
demands: ImageOverride -equals 1es-windows-2022-open
Expand All @@ -69,7 +92,8 @@ stages:
jobs:
- template: azure-pipelines/test-matrix.yml
parameters:
installDotNet: true
dotnetVersion: $(defaultDotnetVersion)
testVSCodeVersion: $(testVSCodeVersion)
pool:
name: Azure Pipelines
vmImage: macOS-13
Expand All @@ -90,3 +114,6 @@ stages:
demands: ImageOverride -equals $(demandsName)
steps:
- template: azure-pipelines/test-omnisharp.yml
parameters:
dotnetVersion: $(defaultDotnetVersion)
testVSCodeVersion: $(testVSCodeVersion)
5 changes: 5 additions & 0 deletions azure-pipelines/build-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ parameters:
default: 'default'
- name: isOfficial
type: boolean
- name: dotnetVersion
type: string
- name: channel
values:
- release
Expand Down Expand Up @@ -96,6 +98,7 @@ stages:
versionNumberOverride: ${{ parameters.versionNumberOverride }}
platform: linux
isOfficial: ${{ parameters.isOfficial }}
dotnetVersion: ${{ parameters.dotnetVersion }}
pool:
${{ if eq(parameters.isOfficial, true) }}:
name: netcore1espool-internal
Expand All @@ -109,6 +112,7 @@ stages:
versionNumberOverride: ${{ parameters.versionNumberOverride }}
platform: windows
isOfficial: ${{ parameters.isOfficial }}
dotnetVersion: ${{ parameters.dotnetVersion }}
pool:
${{ if eq(parameters.isOfficial, true) }}:
name: netcore1espool-internal
Expand All @@ -122,6 +126,7 @@ stages:
versionNumberOverride: ${{ parameters.versionNumberOverride }}
platform: darwin
isOfficial: ${{ parameters.isOfficial }}
dotnetVersion: ${{ parameters.dotnetVersion }}
pool:
name: Azure Pipelines
${{ if eq(parameters.isOfficial, true) }}:
Expand Down
3 changes: 3 additions & 0 deletions azure-pipelines/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ parameters:
type: object
- name: isOfficial
type: boolean
- name: dotnetVersion
type: string

jobs:
- job: 'Build_${{ parameters.platform }}_vsixs'
Expand All @@ -27,6 +29,7 @@ jobs:
- template: /azure-pipelines/prereqs.yml@self
parameters:
versionNumberOverride: ${{ parameters.versionNumberOverride }}
dotnetVersion: ${{ parameters.dotnetVersion}}

- task: UsePythonVersion@0
displayName: 'Use Python 3.11'
Expand Down
Loading

0 comments on commit 6518ff0

Please sign in to comment.