Skip to content

Commit 504f35b

Browse files
authored
Merge pull request #4452 from fsprojects/repo-assist/fix-issue-4443-slnx-restore-ee71a070001dd7c1
[repo-assist] Support .slnx solutions in paket restore (#4443)
2 parents 84d3331 + d8586ba commit 504f35b

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

‎RELEASE_NOTES.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#### Unreleased
22

3+
* Add support for `.slnx` solution files - https://github.com/fsprojects/Paket/issues/4443
34
* Do not warn about missing "redirects: force" for FSharp.Core in projects targeting net5.0 and later - https://github.com/fsprojects/Paket/issues/4455
45

56
#### 12.0.0-alpha001 - 2026-10-11

‎src/Paket.Core/Common/Utils.fs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,10 @@ let RunInLockedAccessMode(lockedFolder,lockedAction: unit -> bool) =
501501

502502
releaseLock 5
503503
if runDotNetRestore then
504-
let slnFiles = rootFolder.GetFiles("*.sln", SearchOption.TopDirectoryOnly)
504+
let slnFiles =
505+
[| yield! rootFolder.GetFiles("*.sln", SearchOption.TopDirectoryOnly)
506+
yield! rootFolder.GetFiles("*.slnx", SearchOption.TopDirectoryOnly) |]
507+
|> Array.distinctBy (fun f -> f.FullName)
505508
if Array.isEmpty slnFiles then
506509
let projFiles = rootFolder.GetFiles("*.*proj", SearchOption.TopDirectoryOnly)
507510

0 commit comments

Comments
 (0)