Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main to release/dev17.11 #17038

Merged
merged 10 commits into from
Apr 12, 2024
Merged

Merge main to release/dev17.11 #17038

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7bcdfba
Fix 16071 --- FSharp.DependencyManager.Nuget ignoring sources (#16991)
KevinRansom Apr 8, 2024
0993409
Fix StackOverflow in big-ish nested CEs (#17002)
vzarytovskii Apr 8, 2024
253c6a6
Parens: some more (#17012)
brianrourkeboll Apr 10, 2024
6b6cca9
Expected ↔ actual (#17014)
brianrourkeboll Apr 10, 2024
3c8490c
Fix MEF issues with options (#17015)
vzarytovskii Apr 11, 2024
7bade31
Update to 9p2 SDK (#17009)
vzarytovskii Apr 11, 2024
fae65c5
17.11 versioning (#17027)
vzarytovskii Apr 11, 2024
d6b2b13
Merge pull request #17034 from dotnet/merges/release/dev17.10-to-main
vzarytovskii Apr 12, 2024
e1343ce
Update azure-pipelines.yml
vzarytovskii Apr 12, 2024
f73da23
Merge branch 'release/dev17.11' into merges/main-to-release/dev17.11
vzarytovskii Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix MEF issues with options (#17015) 
It seems something changed about MEF import w.r.t. private members.
  • Loading branch information
@vzarytovskii
vzarytovskii authored Apr 11, 2024
commit 3c8490cc96c4f166cdb8d158b0e142114c826a78
2 changes: 1 addition & 1 deletion vsintegration/src/FSharp.Editor/Options/EditorOptions.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ type EditorOptions() =
member _.Formatting: FormattingOptions = store.Get()

[<Export(typeof<SettingsStore.ISettingsStore>)>]
member private _.SettingsStore = store
member _.SettingsStore = store

member _.With value = store.Register value

Expand Down
Loading