Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
531 commits
Select commit Hold shift + click to select a range
0f8dc35
Pass the ITestOutputHelper to the MSBuildWorkspace logger
jasonmalinowski Feb 5, 2025
dae45c9
Pass the ITestOutputHelper to the MSBuildWorkspace logger (#77072)
jasonmalinowski Feb 8, 2025
67028f5
Inline diagnostic service helpers (#77099)
CyrusNajmabadi Feb 8, 2025
651ee91
Set a RID for InteractiveHost32 (#77116)
jkoritzinsky Feb 8, 2025
4b4ca0b
Merge remote-tracking branch 'upstream/main' into diagNoMemorySave
CyrusNajmabadi Feb 8, 2025
577cc45
Merge branch 'diagNoMemorySave' into projectCompilationMap
CyrusNajmabadi Feb 8, 2025
3168481
Update data section string literals spec (#77050)
jjonescz Feb 8, 2025
0fcaef9
Large simplification in how diagnostics are cached in the diagnostic …
CyrusNajmabadi Feb 8, 2025
14610b6
Merge branch 'main' into projectCompilationMap
CyrusNajmabadi Feb 8, 2025
d4d7e59
Make physical property into a computed property
CyrusNajmabadi Feb 8, 2025
4fe6423
Make FileContentLoadAnalyzer into a hosts analyzer
CyrusNajmabadi Feb 8, 2025
5fe179d
Make GenerateDiagnosticAnalyzer into a hosts analyzer
CyrusNajmabadi Feb 8, 2025
0a9f2c8
Move more over
CyrusNajmabadi Feb 8, 2025
f80f2d4
Move more over
CyrusNajmabadi Feb 8, 2025
d5dd709
Move more over
CyrusNajmabadi Feb 8, 2025
554be89
Move more over
CyrusNajmabadi Feb 8, 2025
d4cb75c
Move more over
CyrusNajmabadi Feb 8, 2025
d763eb2
Move more over
CyrusNajmabadi Feb 8, 2025
229001c
Move more over
CyrusNajmabadi Feb 8, 2025
a8c13a3
All building
CyrusNajmabadi Feb 8, 2025
76e831d
remove method
CyrusNajmabadi Feb 8, 2025
dc94a41
remove method
CyrusNajmabadi Feb 8, 2025
af82260
remove method
CyrusNajmabadi Feb 8, 2025
56416aa
rename
CyrusNajmabadi Feb 8, 2025
b094454
Remove comments
CyrusNajmabadi Feb 8, 2025
268ce43
Simplify API
CyrusNajmabadi Feb 8, 2025
6f16789
Update src/LanguageServer/Protocol/Features/Diagnostics/EngineV2/Diag…
CyrusNajmabadi Feb 8, 2025
d9c05f9
renames
CyrusNajmabadi Feb 8, 2025
0be3864
Merge branch 'removeStateSet' of https://github.com/CyrusNajmabadi/ro…
CyrusNajmabadi Feb 8, 2025
8273332
Simplify
CyrusNajmabadi Feb 8, 2025
74553b7
Make private
CyrusNajmabadi Feb 8, 2025
71df88d
Simplify subset logic
CyrusNajmabadi Feb 8, 2025
c4dd3cf
Merge branch 'projectCompilationMap' into removeStateSet
CyrusNajmabadi Feb 8, 2025
3040c80
delete file
CyrusNajmabadi Feb 8, 2025
cde937b
Simplify data passed to diagnostic service'
CyrusNajmabadi Feb 8, 2025
4dd46df
do not pass state along
CyrusNajmabadi Feb 8, 2025
3b7a814
Simplify the computation and caching of 'CompilationWithAnalyzers' fo…
CyrusNajmabadi Feb 9, 2025
38b6b74
Merge branch 'main' into removeStateSet
CyrusNajmabadi Feb 9, 2025
7743590
Merge branch 'removeStateSet' into projectDiagBased
CyrusNajmabadi Feb 9, 2025
a3e4c64
Single filter
CyrusNajmabadi Feb 9, 2025
3c5c686
Avoid making options
CyrusNajmabadi Feb 9, 2025
809eddd
Remove inner class
CyrusNajmabadi Feb 9, 2025
126b5a9
Name
CyrusNajmabadi Feb 9, 2025
55c02e9
Remove inner class
CyrusNajmabadi Feb 9, 2025
d7c3556
Cleanup
CyrusNajmabadi Feb 9, 2025
fa379b6
xml docs
CyrusNajmabadi Feb 9, 2025
f09861a
Make local function
CyrusNajmabadi Feb 9, 2025
a01d3b5
Optimize DiagnosticService on NetCore
CyrusNajmabadi Feb 9, 2025
f3075bc
Fix
CyrusNajmabadi Feb 9, 2025
4b95269
Add culture to the extensionmanager reference to unblock d18 (#77112)
arunchndr Feb 10, 2025
9f3c6eb
Consume mibc data from VSCode profiling runs in official builds (#77044)
dibarbet Feb 10, 2025
329bb90
Remove 'state set' concept for diagnostic analysis subsystem. (#77121)
CyrusNajmabadi Feb 10, 2025
de7aa79
Merge branch 'main' into projectDiagBased
CyrusNajmabadi Feb 10, 2025
bf3a74f
Use expression body
CyrusNajmabadi Feb 10, 2025
7ef54be
inline
CyrusNajmabadi Feb 10, 2025
e2cba6c
Change cases
CyrusNajmabadi Feb 10, 2025
d4a42cf
remove temp
CyrusNajmabadi Feb 10, 2025
c59a123
No need to pass callbacks
CyrusNajmabadi Feb 10, 2025
4fa21f5
remove stale comments
CyrusNajmabadi Feb 10, 2025
98b5528
Merge branch 'projectDiagBased' into localFunctionDiags
CyrusNajmabadi Feb 10, 2025
c7f663c
Optimize DiagnosticService on NetCore (#77126)
CyrusNajmabadi Feb 10, 2025
fdcd193
Merge branch 'main' into projectDiagBased
CyrusNajmabadi Feb 10, 2025
b3b79e3
Merge branch 'projectDiagBased' into localFunctionDiags
CyrusNajmabadi Feb 10, 2025
8493177
Cache based on project state not project.
CyrusNajmabadi Feb 10, 2025
80ac906
Cache based on project state not project.
CyrusNajmabadi Feb 10, 2025
84d19cb
Merge remote-tracking branch 'upstream/main' into diagProjectState
CyrusNajmabadi Feb 10, 2025
1adf017
Add new workspace event that gives handlers the opportunity to be pro…
ToddGrun Feb 10, 2025
99d8eeb
Update PublishData.json (#77140)
akhera99 Feb 10, 2025
91f5069
Do not build Microsoft.CodeAnalysis.ExternalAccess.Copilot during sou…
333fred Feb 10, 2025
ebff826
Merge remote-tracking branch 'upstream/main' into diagProjectState
CyrusNajmabadi Feb 10, 2025
494c5e0
Update docs
CyrusNajmabadi Feb 10, 2025
8d93475
PR feedback
CyrusNajmabadi Feb 10, 2025
a070add
fix remote side
CyrusNajmabadi Feb 10, 2025
ab3ae96
Report LSP diagnostics with their severity.
JoeRobich Feb 10, 2025
d397200
Make more APIs project-based in diag service. (#77122)
CyrusNajmabadi Feb 10, 2025
dba01c3
Merge branch 'main' into localFunctionDiags
CyrusNajmabadi Feb 10, 2025
daae3d8
Fix syntax generation of explict checked operator from symbol (#77102)
CyrusNajmabadi Feb 10, 2025
2fcadee
Merge remote-tracking branch 'upstream/main' into diagProjectState
CyrusNajmabadi Feb 11, 2025
6b30476
Remove unneeded test
JoeRobich Feb 11, 2025
a3b817d
Use raw strings in tests
CyrusNajmabadi Feb 11, 2025
e1fab1c
Return LSP diagnostics with their reported severity. (#77145)
JoeRobich Feb 11, 2025
a6155bb
Fix race during shutdown of the BuildHost server
jasonmalinowski Feb 11, 2025
90522a1
Add main to release/dev18.0 flow (#77148)
akhera99 Feb 11, 2025
e46a163
Fix workspace command execution
dibarbet Feb 11, 2025
ca3f2df
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Feb 11, 2025
7c391a1
Merge branch 'main' into rawStrings
JoeRobich Feb 11, 2025
700edd9
Remove nested types in diagnostic analyzer service (#77124)
CyrusNajmabadi Feb 11, 2025
19c9b9e
Detect data section string literal hash collisions (#77061)
jjonescz Feb 11, 2025
e0fadb6
Use raw strings in tests (#77150)
CyrusNajmabadi Feb 11, 2025
0de4878
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Feb 11, 2025
eeff8ea
Add Microsoft.CodeAnalysis.Contracts source package (#76997)
tmat Feb 11, 2025
afb8679
Merge remote-tracking branch 'dotnet/main' into CopilotExternalAccess
genlu Feb 11, 2025
16db1bc
Fix workspace command execution (#77152)
dibarbet Feb 11, 2025
bcce8cb
Use the new test framework for missing IDE0060 diagnostics
sharwell Feb 11, 2025
155da75
Add regression test for writing to Span<T>
sharwell Feb 11, 2025
1fa0fb7
Fix race during shutdown of the BuildHost server (#77151)
jasonmalinowski Feb 11, 2025
0b8cd8b
Accessing a property or indexer is at least a read operation
sharwell Feb 11, 2025
7cd4978
Remove unused parameter parseOptions
sharwell Feb 11, 2025
0bf62b4
Update remaining tests to use the new test library
sharwell Feb 11, 2025
f955c20
Add IVT
genlu Feb 11, 2025
c53e1e0
Multi-target LSP tests to run against .NET9
dibarbet Feb 12, 2025
c3fc118
cleanup warnings in pull diags tests
dibarbet Feb 12, 2025
9cfab2d
cleanup more warnings
dibarbet Feb 12, 2025
fecfec9
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Feb 12, 2025
6781b3e
Merge remote-tracking branch 'upstream/main' into RazorUsingMoreLspTypes
davidwengier Feb 12, 2025
c8a2a0d
Enable tests in VMR
NikolaMilosavljevic Feb 12, 2025
3f2e5e2
Add analyzer redirecting API (#74820)
jjonescz Feb 12, 2025
f252374
Remove the unused property
NikolaMilosavljevic Feb 12, 2025
b0d8330
Use the new test framework for missing IDE0060 diagnostics (#77158)
sharwell Feb 12, 2025
b2d1732
Add test demonstrating issue no longer repros
CyrusNajmabadi Feb 12, 2025
81112e0
Have distinct messages for adding/removing accessibility modifiers
CyrusNajmabadi Feb 12, 2025
703574f
Share code
CyrusNajmabadi Feb 12, 2025
7b91b2f
Add semicolon
CyrusNajmabadi Feb 12, 2025
26317e4
fix more build errors and warnings
dibarbet Feb 12, 2025
b2654c8
Address review comments
genlu Feb 12, 2025
86632f1
Add test demonstrating issue no longer repros (#77185)
CyrusNajmabadi Feb 12, 2025
c988759
Enable tests in VMR (#77179)
NikolaMilosavljevic Feb 12, 2025
6a09b84
Add IsExternalInit back to Razor EA (#77186)
tmat Feb 12, 2025
36036f8
Add Copilot EA for language server (#77047)
genlu Feb 12, 2025
76b364e
refactor lsp test harness to allow different test workspaces
dibarbet Feb 12, 2025
3f873ed
remove unnecessary csproj item
dibarbet Feb 13, 2025
32a5390
Update src/EditorFeatures/Test/LanguageServer/VSTypeScriptHandlerTest…
dibarbet Feb 13, 2025
1c2e6ff
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Feb 13, 2025
4fdbd93
Classify string fields with embedded languages if we can see their va…
CyrusNajmabadi Feb 13, 2025
38d0c0e
Add tests
CyrusNajmabadi Feb 13, 2025
ed675b4
Mention data string literal feature backport (#77076)
jjonescz Feb 13, 2025
4053035
lint
CyrusNajmabadi Feb 13, 2025
589ad23
Merge remote-tracking branch 'upstream/main' into diagProjectState
CyrusNajmabadi Feb 13, 2025
74f151e
Classify string fields with embedded languages if we can see their va…
CyrusNajmabadi Feb 13, 2025
16967dc
Update PublishData.json
akhera99 Feb 13, 2025
ef1d7fe
Update PublishData.json (#77208)
JoeRobich Feb 13, 2025
9dd780c
Multi-target LSP tests to run against .NET (#77173)
dibarbet Feb 13, 2025
7015680
Switch to UI thread to activate Semantic Search UIContext (#77195)
tmat Feb 13, 2025
659c0f9
Initial work to support FixAll in 'use interpoalted string'
CyrusNajmabadi Feb 13, 2025
dc945ec
Complete work
CyrusNajmabadi Feb 13, 2025
f2a3f7b
Revert
CyrusNajmabadi Feb 13, 2025
4a5b490
Reduce allocations in SymbolCompletionItem.GetSupportedPlatforms (#77…
ToddGrun Feb 13, 2025
b60539f
Make conditional weak table static
CyrusNajmabadi Feb 13, 2025
6357650
Only refetch from CWT if adding to it failed
CyrusNajmabadi Feb 13, 2025
a3bdd94
Update 'use interpolated string' refactoring to support fix all (#77209)
CyrusNajmabadi Feb 13, 2025
7b781d4
Only refetch from CWT if adding to it failed (#77211)
CyrusNajmabadi Feb 13, 2025
5bf4bfe
Update Semantic Search Ref assembly (#77196)
tmat Feb 13, 2025
13e9626
Make conditional weak table static (#77210)
CyrusNajmabadi Feb 13, 2025
191ee36
using snippet
akhera99 Feb 14, 2025
c86f8c2
Store checlksum
CyrusNajmabadi Feb 14, 2025
1cd7417
Add test for override completion error
dibarbet Feb 14, 2025
6b9b958
Fix issue parsing for-statement initializer chain with commas and no …
CyrusNajmabadi Feb 14, 2025
40b0cba
Cache based on project state not project. (#77141)
CyrusNajmabadi Feb 14, 2025
d993eb9
Remove potential leak in CachingSemanticModelProvider._providerCache …
ToddGrun Feb 14, 2025
a4f5f69
Merge in main
CyrusNajmabadi Feb 14, 2025
7017121
Merge branch 'main' into diagProjectStateFull2
CyrusNajmabadi Feb 14, 2025
62ec083
Update Compiler Breaking Changes - DotNet 9.md
CyrusNajmabadi Feb 14, 2025
d8d312d
Defer checksum computation
CyrusNajmabadi Feb 14, 2025
b0ad3f4
Update Compiler Breaking Changes - DotNet 9.md (#77231)
CyrusNajmabadi Feb 14, 2025
250126c
Cache diagnostic info based on project state not project. (#77230)
CyrusNajmabadi Feb 14, 2025
39048c8
Have distinct messages for adding vs. removing accessibility modifier…
CyrusNajmabadi Feb 14, 2025
30bae2d
Do not offer primary constructor parameters when offering to generate…
CyrusNajmabadi Feb 14, 2025
1c29926
Rename feature to 'Add or remove accessibility modifiers'
CyrusNajmabadi Feb 14, 2025
dbad668
Cleanup and revert
CyrusNajmabadi Feb 14, 2025
7c437ed
Revert
CyrusNajmabadi Feb 14, 2025
00718bf
Fix
CyrusNajmabadi Feb 14, 2025
9bd6246
Add test
CyrusNajmabadi Feb 14, 2025
add6035
Merge branch 'main' into addOrRemove
CyrusNajmabadi Feb 14, 2025
15a63a1
revert
CyrusNajmabadi Feb 14, 2025
f642e6a
Add test
CyrusNajmabadi Feb 14, 2025
c8841d7
Fix issue where hitting enter before a raw-string literal was process…
CyrusNajmabadi Feb 14, 2025
c93ec5f
remove import
CyrusNajmabadi Feb 14, 2025
da5c0c5
Semantic Snippets - using snippet (#77214)
akhera99 Feb 14, 2025
03e26e5
revert
CyrusNajmabadi Feb 14, 2025
f6fc311
Rename feature to 'Add or remove accessibility modifiers' (#77234)
CyrusNajmabadi Feb 15, 2025
6b8381c
add background color for inline hints in high contrast mode
akhera99 Feb 15, 2025
e91c871
Fix issue where hitting enter before a raw-string literal was process…
CyrusNajmabadi Feb 15, 2025
ad54fbc
Do not offer primary constructor parameters when offering to generate…
CyrusNajmabadi Feb 15, 2025
2b29799
Inline Hints - Add background for Windows high contrast mode (#77238)
akhera99 Feb 15, 2025
eecbc00
fix syncing
CyrusNajmabadi Feb 15, 2025
ccff5c5
Allow oop syncing to send over ephemeral solutions with name/filepath…
CyrusNajmabadi Feb 15, 2025
0494fc6
Fix override completion when attribute below
dibarbet Feb 14, 2025
5d046a0
Properly pass progress object along in fix all provider
CyrusNajmabadi Feb 15, 2025
1315d69
Use property
CyrusNajmabadi Feb 15, 2025
abdd4cd
Simplify code
CyrusNajmabadi Feb 15, 2025
0129d0c
Simplify
CyrusNajmabadi Feb 15, 2025
1e6c551
Remove dependency on semantics
CyrusNajmabadi Feb 15, 2025
13e2a61
Simplify
CyrusNajmabadi Feb 15, 2025
9a8c310
preserve behavior
CyrusNajmabadi Feb 15, 2025
9af27d3
Remove need to use semantics in the 'move type' code refactoring prov…
CyrusNajmabadi Feb 15, 2025
567599f
Properly pass progress object along in fix all provider (#77243)
CyrusNajmabadi Feb 15, 2025
8090cf1
Remove state type from 'move type' refactoring
CyrusNajmabadi Feb 15, 2025
69e9d63
inline
CyrusNajmabadi Feb 15, 2025
6042dd3
inline
CyrusNajmabadi Feb 15, 2025
74659ba
remove more
CyrusNajmabadi Feb 15, 2025
46086b2
Semantic document
CyrusNajmabadi Feb 15, 2025
cba9de6
rename
CyrusNajmabadi Feb 15, 2025
254b024
REvert
CyrusNajmabadi Feb 15, 2025
deadb60
REvert
CyrusNajmabadi Feb 15, 2025
c127487
REvert
CyrusNajmabadi Feb 15, 2025
d862b94
Remove state type from 'move type' refactoring (#77248)
CyrusNajmabadi Feb 16, 2025
80ccf3f
Make `InterceptableLocation` implement `IEquatable<InterceptableLocat…
aradalvand Feb 17, 2025
7561e17
Allow more of Razor to use Roslyn Lsp types (#74597)
davidwengier Feb 17, 2025
a97fa11
Add missing word to the documentation file (#77259)
kkm000 Feb 18, 2025
54c73a3
Ensure generated operator methods have the format annotation
dibarbet Feb 18, 2025
0980d31
Update VB tests to assert new formatting behavior
dibarbet Feb 18, 2025
284c0c3
Use raw strings in override tests
dibarbet Feb 18, 2025
51f74e4
[main] Update dependencies from dotnet/arcade (#77175)
akhera99 Feb 19, 2025
2323efd
Ensure diagnostics refresh when source generators run in balanced mode
dibarbet Feb 19, 2025
c7da029
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Feb 19, 2025
74aab87
Create missing options types
davidwengier Feb 19, 2025
c84d249
Fix Quick Info nullability display for backing fields (#77240)
RikkiGibson Feb 19, 2025
402754c
Mix the source generator version info into the dependent checksum we …
CyrusNajmabadi Feb 19, 2025
68df62a
Merge remote-tracking branch 'cyrus/depChecksum' into sg_diagnostics
dibarbet Feb 19, 2025
2196bd2
Fix crash in 'introduce variable' when converting an object creation …
CyrusNajmabadi Feb 19, 2025
9087df4
Enable NRT
CyrusNajmabadi Feb 19, 2025
6bd91b6
Update src/Tools/SemanticSearch/ReferenceAssemblies/Apis/Microsoft.Co…
CyrusNajmabadi Feb 19, 2025
a7ba2ce
Fix crash in 'introduce variable' when converting an object creation …
CyrusNajmabadi Feb 19, 2025
e4db07d
Use proj dependent checksum instead now that it contains SG info
dibarbet Feb 19, 2025
fbbde1a
Fix override completion when attribute below (#77242)
dibarbet Feb 19, 2025
fa6d78d
disable realtime monitoring
akhera99 Feb 19, 2025
df5f19a
Disable realtime monitoring in the PR-validation pipeline (#77282)
akhera99 Feb 19, 2025
29ba157
Update debugger contracts to fix hot reload issue
dibarbet Feb 19, 2025
4c13f50
Ensure diagnostics refresh when source generators run in balanced mod…
dibarbet Feb 20, 2025
0d066ee
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Feb 20, 2025
6ce6e62
Return stronger-ly typed results from completion
davidwengier Feb 20, 2025
eb904d9
Forgot to change the file header when copying the file contents
davidwengier Feb 20, 2025
9b24f62
Add test
CyrusNajmabadi Feb 20, 2025
6fb5d62
Add an option to ignore aliases when moving using directives outside …
CyrusNajmabadi Feb 20, 2025
4d21154
Add test
CyrusNajmabadi Feb 20, 2025
aa00cb4
Add work items
CyrusNajmabadi Feb 20, 2025
dea2c14
Update runtime async spec (#76872)
333fred Feb 20, 2025
428241f
Merge branch 'main' into darc-main-1fec9736-6591-4ca2-8394-7040044cda12
akhera99 Feb 20, 2025
0bfdd05
Remove out of support branches from PublishData.json
JoeRobich Feb 20, 2025
d47fa08
Fill some gaps in the LSP (#77289)
davidwengier Feb 20, 2025
c00b940
Add an option to ignore aliases when moving using directives outside …
CyrusNajmabadi Feb 20, 2025
f3a26c9
Switch TextDocumentState.GetTextVersionAsync to ValueTask to reduce a…
ToddGrun Feb 20, 2025
8c00a94
Fix
Youssef1313 Feb 20, 2025
5d348af
[main] Update dependencies from dotnet/source-build-reference-package…
akhera99 Feb 20, 2025
882e679
Update debugger contracts to fix hot reload issue (#77284)
dibarbet Feb 20, 2025
e8dcc6d
Update PublicAPI files for 17.13 ship (#77266) (#77295)
333fred Feb 20, 2025
696f317
Expand doc comment
Youssef1313 Feb 20, 2025
efe8c89
Remove out of support branches from PublishData.json (#77294)
JoeRobich Feb 20, 2025
9f54731
Update azure-pipelines-official.yml
akhera99 Feb 20, 2025
39c5cd1
Don't use hardcoded line endings (#77296)
333fred Feb 20, 2025
00d0454
Allow Semantic Search query function to take symbol parameter (#77272)
tmat Feb 20, 2025
2212158
Update to release nuget packages (#77261) (#77298)
333fred Feb 20, 2025
f05a6a0
Generate Documentation Auto-Insert (#76665)
akhera99 Feb 21, 2025
b097ef3
Disable realtime monitoring in the official pipeline (#77302)
akhera99 Feb 21, 2025
3eb8e1b
Move check to 'make field readonly'
CyrusNajmabadi Feb 21, 2025
e96bc3a
Add test
CyrusNajmabadi Feb 21, 2025
7f67f6b
Update src/Tools/SemanticSearch/ReferenceAssemblies/Apis/Microsoft.Co…
CyrusNajmabadi Feb 21, 2025
aebe202
Fix false positive 'Unnecessary assignment of a value' (#77297)
CyrusNajmabadi Feb 21, 2025
a0da860
Add Copilot UI prototype to Semantic Search window (#77222)
tmat Feb 21, 2025
355cfd8
Merge remote-tracking branch 'upstream/main' into merge_main_to_17_14
akhera99 Feb 25, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 9 additions & 0 deletions .config/branch-merge.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"merge-flow-configurations": {
// Merge any main changes to release/dev18.0.
"main": {
"MergeToBranch": "release/dev18.0",
"ExtraSwitches": "-QuietComments"
}
}
}
18 changes: 18 additions & 0 deletions .github/workflows/main-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Merges any changes from release/prerelease to main (e.g. servicing changes)

name: Flow main to release/dev18.0
on:
schedule:
# once a day at 13:00 UTC to cleanup old runs
- cron: '0 13 * * *'
workflow_dispatch:

permissions:
contents: write
pull-requests: write

jobs:
check-script:
uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
with:
configuration_file_path: '.config/branch-merge.json'
72 changes: 65 additions & 7 deletions Roslyn.sln

Large diffs are not rendered by default.

28 changes: 17 additions & 11 deletions azure-pipelines-official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ trigger:
- main-vs-deps
- release/dev16.*-vs-deps
- release/dev17.*
- release/dev18.*
- features/lsp_tools_host
exclude:
- release/dev17.0
Expand All @@ -16,6 +17,11 @@ resources:
type: git
name: 1ESPipelineTemplates/1ESPipelineTemplates
ref: refs/tags/release
pipelines:
- pipeline: profilingInputs
source: dotnet-vscode-csharp-profiling
branch: main
trigger: none

parameters:
- name: IbcDrop
Expand Down Expand Up @@ -89,6 +95,9 @@ variables:
- ${{ if and(notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
- name: enableSourceIndex
value: true
- name: VSCodeOptimizationDataRoot
value: $(Pipeline.Workspace)/profilingInputs/merged mibc


extends:
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
Expand Down Expand Up @@ -202,6 +211,9 @@ extends:
ArtifactName: AssetManifests

steps:
- pwsh: Set-MpPreference -DisableRealtimeMonitoring $true
displayName: Disable Real-time Monitoring

- powershell: Write-Host "##vso[task.setvariable variable=SourceBranchName]$('$(Build.SourceBranch)'.Substring('refs/heads/'.Length))"
displayName: Setting SourceBranchName variable
condition: succeeded()
Expand Down Expand Up @@ -266,23 +278,17 @@ extends:
useGlobalJson: true
workingDirectory: '$(Build.SourcesDirectory)'

# Needed to restore the Microsoft.DevDiv.Optimization.Data.PowerShell package
- task: NuGetCommand@2
displayName: Restore internal tools
inputs:
command: restore
feedsToUse: config
restoreSolution: 'eng\common\internal\Tools.csproj'
nugetConfigPath: 'NuGet.config'
restoreDirectory: '$(Build.SourcesDirectory)\.packages'

- task: MicroBuildSigningPlugin@4
inputs:
signType: $(SignType)
zipSources: false
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
condition: and(succeeded(), in(variables['SignType'], 'test', 'real'))

- download: profilingInputs
artifact: merged mibc
displayName: Download VSCode optimization inputs

- task: PowerShell@2
displayName: Build
inputs:
Expand All @@ -304,11 +310,11 @@ extends:
-officialVisualStudioDropAccessToken $(_DevDivDropAccessToken)
/p:RepositoryName=$(Build.Repository.Name)
/p:VisualStudioDropName=$(VisualStudio.DropName)
/p:VSCodeOptimizationDataRoot="$(VSCodeOptimizationDataRoot)"
/p:DotNetSignType=$(SignType)
/p:DotnetPublishUsingPipelines=true
/p:IgnoreIbcMergeErrors=true
/p:GenerateSbom=true
/p:ForceAzureComSources=true
condition: succeeded()

- template: /eng/common/templates-official/steps/generate-sbom.yml@self
Expand Down
13 changes: 3 additions & 10 deletions azure-pipelines-pr-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@ extends:
ArtifactName: AssetManifests

steps:
- pwsh: Set-MpPreference -DisableRealtimeMonitoring $true
displayName: Disable Real-time Monitoring

- task: Powershell@2
displayName: Setting OriginalBuildNumber variable
condition: succeeded()
Expand Down Expand Up @@ -215,16 +218,6 @@ extends:
useGlobalJson: true
workingDirectory: '$(Build.SourcesDirectory)'

# Needed to restore the Microsoft.DevDiv.Optimization.Data.PowerShell package
- task: NuGetCommand@2
displayName: Restore internal tools
inputs:
command: restore
feedsToUse: config
restoreSolution: 'eng\common\internal\Tools.csproj'
nugetConfigPath: 'NuGet.config'
restoreDirectory: '$(Build.SourcesDirectory)\.packages'

- task: MicroBuildSigningPlugin@4
inputs:
signType: $(SignType)
Expand Down
15 changes: 8 additions & 7 deletions docs/Language Feature Status.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@ efforts behind them.

| Feature | Branch | State | Developer | Reviewer | IDE Buddy | LDM Champ |
| ------- | ------ | ----- | --------- | -------- | --------- | --------- |
| [Partial Events and Constructors](https://github.com/dotnet/csharplang/issues/9058) | [features/PartialEventsCtors](https://github.com/dotnet/roslyn/tree/features/PartialEventsCtors) | [In Progress](https://github.com/dotnet/roslyn/issues/76859) | [jjonescz](https://github.com/jjonescz) | [cston](https://github.com/cston), [RikkiGibson](https://github.com/RikkiGibson) | | |
| Runtime Async | [features/runtime-async](https://github.com/dotnet/roslyn/tree/features/runtime-async) | [In Progress](https://github.com/dotnet/roslyn/issues/75960) | [333fred](https://github.com/333fred) | [jcouv](https://github.com/jcouv), [RikkiGibson](https://github.com/RikkiGibson) | | |
| [User Defined Compound Assignment Operators](https://github.com/dotnet/csharplang/issues/9101) | [UserDefinedCompoundAssignment](https://github.com/dotnet/roslyn/tree/features/UserDefinedCompoundAssignment) | [In Progress](https://github.com/dotnet/roslyn/issues/76934) | [AlekseyTs](https://github.com/AlekseyTs) | [333fred](https://github.com/333fred), [cston](https://github.com/cston) | TBD | [AlekseyTs](https://github.com/AlekseyTs) |
| [Partial Events and Constructors](https://github.com/dotnet/csharplang/issues/9058) | [PartialEventsCtors](https://github.com/dotnet/roslyn/tree/features/PartialEventsCtors) | [In Progress](https://github.com/dotnet/roslyn/issues/76859) | [jjonescz](https://github.com/jjonescz) | [cston](https://github.com/cston), [RikkiGibson](https://github.com/RikkiGibson) | | |
| Runtime Async | [runtime-async](https://github.com/dotnet/roslyn/tree/features/runtime-async) | [In Progress](https://github.com/dotnet/roslyn/issues/75960) | [333fred](https://github.com/333fred) | [jcouv](https://github.com/jcouv), [RikkiGibson](https://github.com/RikkiGibson) | | |
| [Null-conditional assignment](https://github.com/dotnet/csharplang/issues/6045) | [null-conditional-assignment](https://github.com/dotnet/roslyn/tree/features/null-conditional-assignment) | [In Progress](https://github.com/dotnet/roslyn/issues/75554) | [RikkiGibson](https://github.com/RikkiGibson) | [cston](https://github.com/cston), [jjonescz](https://github.com/jjonescz) | TBD | [RikkiGibson](https://github.com/RikkiGibson) |
| [Extensions](https://github.com/dotnet/csharplang/issues/8697) | [extensions](https://github.com/dotnet/roslyn/tree/features/extensions) | [In Progress](https://github.com/dotnet/roslyn/issues/76130) | [jcouv](https://github.com/jcouv), [AlekseyTs](https://github.com/AlekseyTs) | [jjonescz](https://github.com/jjonescz), TBD | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | [MadsTorgersen](https://github.com/MadsTorgersen) |
| [Dictionary expressions](https://github.com/dotnet/csharplang/issues/8659) | [dictionary-expressions](https://github.com/dotnet/roslyn/tree/features/dictionary-expressions) | [In Progress](https://github.com/dotnet/roslyn/issues/76310) | [cston](https://github.com/cston), [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | [333fred](https://github.com/333fred), [jcouv](https://github.com/jcouv) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) |
| [`field` keyword in properties](https://github.com/dotnet/csharplang/issues/140) | [field-keyword](https://github.com/dotnet/roslyn/tree/features/field-keyword) | [Merged into 17.12p3](https://github.com/dotnet/roslyn/issues/57012) | [Youssef1313](https://github.com/Youssef1313), [cston](https://github.com/cston) | [333fred](https://github.com/333fred), [RikkiGibson](https://github.com/RikkiGibson) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) |
| [First-class Span Types](https://github.com/dotnet/csharplang/issues/7905) | [FirstClassSpan](https://github.com/dotnet/roslyn/tree/features/FirstClassSpan) | [Merged into 17.13p1](https://github.com/dotnet/roslyn/issues/73445) | [jjonescz](https://github.com/jjonescz) | [cston](https://github.com/cston), [333fred](https://github.com/333fred) | | [333fred](https://github.com/333fred), [stephentoub](https://github.com/stephentoub) |
| [Unbound generic types in `nameof`](https://github.com/dotnet/csharplang/issues/8480) | [PR](https://github.com/dotnet/roslyn/pull/75368) | [Merged into 17.13p2](https://github.com/dotnet/roslyn/pull/75368) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | [jcouv](https://github.com/jcouv), [AlekseyTs](https://github.com/AlekseyTs) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) |
| [String literals in data section as UTF8](https://github.com/dotnet/roslyn/blob/main/docs/features/string-literals-data-section.md) | [PR](https://github.com/dotnet/roslyn/pull/76036) | [Merged into 17.14p1](https://github.com/dotnet/roslyn/issues/76234) | [jjonescz](https://github.com/jjonescz) | [AlekseyTs](https://github.com/AlekseyTs), [cston](https://github.com/cston) | N/A | N/A |
| [String literals in data section as UTF8](https://github.com/dotnet/roslyn/blob/main/docs/features/string-literals-data-section.md) | [PR](https://github.com/dotnet/roslyn/pull/76036) | [Merged into 17.13p4](https://github.com/dotnet/roslyn/issues/76234) | [jjonescz](https://github.com/jjonescz) | [AlekseyTs](https://github.com/AlekseyTs), [cston](https://github.com/cston) | N/A | N/A |
| [Simple lambda parameters with modifiers](https://github.com/dotnet/csharplang/blob/main/proposals/simple-lambda-parameters-with-modifiers.md) | [PR](https://github.com/dotnet/roslyn/pull/75400) | [Merged into 17.14p1](https://github.com/dotnet/roslyn/pull/75400) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | [jjonescz](https://github.com/jjonescz), [cston](https://github.com/cston) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) |

# Working Set VB
Expand Down Expand Up @@ -121,17 +122,17 @@ efforts behind them.
| [Skip locals init](https://github.com/dotnet/csharplang/issues/1738) | [localsinit](https://github.com/dotnet/roslyn/tree/features/localsinit) | [Merged](https://github.com/dotnet/roslyn/issues/25780) | [t-camaia](https://github.com/t-camaia), [agocke](https://github.com/agocke) | [jaredpar](https://github.com/jaredpar) | [agocke](https://github.com/agocke) |
| [Lambda discard parameters](https://github.com/dotnet/csharplang/issues/111) | main | [Merged](https://github.com/dotnet/roslyn/issues/38820) | [jcouv](https://github.com/jcouv) | [AlekseyTs](https://github.com/AlekseyTs), [chsienki](https://github.com/chsienki) | [jcouv](https://github.com/jcouv) |
| [Native ints](https://github.com/dotnet/csharplang/issues/435) | main | [Merged into 16.7p1](https://github.com/dotnet/roslyn/issues/38821) | [cston](https://github.com/cston) | [333fred](https://github.com/333fred), [gafter](https://github.com/gafter) | [jaredpar](https://github.com/jaredpar) |
| [Attributes on local functions](https://github.com/dotnet/csharplang/issues/1888) | [features/local-function-attributes](https://github.com/dotnet/roslyn/tree/features/local-function-attributes) | [Merged](https://github.com/dotnet/roslyn/issues/38801) | [RikkiGibson](https://github.com/RikkiGibson) | [agocke](https://github.com/agocke) | [agocke](https://github.com/agocke) |
| [Attributes on local functions](https://github.com/dotnet/csharplang/issues/1888) | [local-function-attributes](https://github.com/dotnet/roslyn/tree/features/local-function-attributes) | [Merged](https://github.com/dotnet/roslyn/issues/38801) | [RikkiGibson](https://github.com/RikkiGibson) | [agocke](https://github.com/agocke) | [agocke](https://github.com/agocke) |
| [Function pointers](https://github.com/dotnet/csharplang/issues/191) | main | [Merged into 16.7p3](https://github.com/dotnet/roslyn/issues/43321) | [333fred](https://github.com/333fred) | [AlekseyTs](https://github.com/AlekseyTs) | [jaredpar](https://github.com/jaredpar) |
| [Pattern matching improvements](https://github.com/dotnet/csharplang/issues/2850) | main | [Merged into 16.7p1](https://github.com/dotnet/roslyn/issues/40727) | [gafter](https://github.com/gafter) | [RikkiGibson](https://github.com/RikkiGibson),[agocke](https://github.com/agocke) | [gafter](https://github.com/gafter) |
| [Static lambdas](https://github.com/dotnet/csharplang/issues/275) | main | [Merged in 16.7p4](https://github.com/dotnet/roslyn/issues/39606) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | [jcouv](https://github.com/jcouv) | [jcouv](https://github.com/jcouv) |
| [Records](https://github.com/dotnet/csharplang/issues/39) | main | [Merged into 16.7p3](https://github.com/dotnet/roslyn/issues/40726) | [agocke](https://github.com/agocke) | [gafter](https://github.com/gafter), [333fred](https://github.com/333fred) | [agocke](https://github.com/agocke) |
| [Target-typed conditional](https://github.com/dotnet/csharplang/issues/2460) | [features/target-typing](https://github.com/dotnet/roslyn/tree/features/target-typing) | [Merged into 16.7p4](https://github.com/dotnet/roslyn/issues/43186) | [gafter](https://github.com/gafter) | [agocke](https://github.com/agocke), [RikkiGibson](https://github.com/RikkiGibson) | [gafter](https://github.com/gafter) |
| [Covariant](https://github.com/dotnet/csharplang/issues/49) [Returns](https://github.com/dotnet/csharplang/issues/2844) | [features/covariant-returns](https://github.com/dotnet/roslyn/tree/features/covariant-returns) | [Merged into 16.8p2](https://github.com/dotnet/roslyn/issues/43188) | [gafter](https://github.com/gafter) | [AlekseyTs](https://github.com/AlekseyTs), [agocke](https://github.com/agocke) | [gafter](https://github.com/gafter) |
| [Target-typed conditional](https://github.com/dotnet/csharplang/issues/2460) | [target-typing](https://github.com/dotnet/roslyn/tree/features/target-typing) | [Merged into 16.7p4](https://github.com/dotnet/roslyn/issues/43186) | [gafter](https://github.com/gafter) | [agocke](https://github.com/agocke), [RikkiGibson](https://github.com/RikkiGibson) | [gafter](https://github.com/gafter) |
| [Covariant](https://github.com/dotnet/csharplang/issues/49) [Returns](https://github.com/dotnet/csharplang/issues/2844) | [covariant-returns](https://github.com/dotnet/roslyn/tree/features/covariant-returns) | [Merged into 16.8p2](https://github.com/dotnet/roslyn/issues/43188) | [gafter](https://github.com/gafter) | [AlekseyTs](https://github.com/AlekseyTs), [agocke](https://github.com/agocke) | [gafter](https://github.com/gafter) |
| [Extension GetEnumerator](https://github.com/dotnet/csharplang/issues/3194) | main | [Merged into 16.8p2](https://github.com/dotnet/roslyn/issues/43184) | [YairHalberstadt](https://github.com/YairHalberstadt) | [333fred](https://github.com/333fred) | [333fred](https://github.com/333fred) |
| [Module initializers](https://github.com/dotnet/csharplang/blob/main/proposals/csharp-9.0/module-initializers.md) | main | [Merged in 16.7p4](https://github.com/dotnet/roslyn/issues/40500) | [RikkiGibson](https://github.com/RikkiGibson) [jnm2](https://github.com/jnm2)| [AlekseyTs](https://github.com/AlekseyTs) | [gafter](https://github.com/gafter) |
| [Extending Partial](https://github.com/dotnet/csharplang/blob/main/proposals/csharp-9.0/extending-partial-methods.md) | main | [Merged into 16.7p2](https://github.com/dotnet/roslyn/issues/43795) | [RikkiGibson](https://github.com/RikkiGibson) | [chsienki](https://github.com/chsienki) | [jaredpar](https://github.com/jaredpar) |
| [Top-level statements](https://github.com/dotnet/csharplang/blob/main/proposals/csharp-9.0/top-level-statements.md) | [features/SimplePrograms](https://github.com/dotnet/roslyn/tree/features/SimplePrograms) | [Merged into 16.7p3](https://github.com/dotnet/roslyn/issues/43563) | [AlekseyTs](https://github.com/AlekseyTs) | [cston](https://github.com/cston), [RikkiGibson](https://github.com/RikkiGibson) | [MadsTorgersen](https://github.com/MadsTorgersen) |
| [Top-level statements](https://github.com/dotnet/csharplang/blob/main/proposals/csharp-9.0/top-level-statements.md) | [SimplePrograms](https://github.com/dotnet/roslyn/tree/features/SimplePrograms) | [Merged into 16.7p3](https://github.com/dotnet/roslyn/issues/43563) | [AlekseyTs](https://github.com/AlekseyTs) | [cston](https://github.com/cston), [RikkiGibson](https://github.com/RikkiGibson) | [MadsTorgersen](https://github.com/MadsTorgersen) |

# C# 8.0

Expand Down
Loading
Loading