Skip to content

Revert EnableDefaultNoneItems false #16953

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

Merged
merged 2 commits into from
Mar 27, 2024
Merged

Revert EnableDefaultNoneItems false #16953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1355e0
Revert EnableDefaultNoneItems false
KevinRansom Mar 26, 2024
38d6c23
Merge branch 'main' into Fix16943
KevinRansom Mar 26, 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
9 changes: 8 additions & 1 deletion src/FSharp.Build/Microsoft.FSharp.NetSdk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,14 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
</Choose>

<PropertyGroup>
<EnableDefaultCompileItems Condition=" '$(EnableDefaultCompileItems)' == '' ">false</EnableDefaultCompileItems> <!-- Do not glob F# source files -->
<EnableDefaultCompileItems Condition=" '$(EnableDefaultCompileItems)' == '' ">false</EnableDefaultCompileItems> <!-- Do not glob F# source files -->
<!--
It turns out that the project system discovers Folders as a consequence of <SomeItem Include="path to files" />
''''EnableDefaultNoneItems true'''' causes folders and .fsi files to be displayed in the wrong order. because
Discovers Folders as a consequence of ````<SomeItem Include="path to files" />```` which EnableDefaultNoneItems causes folders and .fsi files to be located in the solution folder
prior to the ````<Compile Include="" />```` in the .fsproj which messes with the display order in solution explorer.
-->
<EnableDefaultNoneItems Condition=" '$(EnableDefaultNoneItems)' == '' ">false</EnableDefaultNoneItems> <!-- Do not glob F# none items-->
</PropertyGroup>

<PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<UsePackageTargetFallbackHack>true</UsePackageTargetFallbackHack>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<EnableDefaultNoneItems>false</EnableDefaultNoneItems>
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
<UnitTestType>nunit</UnitTestType>
<IsTestProject>true</IsTestProject>
Expand Down