Remove --simpleresolution from other flags

FSharp.Profiles.props

@@ -47,7 +47,7 @@
     <DefineConstants>$(DefineConstants);FX_RESHAPED_GLOBALIZATION</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_RESHAPED_REFLECTION</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_RESHAPED_MSBUILD</DefineConstants>
-    <OtherFlags>$(OtherFlags) --simpleresolution</OtherFlags>
+    <OtherFlags Condition="'$(SimpleResolution)' == ''">$(OtherFlags) --simpleresolution</OtherFlags>
   </PropertyGroup>
 
 </Project>

src/fsharp/FSharp.Build/Fsc.fs

@@ -55,6 +55,7 @@ type public Fsc () as this =
     let mutable references : ITaskItem[] = [||]
     let mutable referencePath : string = null
     let mutable resources : ITaskItem[] = [||]
+    let mutable simpleResolution:bool = false
     let mutable skipCompilerExecution : bool  = false
     let mutable sources : ITaskItem[] = [||]
     let mutable sourceLink : string = null
@@ -156,6 +157,7 @@ type public Fsc () as this =
 
         // VersionFile
         builder.AppendSwitchIfNotNull("--versionfile:", versionFile)
+
         // References
         if references <> null then 
             for item in references do
@@ -238,6 +240,9 @@ type public Fsc () as this =
 
         builder.AppendSwitch("--nocopyfsharpcore")
 
+        // SimpleResolution
+        if simpleResolution then builder.AppendSwitch("--simpleresolution")
+
         // OtherFlags - must be second-to-last
         builder.AppendSwitchUnquotedIfNotNull("", otherFlags)
         capturedArguments <- builder.CapturedArguments()
@@ -394,6 +399,10 @@ type public Fsc () as this =
         with get() = resources
         and set(a) = resources <- a
 
+    member fsc.SimpleResolution
+        with get() = simpleResolution
+        and set(p) = simpleResolution <- p
+
     member fsc.SkipCompilerExecution
         with get() = skipCompilerExecution
         and set(p) = skipCompilerExecution <- p

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

@@ -41,6 +41,7 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
     <WarningLevel Condition=" '$(WarningLevel)' == '' ">3</WarningLevel>
     <WarningsAsErrors>3239;$(WarningsAsErrors)</WarningsAsErrors>
     <UseStandardResourceNames Condition=" '$(UseStandardResourceNames)' == '' ">true</UseStandardResourceNames>
+    <SimpleResolution Condition=" '$(SimpleResolution)' == '' ">true</SimpleResolution>
     <FsiExec Condition=" '$(FsiExec)' == '' ">true</FsiExec>
   </PropertyGroup>
 

src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets

@@ -39,7 +39,6 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
     <TargetProfile Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' " >mscorlib</TargetProfile>
     <TargetProfile Condition=" '$(TargetFrameworkIdentifier)' != '.NETFramework' " >netcore</TargetProfile>
     <TargetProfile Condition=" '$(TargetFrameworkIdentifier)' == '.NETStandard' and '$(_TargetFrameworkVersionWithoutV)' >= '2.0' " >netstandard</TargetProfile>
-    <OtherFlags>$(OtherFlags) --simpleresolution</OtherFlags>
   </PropertyGroup>
 
   <Import Project="Microsoft.FSharp.Targets" />

src/fsharp/FSharp.Build/Microsoft.FSharp.Targets

@@ -297,6 +297,7 @@ this file.
               References="@(ReferencePath)"
               ReferencePath="$(ReferencePath)"
               Resources="@(ActualEmbeddedResources)"
+              SimpleResolution="$(SimpleResolution)"
               SkipCompilerExecution="$(SkipCompilerExecution)"
               SourceLink="$(SourceLink)"
               Sources="@(CompileBefore);@(Compile);@(CompileAfter)"