Skip to content

Commit 6518ff0

Browse files
authored
[automated] Merge branch 'prerelease' => 'release' (#7837)
2 parents 6ca2cfa + 5053fe6 commit 6518ff0

File tree

104 files changed

+1390
-518
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+1390
-518
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
id:
2+
name: GitOps.PullRequestIssueManagement
3+
description: GitOps.PullRequestIssueManagement primitive
4+
owner:
5+
resource: repository
6+
disabled: false
7+
where:
8+
configuration:
9+
resourceManagementConfiguration:
10+
11+
eventResponderTasks:
12+
13+
- description: Add "untriaged" label to issues when opened
14+
triggerOnOwnActions: false
15+
if:
16+
- payloadType: Issues
17+
- or:
18+
- isAction:
19+
action: Opened
20+
then:
21+
- addLabel:
22+
label: untriaged
23+
24+
onFailure:
25+
onSuccess:

.vscode/launch.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"internalConsoleOptions": "openOnSessionStart"
6767
},
6868
{
69-
"name": "Launch Current File BasicRazorApp2_1 Integration Tests",
69+
"name": "[Razor] Run Current File Integration Test",
7070
"type": "extensionHost",
7171
"request": "launch",
7272
"runtimeExecutable": "${execPath}",
@@ -76,7 +76,7 @@
7676
// The profile can be found under /test/csharp-test-profile.
7777
"--profile",
7878
"csharp-test-profile",
79-
"${workspaceRoot}/test/razor/razorIntegrationTests/testAssets/BasicRazorApp2_1/.vscode/lsp_tools_host_BasicRazorApp2_1.code-workspace",
79+
"${workspaceRoot}/test/razor/razorIntegrationTests/testAssets/RazorApp/.vscode/RazorApp.code-workspace",
8080
"--extensionDevelopmentPath=${workspaceRoot}",
8181
"--extensionTestsPath=${workspaceRoot}/out/test/razor/razorIntegrationTests",
8282
"--log",
@@ -89,7 +89,7 @@
8989
"sourceMaps": true,
9090
"outFiles": ["${workspaceRoot}/dist/*.js", "${workspaceRoot}/out/test/**/*.js"],
9191
"resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
92-
"preLaunchTask": "buildDev",
92+
"preLaunchTask": "buildTest",
9393
"internalConsoleOptions": "openOnSessionStart"
9494
},
9595
{
@@ -204,7 +204,7 @@
204204
"id": "omnisharpAssetName",
205205
"description": "The name of the asset folder to use for the OmniSharp integration test.",
206206
"type": "pickString",
207-
"options": ["singleCsproj", "BasicRazorApp2_1", "slnWithCsproj", "slnFilterWithCsproj", "slnWithGenerator"]
207+
"options": ["singleCsproj", "RazorApp", "slnWithCsproj", "slnFilterWithCsproj", "slnWithGenerator"]
208208
},
209209
{
210210
"id": "gulpTaskName",

.vscode/tasks.json

Lines changed: 49 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,50 @@
11
{
2-
"version": "2.0.0",
3-
"presentation": {
4-
"echo": true,
5-
"reveal": "always",
6-
"focus": false,
7-
"panel": "shared"
8-
},
9-
"tasks": [
10-
{
11-
"label": "build",
12-
"command": "npm",
13-
"type": "shell",
14-
"args": [
15-
"run",
16-
"compile"
17-
],
18-
"group": {
19-
"kind": "build",
20-
"isDefault": true
21-
}
22-
},
23-
{
24-
"label": "buildDev",
25-
"command": "npm",
26-
"type": "shell",
27-
"args": [
28-
"run",
29-
"compileDev"
30-
],
31-
"group": {
32-
"kind": "build",
33-
"isDefault": true
34-
}
35-
},
36-
{
37-
"label": "test",
38-
"command": "echo",
39-
"group": {
40-
"kind": "test",
41-
"isDefault": true
42-
},
43-
"args": [
44-
"Run tests in VS Code by launching the debugger with the 'Launch Tests' configuration."
45-
]
46-
},
47-
]
48-
}
2+
"version": "2.0.0",
3+
"presentation": {
4+
"echo": true,
5+
"reveal": "always",
6+
"focus": false,
7+
"panel": "shared"
8+
},
9+
"tasks": [
10+
{
11+
"label": "build",
12+
"command": "npm",
13+
"type": "shell",
14+
"args": ["run", "compile"],
15+
"group": {
16+
"kind": "build",
17+
"isDefault": true
18+
}
19+
},
20+
{
21+
"label": "buildDev",
22+
"command": "npm",
23+
"type": "shell",
24+
"args": ["run", "compileDev"],
25+
"group": {
26+
"kind": "build",
27+
"isDefault": true
28+
}
29+
},
30+
{
31+
"label": "buildTest",
32+
"command": "npm",
33+
"type": "shell",
34+
"args": ["run", "compileTest"],
35+
"group": {
36+
"kind": "build",
37+
"isDefault": true
38+
}
39+
},
40+
{
41+
"label": "test",
42+
"command": "echo",
43+
"group": {
44+
"kind": "test",
45+
"isDefault": true
46+
},
47+
"args": ["Run tests in VS Code by launching the debugger with the 'Launch Tests' configuration."]
48+
}
49+
]
50+
}

CHANGELOG.md

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,65 @@
22

33
- Diagnostics related feature requests and improvements [#5951](https://github.com/dotnet/vscode-csharp/issues/5951)
44
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
5+
* Bump xamltools to 17.13.35521.31 (PR: [#7814](https://github.com/dotnet/vscode-csharp/pull/7814))
6+
7+
# 2.58.x
8+
* Update Razor to 9.0.0-preview.24569.4 (PR: [#7805](https://github.com/dotnet/vscode-csharp/pull/7805))
9+
* Allow logging level to be changed in rzls (#11228) (PR: [#11228](https://github.com/dotnet/razor/pull/11228))
10+
* [Fuse] bind-Value:attribute support (#11214) (PR: [#11214](https://github.com/dotnet/razor/pull/11214))
11+
* Handle skipped trivia in the C# tokenizer (#11207) (PR: [#11207](https://github.com/dotnet/razor/pull/11207))
12+
* Add support for refreshing opened source generated files (PR: [#7791](https://github.com/dotnet/vscode-csharp/pull/7791))
13+
* Update Roslyn to 4.13.0-2.24569.1 (PR: [#7791](https://github.com/dotnet/vscode-csharp/pull/7791))
14+
* Support unbound generic types in 'nameof' operator. (PR: [#75368](https://github.com/dotnet/roslyn/pull/75368))
15+
* Include list of processes that lock file in `can't write file` error message (PR: [#75946](https://github.com/dotnet/roslyn/pull/75946))
16+
* Add server side support for refreshing source generated files (PR: [#75939](https://github.com/dotnet/roslyn/pull/75939))
17+
18+
# 2.57.x
19+
* Update Razor to 9.0.0-preview.24565.1 (PR: [#7793])(https://github.com/dotnet/vscode-csharp/pull/7793)
20+
* Fine tuning of what types of project update affect what state (#11213) (PR: [#11213](https://github.com/dotnet/razor/pull/11213))
21+
* Fix request duration logging (#11198) (PR: [#11198](https://github.com/dotnet/razor/pull/11198))
22+
* Update ProjectWorkspaceState and HostProject at the same time (#11191) (PR: [#11191](https://github.com/dotnet/razor/pull/11191))
23+
* Update Roslyn to 4.13.0-2.24565.3 (PR: [#7792](https://github.com/dotnet/vscode-csharp/pull/7792))
24+
* Add support for go to type definition (PR: [#75819](https://github.com/dotnet/roslyn/pull/75819))
25+
* Reduce formatting allocations when scrolling (PR: [#75912](https://github.com/dotnet/roslyn/pull/75912))
26+
* Improve go-to-impl with error conditions (PR: [#75913](https://github.com/dotnet/roslyn/pull/75913))
27+
* Update 'use simple using statement' to support global statements (PR: [#75921](https://github.com/dotnet/roslyn/pull/75921))
28+
* 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))
29+
* Recover better when a user uses commas in a for-statement instead of semicolons (PR: [#75632](https://github.com/dotnet/roslyn/pull/75632))
30+
* Do not run 'remove unnecessary imports' on generated code (PR: [#74762](https://github.com/dotnet/roslyn/pull/74762))
31+
* improve goto-def on an invalid override (PR: [#75901](https://github.com/dotnet/roslyn/pull/75901))
32+
* Fix formatting of simplify-linq-expression (PR: [#75860](https://github.com/dotnet/roslyn/pull/75860))
33+
* Add new line before 'where' constraints in Quick Info (PR: [#60545](https://github.com/dotnet/roslyn/pull/60545))
34+
* Increase default server start timeout to 2minutes (PR: [#7788](https://github.com/dotnet/vscode-csharp/pull/7788))
35+
* Update Razor to 9.0.0-preview.24561.3 (PR: [#7748](https://github.com/dotnet/vscode-csharp/pull/7748))
36+
* Add feature flag to turn on the new Roslyn tokenizer (PR: [#11185](https://github.com/dotnet/razor/pull/11185))
37+
* Fix Razor preview panel button colors to have more visible contrast ratio (PR: [#7766](https://github.com/dotnet/vscode-csharp/pull/7766))
38+
* Bump xamltools to 17.13.35513.19 (PR: [#7777](https://github.com/dotnet/vscode-csharp/pull/7777))
39+
40+
# 2.56.x
41+
* Update Roslyn to 4.13.0-2.24561.3 (PR: [#7765](https://github.com/dotnet/vscode-csharp/pull/7765))
42+
* Update Razor to fix serialization issue loading projects (PR: [#75794](https://github.com/dotnet/roslyn/pull/75794))
43+
* Update Razor to 9.0.0-preview.24557.11 (PR: [#7756](https://github.com/dotnet/vscode-csharp/pull/7756))
44+
* Fix FUSE hook up in VS Code (#11175) (PR: [#11175](https://github.com/dotnet/razor/pull/11175))
45+
* Update VSTelemetryAPI version (#11181) (PR: [#11181](https://github.com/dotnet/razor/pull/11181))
46+
* Improvements for Assumed.Unreachable(...) (#11155) (PR: [#11155](https://github.com/dotnet/razor/pull/11155))
47+
* Better logging for named pipe (#11144) (PR: [#11144](https://github.com/dotnet/razor/pull/11144))
48+
* Fix code actions (and code actions integration tests) (#11141) (PR: [#11141](https://github.com/dotnet/razor/pull/11141))
49+
* Fix some things for extract component (#11137) (PR: [#11137](https://github.com/dotnet/razor/pull/11137))
50+
* More CodeAction moves in preparation for cohosting (#11135) (PR: [#11135](https://github.com/dotnet/razor/pull/11135))
51+
* Update Roslyn to 4.13.0-2.24557.5 (PR: [#7752](https://github.com/dotnet/vscode-csharp/pull/7752))
52+
* Fix telemetry property value (PR: [#75813](https://github.com/dotnet/roslyn/pull/75813))
53+
* Classify 'await' as a control keyword (PR: [#75782](https://github.com/dotnet/roslyn/pull/75782))
54+
* Allow renaming with overload resolution when only one overload exists(PR: [#75752](https://github.com/dotnet/roslyn/pull/75752))
55+
* Fix issue loading completion providers from `<Analyyzer>` project items (PR: [#75721](https://github.com/dotnet/roslyn/pull/75721))
56+
* Expose code actions to Razor cohosting (PR: [#75711](https://github.com/dotnet/roslyn/pull/75711))
57+
* Do not include source generated documents in related document results (PR: [#75718](https://github.com/dotnet/roslyn/pull/75718))
58+
* 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))
59+
* Reduce allocations in ProjectSystemProjectFactory.ConvertMetadataReferencesToProjectReferences_NoLock (PR: [#75646](https://github.com/dotnet/roslyn/pull/75646))
60+
* Reduce memory and CPU costs due to SegmentedList usage (PR: [#75661](https://github.com/dotnet/roslyn/pull/75661))
61+
* Bump xamltools to 17.13.35506.24 (PR: [#7740](https://github.com/dotnet/vscode-csharp/pull/7740))
62+
* Bump xamltools to 17.13.35507.225 (PR: [#7755](https://github.com/dotnet/vscode-csharp/pull/7755))
63+
* XAML IntelliseSense completions for Image.Source
564

665
# 2.55.x
766
* Update Razor to 9.0.0-preview.24557.10 (PR: [#7757](https://github.com/dotnet/vscode-csharp/pull/7757))

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ To debug integration tests
5959
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).
6060
2. Open any integration test file and <kbd>F5</kbd> launch with the correct launch configuration selected.
6161
- 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)
62-
- For integration tests inside `test/razor`, use `Launch Current File BasicRazorApp2_1 Integration Tests`
62+
- For integration tests inside `test/razor`, use `[Razor] Run Current File Integration Test`
6363
- For integration tests inside `test/omnisharp`, use one of the `Omnisharp:` current file profiles
6464

6565
These will allow you to actually debug the test, but the 'Razor integration tests' configuration does not.

azure-pipelines-official.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ parameters:
2727
- auto
2828
default: auto
2929

30+
variables:
31+
defaultDotnetVersion: '8.0.403'
32+
3033
resources:
3134
repositories:
3235
- repository: 1ESPipelineTemplates
@@ -63,3 +66,4 @@ extends:
6366
isOfficial: true
6467
channel: ${{ parameters.channel }}
6568
signType: ${{ parameters.signType }}
69+
dotnetVersion: $(defaultDotnetVersion)

azure-pipelines.yml

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,33 @@ pr:
1616
- main
1717
paths:
1818
exclude:
19-
- ./*.md
19+
- ./*.md
20+
- .github/*
21+
22+
# Run a scheduled build every night on main to run tests against insiders VSCode.
23+
# The variable testVSCodeVersion is set to insiders based on the build reason.
24+
schedules:
25+
- cron: "0 0 * * *"
26+
displayName: Daily Insiders Build
27+
branches:
28+
include:
29+
- main
30+
31+
variables:
32+
- name: defaultDotnetVersion
33+
value: '8.0.403'
34+
- name: testVSCodeVersion
35+
${{ if eq( variables['Build.Reason'], 'Schedule' ) }}:
36+
value: insiders
37+
${{ else }}:
38+
value: stable
2039

2140
stages:
2241
- template: azure-pipelines/build-all.yml
2342
parameters:
2443
isOfficial: false
2544
signType: test
45+
dotnetVersion: $(defaultDotnetVersion)
2646

2747
- stage:
2848
displayName: Test Linux (.NET 6)
@@ -31,7 +51,8 @@ stages:
3151
- template: azure-pipelines/test-matrix.yml
3252
parameters:
3353
# Prefer the dotnet from the container.
34-
installDotNet: false
54+
dotnetVersion: ''
55+
testVSCodeVersion: $(testVSCodeVersion)
3556
installAdditionalLinuxDependencies: true
3657
pool:
3758
name: NetCore-Public
@@ -45,7 +66,8 @@ stages:
4566
- template: azure-pipelines/test-matrix.yml
4667
parameters:
4768
# Prefer the dotnet from the container.
48-
installDotNet: false
69+
dotnetVersion: ''
70+
testVSCodeVersion: $(testVSCodeVersion)
4971
installAdditionalLinuxDependencies: true
5072
pool:
5173
name: NetCore-Public
@@ -58,7 +80,8 @@ stages:
5880
jobs:
5981
- template: azure-pipelines/test-matrix.yml
6082
parameters:
61-
installDotNet: true
83+
dotnetVersion: $(defaultDotnetVersion)
84+
testVSCodeVersion: $(testVSCodeVersion)
6285
pool:
6386
name: NetCore-Public
6487
demands: ImageOverride -equals 1es-windows-2022-open
@@ -69,7 +92,8 @@ stages:
6992
jobs:
7093
- template: azure-pipelines/test-matrix.yml
7194
parameters:
72-
installDotNet: true
95+
dotnetVersion: $(defaultDotnetVersion)
96+
testVSCodeVersion: $(testVSCodeVersion)
7397
pool:
7498
name: Azure Pipelines
7599
vmImage: macOS-13
@@ -90,3 +114,6 @@ stages:
90114
demands: ImageOverride -equals $(demandsName)
91115
steps:
92116
- template: azure-pipelines/test-omnisharp.yml
117+
parameters:
118+
dotnetVersion: $(defaultDotnetVersion)
119+
testVSCodeVersion: $(testVSCodeVersion)

azure-pipelines/build-all.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ parameters:
44
default: 'default'
55
- name: isOfficial
66
type: boolean
7+
- name: dotnetVersion
8+
type: string
79
- name: channel
810
values:
911
- release
@@ -96,6 +98,7 @@ stages:
9698
versionNumberOverride: ${{ parameters.versionNumberOverride }}
9799
platform: linux
98100
isOfficial: ${{ parameters.isOfficial }}
101+
dotnetVersion: ${{ parameters.dotnetVersion }}
99102
pool:
100103
${{ if eq(parameters.isOfficial, true) }}:
101104
name: netcore1espool-internal
@@ -109,6 +112,7 @@ stages:
109112
versionNumberOverride: ${{ parameters.versionNumberOverride }}
110113
platform: windows
111114
isOfficial: ${{ parameters.isOfficial }}
115+
dotnetVersion: ${{ parameters.dotnetVersion }}
112116
pool:
113117
${{ if eq(parameters.isOfficial, true) }}:
114118
name: netcore1espool-internal
@@ -122,6 +126,7 @@ stages:
122126
versionNumberOverride: ${{ parameters.versionNumberOverride }}
123127
platform: darwin
124128
isOfficial: ${{ parameters.isOfficial }}
129+
dotnetVersion: ${{ parameters.dotnetVersion }}
125130
pool:
126131
name: Azure Pipelines
127132
${{ if eq(parameters.isOfficial, true) }}:

azure-pipelines/build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ parameters:
88
type: object
99
- name: isOfficial
1010
type: boolean
11+
- name: dotnetVersion
12+
type: string
1113

1214
jobs:
1315
- job: 'Build_${{ parameters.platform }}_vsixs'
@@ -27,6 +29,7 @@ jobs:
2729
- template: /azure-pipelines/prereqs.yml@self
2830
parameters:
2931
versionNumberOverride: ${{ parameters.versionNumberOverride }}
32+
dotnetVersion: ${{ parameters.dotnetVersion}}
3033

3134
- task: UsePythonVersion@0
3235
displayName: 'Use Python 3.11'

0 commit comments

Comments
 (0)