Skip to content

Commit c4c4dac

Browse files
authored
Revert EnableDefaultNoneItems false (#16953)
1 parent 58b4d08 commit c4c4dac

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

src/FSharp.Build/Microsoft.FSharp.NetSdk.props

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,14 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
3030
</Choose>
3131

3232
<PropertyGroup>
33-
<EnableDefaultCompileItems Condition=" '$(EnableDefaultCompileItems)' == '' ">false</EnableDefaultCompileItems> <!-- Do not glob F# source files -->
33+
<EnableDefaultCompileItems Condition=" '$(EnableDefaultCompileItems)' == '' ">false</EnableDefaultCompileItems> <!-- Do not glob F# source files -->
34+
<!--
35+
It turns out that the project system discovers Folders as a consequence of <SomeItem Include="path to files" />
36+
''''EnableDefaultNoneItems true'''' causes folders and .fsi files to be displayed in the wrong order. because
37+
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
38+
prior to the ````<Compile Include="" />```` in the .fsproj which messes with the display order in solution explorer.
39+
-->
40+
<EnableDefaultNoneItems Condition=" '$(EnableDefaultNoneItems)' == '' ">false</EnableDefaultNoneItems> <!-- Do not glob F# none items-->
3441
</PropertyGroup>
3542

3643
<PropertyGroup>

vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1111
<UsePackageTargetFallbackHack>true</UsePackageTargetFallbackHack>
1212
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
13-
<EnableDefaultNoneItems>false</EnableDefaultNoneItems>
1413
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
1514
<UnitTestType>nunit</UnitTestType>
1615
<IsTestProject>true</IsTestProject>

0 commit comments

Comments
 (0)