From 17f24c1411531306808b62b0dc830a27f08400db Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Wed, 17 Apr 2024 15:38:28 -0700
Subject: [PATCH 1/7] corebeforeafter

---
 src/FSharp.Build/Microsoft.FSharp.Targets     | 34 +++++++++++----
 src/FSharp.Core/FSharp.Core.fsproj            | 13 ++++++
 .../tests/CompileOrder - BeforeAndAfter.proj  | 42 +++++++++++++++++++
 tests/fsharp/SDKTests/tests/ToolsTest.targets |  5 ++-
 4 files changed, 86 insertions(+), 8 deletions(-)
 create mode 100644 tests/fsharp/SDKTests/tests/CompileOrder - BeforeAndAfter.proj

diff --git a/src/FSharp.Build/Microsoft.FSharp.Targets b/src/FSharp.Build/Microsoft.FSharp.Targets
index 3e5e347d12f..956d80fc554 100644
--- a/src/FSharp.Build/Microsoft.FSharp.Targets
+++ b/src/FSharp.Build/Microsoft.FSharp.Targets
@@ -235,7 +235,7 @@ this file.
         </FSharpEmbedResXSource>
 
         <ItemGroup>
-            <CompileBefore Include="@(_FsGeneratedResXSource)" />
+            <Compile Include="@(_FsGeneratedResXSource)" CompileOrder="CompileBefore" />
             <FsGeneratedSource Include="@(_FsGeneratedResXSource)" />
             <FileWrites Include="@(_FsGeneratedResXSource)" />
         </ItemGroup>
@@ -247,7 +247,7 @@ this file.
         </FSharpEmbedResourceText>
 
         <ItemGroup>
-            <CompileBefore Include="@(_FsGeneratedTxtSource)" />
+            <Compile Include="@(_FsGeneratedTxtSource)" CompileOrder="CompileBefore" />
             <FsGeneratedSource Include="@(_FsGeneratedTxtSource)" />
             <EmbeddedResource Include="@(_FsGeneratedResx)" />
             <FileWrites Include="@(_FsGeneratedTxtSource)" />
@@ -255,12 +255,31 @@ this file.
         </ItemGroup>
     </Target>
 
+    <Target Name="FSharpSourceCodeCompileOrder">
+        <!-- implement <CompileOrder>CompileBefore</CompileOrder> -->
+        <ItemGroup>
+            <__Sources Remove="*" />
+            <__Sources Include="@(Compile->WithMetadataValue('CompileOrder', 'CompileFirst'))" />
+            <__Sources Include="@(CompileBefore)" />
+            <__Sources Include="@(Compile->WithMetadataValue('CompileOrder', 'CompileBefore'))" />
+            <__Sources Include="@(Compile->WithMetadataValue('CompileOrder', ''))" />
+            <__Sources Include="@(Compile->WithMetadataValue('CompileOrder', 'CompileAfter'))" />
+            <__Sources Include="@(CompileAfter)" />
+            <__Sources Include="@(Compile->WithMetadataValue('CompileOrder', 'CompileLast'))" />
+        </ItemGroup>
+        <ItemGroup>
+            <Compile Remove="*" />
+            <CompileBefore Remove="*" />
+            <CompileAfter Remove="*" />
+            <Compile Include="@(__Sources)" />
+        </ItemGroup>
+        <Message Importance="low" Text="FSharpSourceCodeCompileOrder:Sources: '@(Sources)'" />
+    </Target>
+
     <Target
         Name="CoreCompile"
         Inputs="$(MSBuildAllProjects);
-                @(CompileBefore);
                 @(Compile);
-                @(CompileAfter);
                 @(FscCompilerTools);
                 @(_CoreCompileResourceInputs);
                 @(ManifestNonResxWithNoCultureOnDisk);
@@ -284,7 +303,7 @@ this file.
                  $(NonExistentFile);
                  @(CustomAdditionalCompileOutputs)"
         Returns="@(FscCommandLineArgs)"
-        DependsOnTargets="$(CoreCompileDependsOn)"
+        DependsOnTargets="$(CoreCompileDependsOn);FSharpSourceCodeCompileOrder"
     >
 
         <Error
@@ -321,6 +340,7 @@ this file.
             <EmbeddedFiles Include="@(FsGeneratedSource)"  KeepDuplicates="false" Condition="'$(SourceLink)'!='' or '$(EmbeddedFiles)'!='' or '$(EmbedAllSources)'!=''" />
         </ItemGroup>
 
+
         <!-- Dotnet SDK requires SimpleResolution to be true Legacy project system build not -->
         <PropertyGroup>
             <FscOtherFlags Condition="'$(SimpleResolution)' == 'true'">--simpleresolution $(OtherFlags)</FscOtherFlags>
@@ -371,7 +391,7 @@ this file.
               Resources="@(ActualEmbeddedResources)"
               SkipCompilerExecution="$(SkipCompilerExecution)"
               SourceLink="$(SourceLink)"
-              Sources="@(CompileBefore);@(Compile);@(CompileAfter)"
+              Sources="@(Compile)"
               SubsystemVersion="$(SubsystemVersion)"
               Tailcalls="$(Tailcalls)"
               TargetType="$(OutputType)"
@@ -434,7 +454,7 @@ this file.
             Overwrite="true"/>
 
         <ItemGroup Condition="'$(AdditionalSourcesText)' != ''">
-            <CompileBefore Include="$(TargetFrameworkMonikerAssemblyAttributesPath)" />
+            <Compile Include="$(TargetFrameworkMonikerAssemblyAttributesPath)"><CompileOrder>BeforeCompile</CompileOrder></Compile>
             <_FsGeneratedTfmAttributesSource Include="$(TargetFrameworkMonikerAssemblyAttributesPath)" />
         </ItemGroup>
     </Target>
diff --git a/src/FSharp.Core/FSharp.Core.fsproj b/src/FSharp.Core/FSharp.Core.fsproj
index 0f9fe0fb624..f3e27acaee6 100644
--- a/src/FSharp.Core/FSharp.Core.fsproj
+++ b/src/FSharp.Core/FSharp.Core.fsproj
@@ -61,12 +61,25 @@
     </EmbeddedResource>
     <EmbeddedResource Include="ILLink.LinkAttributes.xml" LogicalName="ILLink.LinkAttributes.xml" />
     <EmbeddedResource Include="ILLink.Substitutions.xml" LogicalName="ILLink.Substitutions.xml" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(Configuration)' == 'Proto'">
+    <!-- This can be removed once CompileBefore support is shipped in an rtm relase -->
     <CompileBefore Include="prim-types-prelude.fsi">
       <Link>Primitives/prim-types-prelude.fsi</Link>
     </CompileBefore>
     <CompileBefore Include="prim-types-prelude.fs">
       <Link>Primitives/prim-types-prelude.fs</Link>
     </CompileBefore>
+  </ItemGroup>
+  <ItemGroup Condition="'$(Configuration)' != 'Proto'">
+    <Compile Include="prim-types-prelude.fsi" CompileOrder="CompileFirst">
+      <Link>Primitives/prim-types-prelude.fsi</Link>
+    </Compile>
+    <Compile Include="prim-types-prelude.fs" CompileOrder="CompileFirst">
+      <Link>Primitives/prim-types-prelude.fs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
     <Compile Include="prim-types.fsi">
       <Link>Primitives/prim-types.fsi</Link>
     </Compile>
diff --git a/tests/fsharp/SDKTests/tests/CompileOrder - BeforeAndAfter.proj b/tests/fsharp/SDKTests/tests/CompileOrder - BeforeAndAfter.proj
new file mode 100644
index 00000000000..55134523861
--- /dev/null
+++ b/tests/fsharp/SDKTests/tests/CompileOrder - BeforeAndAfter.proj	
@@ -0,0 +1,42 @@
+<Project ToolsVersion="4.0" DefaultTargets="Test" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Initialize Variables -->
+  <PropertyGroup>
+    <FSharpCompilerPath></FSharpCompilerPath>
+  </PropertyGroup>
+
+  <!-- Expected Values -->
+  <PropertyGroup>
+    <ExpectedFSharpShimPresent>true</ExpectedFSharpShimPresent>
+    <ExpectedFSharpCompilerPath>/Common7/IDE/CommonExtensions/Microsoft/FSharp/Tools/</ExpectedFSharpCompilerPath>
+    <ExpectedFscToolExe>fscAnyCpu.exe</ExpectedFscToolExe>
+    <ExpectedFscToolPath>_VsInstallRoot_/Common7/IDE/CommonExtensions/Microsoft/FSharp/Tools/</ExpectedFscToolPath>
+    <ExpectedDotnetFscCompilerPath></ExpectedDotnetFscCompilerPath>
+    <ExpectedCompile>One;Two;Three;Four;Five;Six;Seven;Eight;Nine;Ten;Eleven;Twelve;Thirteen;Fourteen</ExpectedCompile>
+  </PropertyGroup>
+
+  <Import Project="ToolsTest.props" />
+
+  <PropertyGroup>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <CompileAfter Include="Eleven" />
+    <Compile Include="Thirteen" CompileOrder="CompileLast" />
+    <CompileBefore Include="Three" />
+    <CompileAfter Include="Twelve" />
+    <CompileBefore Include="Four" />
+    <Compile Include="Seven" />
+    <Compile Include="Eight" />
+    <Compile Include="Five" CompileOrder="CompileBefore" />
+    <Compile Include="One" CompileOrder="CompileFirst" />
+    <Compile Include="Nine" CompileOrder="CompileAfter" />
+    <Compile Include="Fourteen" CompileOrder="CompileLast" />
+    <Compile Include="Ten" CompileOrder="CompileAfter" />
+    <Compile Include="Two" CompileOrder="CompileFirst" />
+    <Compile Include="Six" CompileOrder="CompileBefore" />
+  </ItemGroup>
+
+  <Import Project="ToolsTest.targets" />
+
+</Project>
diff --git a/tests/fsharp/SDKTests/tests/ToolsTest.targets b/tests/fsharp/SDKTests/tests/ToolsTest.targets
index 7a4138e5eed..855c676f000 100644
--- a/tests/fsharp/SDKTests/tests/ToolsTest.targets
+++ b/tests/fsharp/SDKTests/tests/ToolsTest.targets
@@ -4,10 +4,11 @@
 
   <Import Project="$(TargetsDirectory)\Microsoft.FSharp.targets" />
 
-  <Target Name="Test">
+  <Target Name="Test" DependsOnTargets="FSharpSourceCodeCompileOrder">
     <Message Importance="High" Text="===========================================================================================================" />
     <Message Importance="High" Text="Testing : $(MSBuildProjectName)" />
 
+
     <!-- check for expected settings -->
     <Error Condition="'$(ExpectedFSharpShimPresent)' != '$(FSharp_Shim_Present)'" Text="FSharp_Shim_Present expected:'$(ExpectedFSharpShimPresent)' actual: '$(FSharp_Shim_Present)'" />
 
@@ -17,6 +18,8 @@
 
     <Error Condition="'$(ExpectedFscToolPath)' != '$(FscToolPath)'" Text="FscToolPath:  expected:'$(ExpectedFscToolPath)' actual:'$(FscToolPath)'" />
 
+    <Error Condition="'$(ExpectedCompile)' != '' and  '$(ExpectedCompile)' != '@(Sources)'" Text="ExpectedCompile:  expected:'$(ExpectedCompile)' actual:'@(Compile)'" />
+
     <Error Condition="'$(ExpectedDotnetFscCompilerPath)' == '' and '$(DotnetFscCompilerPath)' != ''" Text="DotnetFscCompilerPath expected to be empty actual:'$(DotnetFscCompilerPath)'" />
 
     <Error Condition="'$(ExpectedDotnetFscCompilerPath)' != '' and $([System.String]::new('$(DotnetFscCompilerPath)').EndsWith('$(ExpectedDotnetFscCompilerPath)')) == true" Text="DotnetFscCompilerPath expected to end with:  '$(ExpectedDotnetFscCompilerPath)' actual:'$(DotnetFscCompilerPath)'" />

From 41ce9b53a0ab39b4d39cfa0743a32d0d58192def Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Wed, 17 Apr 2024 16:01:04 -0700
Subject: [PATCH 2/7] depends

---
 src/FSharp.Build/Microsoft.FSharp.Targets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/FSharp.Build/Microsoft.FSharp.Targets b/src/FSharp.Build/Microsoft.FSharp.Targets
index 956d80fc554..41e868d0c74 100644
--- a/src/FSharp.Build/Microsoft.FSharp.Targets
+++ b/src/FSharp.Build/Microsoft.FSharp.Targets
@@ -279,7 +279,9 @@ this file.
     <Target
         Name="CoreCompile"
         Inputs="$(MSBuildAllProjects);
+                @(CompileBefore);
                 @(Compile);
+                @(CompileAfter);
                 @(FscCompilerTools);
                 @(_CoreCompileResourceInputs);
                 @(ManifestNonResxWithNoCultureOnDisk);

From 30473f312b3ce2c183e6afb4b01b5d030eb6733f Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Wed, 17 Apr 2024 16:13:44 -0700
Subject: [PATCH 3/7] temp

---
 src/FSharp.Build/Microsoft.FSharp.Targets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/FSharp.Build/Microsoft.FSharp.Targets b/src/FSharp.Build/Microsoft.FSharp.Targets
index 41e868d0c74..f0c909669e1 100644
--- a/src/FSharp.Build/Microsoft.FSharp.Targets
+++ b/src/FSharp.Build/Microsoft.FSharp.Targets
@@ -271,6 +271,8 @@ this file.
             <Compile Remove="*" />
             <CompileBefore Remove="*" />
             <CompileAfter Remove="*" />
+        </ItemGroup>
+        <ItemGroup>
             <Compile Include="@(__Sources)" />
         </ItemGroup>
         <Message Importance="low" Text="FSharpSourceCodeCompileOrder:Sources: '@(Sources)'" />

From 700ee3c4fc8f47f07895e68151cd176371707537 Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Wed, 17 Apr 2024 16:25:50 -0700
Subject: [PATCH 4/7] temp

---
 src/FSharp.Build/Microsoft.FSharp.Targets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/FSharp.Build/Microsoft.FSharp.Targets b/src/FSharp.Build/Microsoft.FSharp.Targets
index f0c909669e1..5ba96f9da08 100644
--- a/src/FSharp.Build/Microsoft.FSharp.Targets
+++ b/src/FSharp.Build/Microsoft.FSharp.Targets
@@ -258,7 +258,7 @@ this file.
     <Target Name="FSharpSourceCodeCompileOrder">
         <!-- implement <CompileOrder>CompileBefore</CompileOrder> -->
         <ItemGroup>
-            <__Sources Remove="*" />
+            <__Sources Remove="@(__Sources)" />
             <__Sources Include="@(Compile->WithMetadataValue('CompileOrder', 'CompileFirst'))" />
             <__Sources Include="@(CompileBefore)" />
             <__Sources Include="@(Compile->WithMetadataValue('CompileOrder', 'CompileBefore'))" />
@@ -268,9 +268,9 @@ this file.
             <__Sources Include="@(Compile->WithMetadataValue('CompileOrder', 'CompileLast'))" />
         </ItemGroup>
         <ItemGroup>
-            <Compile Remove="*" />
-            <CompileBefore Remove="*" />
-            <CompileAfter Remove="*" />
+            <Compile Remove="@(Compile)" />
+            <CompileBefore Remove="@(CompileBefore)" />
+            <CompileAfter Remove="@(CompileAfter)" />
         </ItemGroup>
         <ItemGroup>
             <Compile Include="@(__Sources)" />

From 3e85b41989fd5eb80c42a2b0dc616a88f2337c18 Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Wed, 17 Apr 2024 16:32:58 -0700
Subject: [PATCH 5/7] tweak

---
 src/FSharp.Build/Microsoft.FSharp.Targets | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/FSharp.Build/Microsoft.FSharp.Targets b/src/FSharp.Build/Microsoft.FSharp.Targets
index 5ba96f9da08..d7f454b2979 100644
--- a/src/FSharp.Build/Microsoft.FSharp.Targets
+++ b/src/FSharp.Build/Microsoft.FSharp.Targets
@@ -271,8 +271,6 @@ this file.
             <Compile Remove="@(Compile)" />
             <CompileBefore Remove="@(CompileBefore)" />
             <CompileAfter Remove="@(CompileAfter)" />
-        </ItemGroup>
-        <ItemGroup>
             <Compile Include="@(__Sources)" />
         </ItemGroup>
         <Message Importance="low" Text="FSharpSourceCodeCompileOrder:Sources: '@(Sources)'" />

From e7a2c115e91c3dd88eef92ec82050f723548810b Mon Sep 17 00:00:00 2001
From: KevinRansom <codecutter@hotmail.com>
Date: Thu, 18 Apr 2024 00:17:17 -0700
Subject: [PATCH 6/7] tweak

---
 src/FSharp.Build/Microsoft.FSharp.Targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/FSharp.Build/Microsoft.FSharp.Targets b/src/FSharp.Build/Microsoft.FSharp.Targets
index d7f454b2979..26999e6a646 100644
--- a/src/FSharp.Build/Microsoft.FSharp.Targets
+++ b/src/FSharp.Build/Microsoft.FSharp.Targets
@@ -273,7 +273,7 @@ this file.
             <CompileAfter Remove="@(CompileAfter)" />
             <Compile Include="@(__Sources)" />
         </ItemGroup>
-        <Message Importance="low" Text="FSharpSourceCodeCompileOrder:Sources: '@(Sources)'" />
+        <Message Importance="low" Text="FSharpSourceCodeCompileOrder:Sources: '@(__Sources)'" />
     </Target>
 
     <Target
@@ -456,7 +456,7 @@ this file.
             Overwrite="true"/>
 
         <ItemGroup Condition="'$(AdditionalSourcesText)' != ''">
-            <Compile Include="$(TargetFrameworkMonikerAssemblyAttributesPath)"><CompileOrder>BeforeCompile</CompileOrder></Compile>
+            <Compile Include="$(TargetFrameworkMonikerAssemblyAttributesPath)"><CompileOrder>CompileBefore</CompileOrder></Compile>
             <_FsGeneratedTfmAttributesSource Include="$(TargetFrameworkMonikerAssemblyAttributesPath)" />
         </ItemGroup>
     </Target>

From fbcb4d7c52e9def4bd44874e910101d40ada4abe Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Thu, 18 Apr 2024 10:36:01 -0700
Subject: [PATCH 7/7] typo

---
 tests/fsharp/SDKTests/tests/ToolsTest.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fsharp/SDKTests/tests/ToolsTest.targets b/tests/fsharp/SDKTests/tests/ToolsTest.targets
index 855c676f000..3e68a5af856 100644
--- a/tests/fsharp/SDKTests/tests/ToolsTest.targets
+++ b/tests/fsharp/SDKTests/tests/ToolsTest.targets
@@ -18,7 +18,7 @@
 
     <Error Condition="'$(ExpectedFscToolPath)' != '$(FscToolPath)'" Text="FscToolPath:  expected:'$(ExpectedFscToolPath)' actual:'$(FscToolPath)'" />
 
-    <Error Condition="'$(ExpectedCompile)' != '' and  '$(ExpectedCompile)' != '@(Sources)'" Text="ExpectedCompile:  expected:'$(ExpectedCompile)' actual:'@(Compile)'" />
+    <Error Condition="'$(ExpectedCompile)' != '' and  '$(ExpectedCompile)' != '@(Compile)'" Text="ExpectedCompile:  expected:'$(ExpectedCompile)' actual:'@(Compile)'" />
 
     <Error Condition="'$(ExpectedDotnetFscCompilerPath)' == '' and '$(DotnetFscCompilerPath)' != ''" Text="DotnetFscCompilerPath expected to be empty actual:'$(DotnetFscCompilerPath)'" />