Fix ordering, set tfm before we account for building without arcade

Author: vzarytovskii

Directory.Build.props

@@ -21,6 +21,29 @@
       <BUILDING_USING_DOTNET>true</BUILDING_USING_DOTNET>
   </PropertyGroup>
 
+  <!-- To support source-build for the "next" version of .NET without forcing this repo to use it,
+      we can utilize arcade's $(NetCurrent) property, and set it ourselves in the arcade-less scenarios. 
+      For FCS solution, we set it to one for current dev cycle.
+      When used with arcade, and inserting/building for net8 branches, it will set it to net8.0,
+      for net9 branches to net9.0 and so on -->
+  <Choose>
+    <!-- Once we move to OOP in VS, and major dependants of FCS will move to netcore (not netstandard),
+         we should also support $(NetPrevious) for all releases.
+         This will likely include FCS and FSharp.Core as well ash shipped products.
+         Right now, it only covers producs we ship (FSC and FSI), not NuGet packages. -->
+    <When
+      Condition="'$(DotNetBuildFromSource)' == 'true' AND '$(DotNetBuildFromSourceFlavor)' == 'Product'">
+      <PropertyGroup>
+        <FSharpNetCoreProductTargetFramework>$(NetCurrent)</FSharpNetCoreProductTargetFramework>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <FSharpNetCoreProductTargetFramework>net8.0</FSharpNetCoreProductTargetFramework>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
   <Import Project="$(RepoRoot)/Directory.Build.props.user" Condition="Exists('$(RepoRoot)/Directory.Build.props.user')" />
 
   <PropertyGroup Condition="'$(BUILDING_USING_DOTNET)' == 'true'">
@@ -44,26 +67,5 @@
     <!-- If there is a README.md next to a project file, include it (for easier access in the IDE) -->
     <None Include="README.md" Condition="Exists('README.md')" />
   </ItemGroup>
-  
-  <!-- To support source-build for the "next" version of .NET without forcing this repo to use it,
-      we can utilize arcade's $(NetCurrent) property, and set it ourselves in the arcade-less scenarios. 
-      For FCS solution, we set it to one for current dev cycle.
-      When used with arcade, and inserting/building for net8 branches, it will set it to net8.0,
-      for net9 branches to net9.0 and so on -->
-  <Choose>
-    <!-- Once we move to OOP in VS, and major dependants of FCS will move to netcore (not netstandard), we should also support $(NetPrevious) for all releases.
-         This will likely include FCS and FSharp.Core as well ash shipped products.
-         Right now, it only covers producs we ship (FSC and FSI), not NuGet packages. -->
-    <When Condition="'$(DotNetBuildFromSource)' == 'true' AND '$(DotNetBuildFromSourceFlavor)' == 'Product'">
-      <PropertyGroup>
-        <FSharpNetCoreProductTargetFramework>$(NetCurrent)</FSharpNetCoreProductTargetFramework>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <FSharpNetCoreProductTargetFramework>net8.0</FSharpNetCoreProductTargetFramework>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
 
 </Project>