Skip to content

Commit f023efc

Browse files
JoeRobichJoeRobich
authored
[automated] Merge branch 'main' => 'prerelease' (#7942)
2 parents 9ec70f0 + 6980e37 commit f023efc

37 files changed

+505
-162
lines changed

‎.config/1espt/PipelineAutobaseliningConfig.yml

+50-50
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
11
## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.
22

3-
pipelines:
4-
1275:
5-
retail:
6-
source:
7-
credscan:
8-
lastModifiedDate: 2024-03-18
9-
eslint:
10-
lastModifiedDate: 2024-03-18
11-
armory:
12-
lastModifiedDate: 2024-03-18
13-
psscriptanalyzer:
14-
lastModifiedDate: 2024-04-19
15-
binary:
16-
credscan:
17-
lastModifiedDate: 2024-03-18
18-
binskim:
19-
lastModifiedDate: 2024-03-18
20-
spotbugs:
21-
lastModifiedDate: 2024-04-19
22-
1264:
23-
retail:
24-
source:
25-
credscan:
26-
lastModifiedDate: 2024-03-19
27-
eslint:
28-
lastModifiedDate: 2024-03-19
29-
psscriptanalyzer:
30-
lastModifiedDate: 2024-03-19
31-
armory:
32-
lastModifiedDate: 2024-03-19
33-
policheck:
34-
lastModifiedDate: 2024-06-27
35-
binary:
36-
credscan:
37-
lastModifiedDate: 2024-03-19
38-
binskim:
39-
lastModifiedDate: 2024-03-19
40-
spotbugs:
41-
lastModifiedDate: 2024-03-19
42-
1271:
43-
retail:
44-
source:
45-
credscan:
46-
lastModifiedDate: 2024-03-27
47-
eslint:
48-
lastModifiedDate: 2024-03-27
49-
psscriptanalyzer:
50-
lastModifiedDate: 2024-03-27
51-
armory:
52-
lastModifiedDate: 2024-03-27
3+
pipelines:
4+
1275:
5+
retail:
6+
source:
7+
credscan:
8+
lastModifiedDate: 2024-03-18
9+
eslint:
10+
lastModifiedDate: 2024-03-18
11+
armory:
12+
lastModifiedDate: 2024-03-18
13+
psscriptanalyzer:
14+
lastModifiedDate: 2024-04-19
15+
binary:
16+
credscan:
17+
lastModifiedDate: 2024-03-18
18+
binskim:
19+
lastModifiedDate: 2025-01-10
20+
spotbugs:
21+
lastModifiedDate: 2024-04-19
22+
1264:
23+
retail:
24+
source:
25+
credscan:
26+
lastModifiedDate: 2024-03-19
27+
eslint:
28+
lastModifiedDate: 2024-03-19
29+
psscriptanalyzer:
30+
lastModifiedDate: 2024-03-19
31+
armory:
32+
lastModifiedDate: 2024-03-19
33+
policheck:
34+
lastModifiedDate: 2024-06-27
35+
binary:
36+
credscan:
37+
lastModifiedDate: 2024-03-19
38+
binskim:
39+
lastModifiedDate: 2025-01-10
40+
spotbugs:
41+
lastModifiedDate: 2024-03-19
42+
1271:
43+
retail:
44+
source:
45+
credscan:
46+
lastModifiedDate: 2024-03-27
47+
eslint:
48+
lastModifiedDate: 2024-03-27
49+
psscriptanalyzer:
50+
lastModifiedDate: 2024-03-27
51+
armory:
52+
lastModifiedDate: 2024-03-27

‎.config/guardian/.gdnbaselines

+23-25
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
1-
{
2-
"hydrated": false,
3-
"properties": {
4-
"helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines",
5-
"hydrationStatus": "This file does not contain identifying data. It is safe to check into your repo. To hydrate this file with identifying data, run `guardian hydrate --help` and follow the guidance."
6-
},
7-
"version": "1.0.0",
8-
"baselines": {
9-
"default": {
10-
"name": "default",
11-
"createdDate": "2024-09-09 19:35:36Z",
12-
"lastUpdatedDate": "2024-09-09 19:35:36Z"
13-
}
14-
},
15-
"results": {
16-
"26445e3e484940d2d58c2ffc32ab3895fca4b1589d66e2f2dee2fa01f2c479fb": {
17-
"signature": "26445e3e484940d2d58c2ffc32ab3895fca4b1589d66e2f2dee2fa01f2c479fb",
18-
"alternativeSignatures": [],
19-
"memberOf": [
20-
"default"
21-
],
22-
"createdDate": "2024-09-09 19:35:36Z"
23-
}
24-
}
25-
}
1+
{
2+
"properties": {
3+
"helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines"
4+
},
5+
"version": "1.0.0",
6+
"baselines": {
7+
"default": {
8+
"name": "default",
9+
"createdDate": "2024-09-09 19:35:36Z",
10+
"lastUpdatedDate": "2024-09-09 19:35:36Z"
11+
}
12+
},
13+
"results": {
14+
"26445e3e484940d2d58c2ffc32ab3895fca4b1589d66e2f2dee2fa01f2c479fb": {
15+
"signature": "26445e3e484940d2d58c2ffc32ab3895fca4b1589d66e2f2dee2fa01f2c479fb",
16+
"alternativeSignatures": [],
17+
"memberOf": [
18+
"default"
19+
],
20+
"createdDate": "2024-09-09 19:35:36Z"
21+
}
22+
}
23+
}

‎.vscode/launch.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"preLaunchTask": "buildDev"
1313
},
1414
{
15-
"name": "Launch Current File slnWithCsproj Integration Tests",
15+
"name": "[Roslyn] Run Current File Integration Tests",
1616
"type": "extensionHost",
1717
"request": "launch",
1818
"runtimeExecutable": "${execPath}",
@@ -39,7 +39,7 @@
3939
"internalConsoleOptions": "openOnSessionStart"
4040
},
4141
{
42-
"name": "[DevKit] Launch Current File slnWithCsproj Integration Tests",
42+
"name": "[DevKit] Run Current File Integration Tests",
4343
"type": "extensionHost",
4444
"request": "launch",
4545
"runtimeExecutable": "${execPath}",
@@ -93,7 +93,7 @@
9393
"internalConsoleOptions": "openOnSessionStart"
9494
},
9595
{
96-
"name": "Omnisharp: Launch Current File Integration Tests",
96+
"name": "[O#] Run Current File Integration Tests",
9797
"type": "extensionHost",
9898
"request": "launch",
9999
"runtimeExecutable": "${execPath}",
@@ -115,10 +115,10 @@
115115
"sourceMaps": true,
116116
"outFiles": ["${workspaceRoot}/dist/*.js", "${workspaceRoot}/out/test/**/*.js"],
117117
"resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
118-
"preLaunchTask": "buildDev"
118+
"preLaunchTask": "buildTest"
119119
},
120120
{
121-
"name": "Omnisharp: Launch Current File Integration Tests [LSP]",
121+
"name": "[O# LSP] Run Current File Integration Tests",
122122
"type": "extensionHost",
123123
"request": "launch",
124124
"runtimeExecutable": "${execPath}",
@@ -140,7 +140,7 @@
140140
"sourceMaps": true,
141141
"outFiles": ["${workspaceRoot}/dist/*.js", "${workspaceRoot}/out/test/**/*.js"],
142142
"resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
143-
"preLaunchTask": "buildDev"
143+
"preLaunchTask": "buildTest"
144144
},
145145
{
146146
"type": "node",

‎CHANGELOG.md

+60
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,66 @@
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)
55

6+
# 2.63.x
7+
* Bump xamlTools to 17.14.35723.260 (PR: [#7932](https://github.com/dotnet/vscode-csharp/pull/7941))
8+
* Update Roslyn to 4.14.0-1.25074.7 (PR: [#7942](https://github.com/dotnet/vscode-csharp/pull/7942))
9+
* Enable extract refactorings in LSP (PR: [#76718](https://github.com/dotnet/roslyn/pull/76718))
10+
* Speed up 'fix all' for 'use auto prop' by running in parallel (PR: [#76905](https://github.com/dotnet/roslyn/pull/76905))
11+
* Add support for converting an auto-prop to a field-backed property. (PR: [#76900](https://github.com/dotnet/roslyn/pull/76900))
12+
* Fix throw in generator comparer (PR: [#76769](https://github.com/dotnet/roslyn/pull/76769))
13+
* Do not offer the containing type when offering completion in teh base-list (PR: [#76891](https://github.com/dotnet/roslyn/pull/76891))
14+
* Improve handling bad metadata in EE (PR: [#76878](https://github.com/dotnet/roslyn/pull/76878))
15+
* Record completion of "Simple lambda parameters with modifiers" feature (PR: [#76884](https://github.com/dotnet/roslyn/pull/76884))
16+
* Reduce work in ConversionsBase.AddUserDefinedConversionsToExplicitCandidateSet (PR: [#76835](https://github.com/dotnet/roslyn/pull/76835))
17+
* Update formatOnType handler to support formatting on NewLine (PR: [#76876](https://github.com/dotnet/roslyn/pull/76876))
18+
* Fix new document formatting (PR: [#76736](https://github.com/dotnet/roslyn/pull/76736))
19+
* Initial work to collapse comments at the end of a block (PR: [#76865](https://github.com/dotnet/roslyn/pull/76865))
20+
* Remove explicit recursion in the json detection analyzer (#76764) (PR: [#76764](https://github.com/dotnet/roslyn/pull/76764))
21+
* Consider silly cyclic assignment in scoped variance (#76261) (PR: [#76261](https://github.com/dotnet/roslyn/pull/76261))
22+
* Fix ordering of 'params' vs 'scoped' in metadata as source (#76745) (PR: [#76745](https://github.com/dotnet/roslyn/pull/76745))
23+
* Change partial keyword recommender to better handle partial member syntax (#76744) (PR: [#76744](https://github.com/dotnet/roslyn/pull/76744))
24+
* Ensure unconverted elements are converted when on LHS (#76675) (PR: [#76675](https://github.com/dotnet/roslyn/pull/76675))
25+
* Proffer CssVisualDiagnosticsService brokered service from C# DevKit to C# Extension (#76737) (PR: [#76737](https://github.com/dotnet/roslyn/pull/76737))
26+
* Disable extract class/interface to a new file when unsupported by the workspace. (#76717) (PR: [#76717](https://github.com/dotnet/roslyn/pull/76717))
27+
* Fix issue parsing regex category (#76735) (PR: [#76735](https://github.com/dotnet/roslyn/pull/76735))
28+
* Properly simplify pattern when converting to pattern matching (#76734) (PR: [#76734](https://github.com/dotnet/roslyn/pull/76734))
29+
* Do not lift type parameters in extract method declared within the selected region (#76724) (PR: [#76724](https://github.com/dotnet/roslyn/pull/76724))
30+
* Always use .OriginalDefinition uniformly in the unread-members analyzer (#76698) (PR: [#76698](https://github.com/dotnet/roslyn/pull/76698))
31+
* Adding checks for mutable structs. (#76711) (PR: [#76711](https://github.com/dotnet/roslyn/pull/76711))
32+
* Add option for choosing stdio as the LSP communication channel (#76437) (PR: [#76437](https://github.com/dotnet/roslyn/pull/76437))
33+
* Support organizing imports as part of LSP document formatting (PR: [#76806](https://github.com/dotnet/roslyn/pull/76806))
34+
* Improve collapsing of members followed by pp directives (PR: [#76837](https://github.com/dotnet/roslyn/pull/76837))
35+
* Load razor assembly directly: (PR: [#76808](https://github.com/dotnet/roslyn/pull/76808))
36+
* Special case inlining a collection expr into a spreaded element (PR: [#76823](https://github.com/dotnet/roslyn/pull/76823))
37+
* Do not offer to simplify interpolations when using formattable strings (PR: [#76830](https://github.com/dotnet/roslyn/pull/76830))
38+
* Add support for outlining switch expressions (PR: [#76827](https://github.com/dotnet/roslyn/pull/76827))
39+
* Do no offer to make fields readonly if they are a struct and are written to through an indexer (PR: [#76825](https://github.com/dotnet/roslyn/pull/76825))
40+
* Do not offer to inline a decl into a switch arm when it is referenced outside of it. (PR: [#76822](https://github.com/dotnet/roslyn/pull/76822))
41+
* Fix gen-method generating into top level. (PR: [#76821](https://github.com/dotnet/roslyn/pull/76821))
42+
* Fix 'invert if' refactor to properly enclose #region/#endregion blocks (PR: [#74145](https://github.com/dotnet/roslyn/pull/74145))
43+
* Do not offer use-conditional when it would cause name collisions (PR: [#76807](https://github.com/dotnet/roslyn/pull/76807))
44+
* Remove unnecessary cast in one conditional expression branch, based on the other branch and outer conversion. (PR: [#76798](https://github.com/dotnet/roslyn/pull/76798))
45+
* Convert a return value to return type even if it has errors (PR: [#76699](https://github.com/dotnet/roslyn/pull/76699))
46+
* Add EmbeddedAttribute API for source generators (PR: [#76583](https://github.com/dotnet/roslyn/pull/76583))
47+
* Fix formatting when doing a 'fix all' with 'use auto prop' (PR: [#76791](https://github.com/dotnet/roslyn/pull/76791))
48+
* Initialize naming style preferences when language is added to workspace (PR: [#76795](https://github.com/dotnet/roslyn/pull/76795))
49+
* Support target type completion tags in object creation contexts (PR: [#76786](https://github.com/dotnet/roslyn/pull/76786))
50+
* Fix 'use conditional expression' where it was causing a null-ref warning. (PR: [#76792](https://github.com/dotnet/roslyn/pull/76792))
51+
* Keep comments on an 'else' keyword when converting to conditional expressions. (PR: [#76789](https://github.com/dotnet/roslyn/pull/76789))
52+
* VB: Don't capture conditional access receiver into a temp local during lowering. (PR: [#76712](https://github.com/dotnet/roslyn/pull/76712))
53+
* Update regex parsing to latest .Net core parsing (and diagnostic messages). (PR: [#76269](https://github.com/dotnet/roslyn/pull/76269))
54+
* Forbid pointer types as instance fields in records (PR: [#76588](https://github.com/dotnet/roslyn/pull/76588))
55+
* Field-backed properties: report diagnostic for variable named field declared in accessor (PR: [#76671](https://github.com/dotnet/roslyn/pull/76671))
56+
* Update 'use nameof instead of typeof' to support generic types (PR: [#76780](https://github.com/dotnet/roslyn/pull/76780))
57+
* Add feature to convert from an explicitly typed lambda to an implicitly typed one. (PR: [#76770](https://github.com/dotnet/roslyn/pull/76770))
58+
* Support modifiers with simple lambda parameters. (PR: [#75400](https://github.com/dotnet/roslyn/pull/75400))
59+
* Update Razor to 9.0.0-preview.25064.4 (PR: [#7927](https://github.com/dotnet/vscode-csharp/pull/7927))
60+
* Wire up the UseRoslynTokenizer feature properly (#11386) (PR: [#11386](https://github.com/dotnet/razor/pull/11386))
61+
* New Razor document formatting engine (#11364) (PR: [#11364](https://github.com/dotnet/razor/pull/11364))
62+
* Fix a couple of exceptions encountered when formatting documents with preprocessor directives (#11373) (PR: [#11373](https://github.com/dotnet/razor/pull/11373))
63+
* Allow RazorProjectEngine.Process to be cancelled (#11334) (PR: [#11334](https://github.com/dotnet/razor/pull/11334))
64+
* Further refactoring of Razor tooling project system (#11320) (PR: [#11320](https://github.com/dotnet/razor/pull/11320))
65+
666
# 2.62.x
767
* Update Roslyn to 4.14.0-1.25060.2 (PR: [#7916](https://github.com/dotnet/vscode-csharp/pull/7916))
868
* Support Extracting method with complex flow control cosntructs in them. (PR: [#76686](https://github.com/dotnet/roslyn/pull/76686))

‎azure-pipelines/build.yml

+11-5
Original file line numberDiff line numberDiff line change
@@ -67,26 +67,32 @@ jobs:
6767
env:
6868
SignType: $(signType)
6969

70+
- task: CopyFiles@2
71+
inputs:
72+
SourceFolder: '$(Build.SourcesDirectory)/vsix'
73+
TargetFolder: '$(Build.SourcesDirectory)/Packages/VSIX_$(channel)'
74+
7075
- ${{ if eq(parameters.isOfficial, true) }}:
7176
- task: 1ES.PublishBuildArtifacts@1
7277
condition: succeeded()
7378
displayName: 'Publish VSIXs'
7479
inputs:
75-
PathtoPublish: '$(Build.SourcesDirectory)/vsix'
76-
ArtifactName: 'VSIX_$(channel)'
80+
PathtoPublish: '$(Build.SourcesDirectory)/Packages'
81+
ArtifactName: 'Packages'
7782
- task: 1ES.PublishBuildArtifacts@1
7883
condition: succeededOrFailed()
7984
displayName: 'Publish Signing Logs'
8085
inputs:
8186
PathtoPublish: '$(Build.SourcesDirectory)/out/logs'
8287
ArtifactName: '${{ parameters.platform }} Signing Logs'
88+
8389
- ${{ else }}:
8490
- task: PublishBuildArtifacts@1
8591
condition: succeeded()
8692
displayName: 'Publish VSIXs'
8793
inputs:
88-
PathtoPublish: '$(Build.SourcesDirectory)/vsix'
89-
ArtifactName: 'VSIX_$(channel)'
94+
PathtoPublish: '$(Build.SourcesDirectory)/Packages'
95+
ArtifactName: 'Packages'
9096

9197
- script: npm run test:artifacts
92-
displayName: 'Run artifacts tests'
98+
displayName: 'Run artifacts tests'

‎azure-pipelines/release.yml

+8-10
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,18 @@ extends:
3939
name: netcore1espool-internal
4040
image: 1es-ubuntu-2204
4141
os: linux
42+
templateContext:
43+
type: releaseJob
44+
isProduction: true
45+
inputs:
46+
- input: pipelineArtifact
47+
pipeline: officialBuildCI
48+
artifactName: Packages
49+
destinationPath: $(Pipeline.Workspace)
4250
strategy:
4351
runOnce:
4452
deploy:
4553
steps:
46-
- download: 'none'
47-
- task: DownloadPipelineArtifact@2
48-
displayName: '📦 Download artifacts from build pipeline.'
49-
inputs:
50-
buildType: 'specific'
51-
project: 'internal'
52-
definition: 1264
53-
buildVersionToDownload: 'specific'
54-
buildId: '$(resources.pipeline.officialBuildCI.runID)'
55-
branchName: '$(resources.pipeline.officialBuildCI.sourceBranch)'
5654
- template: /azure-pipelines/install-node.yml@self
5755
- pwsh: |
5856
npm install --global @vscode/vsce

‎package.json

+13-15
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@
3737
}
3838
},
3939
"defaults": {
40-
"roslyn": "4.14.0-1.25060.2",
40+
"roslyn": "4.14.0-1.25074.7",
4141
"omniSharp": "1.39.12",
42-
"razor": "9.0.0-preview.25052.3",
42+
"razor": "9.0.0-preview.25064.4",
4343
"razorOmnisharp": "7.0.0-preview.23363.1",
44-
"xamlTools": "17.13.35709.178"
44+
"xamlTools": "17.14.35723.260"
4545
},
4646
"main": "./dist/extension",
4747
"l10n": "./l10n",
@@ -739,6 +739,11 @@
739739
"default": true,
740740
"description": "%configuration.dotnet.autoInsert.enableAutoInsert%"
741741
},
742+
"dotnet.formatting.organizeImportsOnFormat": {
743+
"type": "boolean",
744+
"default": false,
745+
"description": "%configuration.dotnet.formatting.organizeImportsOnFormat%"
746+
},
742747
"dotnet.typeMembers.memberInsertionLocation": {
743748
"type": "string",
744749
"enum": [
@@ -1513,17 +1518,15 @@
15131518
"description": "%configuration.razor.languageServer.forceRuntimeCodeGeneration%",
15141519
"order": 90
15151520
},
1516-
"razor.languageServer.useRoslynTokenizer": {
1517-
"type": "boolean",
1518-
"scope": "machine-overridable",
1519-
"default": false,
1520-
"markdownDescription": "%configuration.razor.languageServer.useRoslynTokenizer%",
1521-
"order": 90
1522-
},
15231521
"razor.languageServer.suppressLspErrorToasts": {
15241522
"type": "boolean",
15251523
"default": true,
15261524
"description": "%configuration.razor.languageServer.suppressLspErrorToasts%"
1525+
},
1526+
"razor.languageServer.useNewFormattingEngine": {
1527+
"type": "boolean",
1528+
"default": true,
1529+
"description": "%configuration.razor.languageServer.useNewFormattingEngine%"
15271530
}
15281531
}
15291532
},
@@ -1698,11 +1701,6 @@
16981701
"default": false,
16991702
"description": "%configuration.omnisharp.enableLspDriver%"
17001703
},
1701-
"omnisharp.organizeImportsOnFormat": {
1702-
"type": "boolean",
1703-
"default": false,
1704-
"description": "%configuration.omnisharp.organizeImportsOnFormat%"
1705-
},
17061704
"omnisharp.enableAsyncCompletion": {
17071705
"type": "boolean",
17081706
"default": false,

0 commit comments

Comments
 (0)