From a1355e048fae6c572a3e0a59b0fccc0905b0cf87 Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Tue, 26 Mar 2024 12:47:32 -0700
Subject: [PATCH] Revert EnableDefaultNoneItems false

---
 src/FSharp.Build/Microsoft.FSharp.NetSdk.props           | 9 ++++++++-
 .../tests/UnitTests/VisualFSharp.UnitTests.fsproj        | 1 -
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/FSharp.Build/Microsoft.FSharp.NetSdk.props b/src/FSharp.Build/Microsoft.FSharp.NetSdk.props
index 8cc3ba76eb9..792df8e2356 100644
--- a/src/FSharp.Build/Microsoft.FSharp.NetSdk.props
+++ b/src/FSharp.Build/Microsoft.FSharp.NetSdk.props
@@ -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>
diff --git a/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj b/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj
index 56f95a12ba0..5510d3dcb9c 100644
--- a/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj
+++ b/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj
@@ -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>