Yeet fx_reshaped_msbuild (#9780)

* Yeet fx_reshaped_msbuild

* Update fcs build

Author: KevinRansom

FSharp.Profiles.props

@@ -19,7 +19,6 @@
     <DefineConstants>$(DefineConstants);FX_NO_WINFORMS</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_INDENTED_TEXT_WRITER</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_RESHAPED_REFEMIT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_RESHAPED_MSBUILD</DefineConstants>
     <OtherFlags>$(OtherFlags) --simpleresolution</OtherFlags>
   </PropertyGroup>
 

eng/Versions.props

@@ -106,7 +106,7 @@
     <MicrosoftCodeAnalysisTestResourcesProprietaryVersion>2.0.17</MicrosoftCodeAnalysisTestResourcesProprietaryVersion>
     <MicrosoftVisualStudioLanguageServicesVersion>$(RoslynVersion)</MicrosoftVisualStudioLanguageServicesVersion>
     <!-- Microsoft Build packages -->
-    <MicrosoftBuildOverallPackagesVersion>16.4</MicrosoftBuildOverallPackagesVersion>
+    <MicrosoftBuildOverallPackagesVersion>16.6</MicrosoftBuildOverallPackagesVersion>
     <MicrosoftBuildVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildVersion>
     <MicrosoftBuildFrameworkVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildFrameworkVersion>
     <MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildTasksCoreVersion>

fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj

@@ -287,9 +287,6 @@
     <Compile Include="$(FSharpSourcesRoot)/absil/ilreflect.fs">
       <Link>AbsIL/ilreflect.fs</Link>
     </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\utils\reshapedmsbuild.fs">
-      <Link>ReferenceResolution/reshapedmsbuild.fs</Link>
-    </Compile>
     <Compile Include="$(FSharpSourcesRoot)/fsharp/ReferenceResolver.fs">
       <Link>ReferenceResolution/ReferenceResolver.fs</Link>
     </Compile>

src/fsharp/LegacyMSBuildReferenceResolver.fs

@@ -5,12 +5,6 @@ module LegacyMSBuildReferenceResolver
     open System
     open System.IO
     open System.Reflection
-
-#if FX_RESHAPED_MSBUILD
-    open FSharp.Compiler.MsBuildAdapters
-    open FSharp.Compiler.ToolLocationHelper
-#endif
-
     open FSharp.Compiler.AbstractIL.Internal.Library 
     open FSharp.Compiler.ReferenceResolver
     open Microsoft.Build.Tasks
@@ -137,7 +131,6 @@ module LegacyMSBuildReferenceResolver
                 else Net45 // version is 4.5 assumed since this code is running.
             with _ -> Net45
 
-#if !FX_RESHAPED_MSBUILD
         // 1.   First look to see if we can find the highest installed set of dotnet reference assemblies, if yes then select that framework
         // 2.   Otherwise ask msbuild for the highestinstalled framework
         let checkFrameworkForReferenceAssemblies (dotNetVersion:string) =
@@ -153,9 +146,6 @@ module LegacyMSBuildReferenceResolver
         match SupportedDesktopFrameworkVersions |> Seq.tryFind(fun v -> checkFrameworkForReferenceAssemblies v) with
         | Some v -> v
         | None -> getHighestInstalledDotNETFramework()
-#else
-        getHighestInstalledDotNETFramework()
-#endif
 
     /// Derive the target framework directories.
     let DeriveTargetFrameworkDirectories (targetFrameworkVersion:string, logMessage) =
@@ -270,17 +260,10 @@ module LegacyMSBuildReferenceResolver
         let engine = 
             { new IBuildEngine with 
               member __.BuildProjectFile(projectFileName, targetNames, globalProperties, targetOutputs) = true
-#if FX_RESHAPED_MSBUILD 
-              member __.LogCustomEvent(e) =  protect (fun () -> logMessage ((e.GetPropertyValue("Message")) :?> string))
-              member __.LogErrorEvent(e) =   protect (fun () -> logDiagnostic true ((e.GetPropertyValue("Code")) :?> string) ((e.GetPropertyValue("Message")) :?> string))
-              member __.LogMessageEvent(e) = protect (fun () -> logMessage ((e.GetPropertyValue("Message")) :?> string))
-              member __.LogWarningEvent(e) = protect (fun () -> logDiagnostic false ((e.GetPropertyValue("Code")) :?> string)  ((e.GetPropertyValue("Message")) :?> string))
-#else 
               member __.LogCustomEvent(e) =  protect (fun () -> logMessage e.Message)
               member __.LogErrorEvent(e) =   protect (fun () -> logDiagnostic true e.Code e.Message)
               member __.LogMessageEvent(e) = protect (fun () -> logMessage e.Message)
               member __.LogWarningEvent(e) = protect (fun () -> logDiagnostic false e.Code e.Message)
-#endif 
               member __.ColumnNumberOfTaskNode with get() = 1 
               member __.LineNumberOfTaskNode with get() = 1 
               member __.ContinueOnError with get() = true 
@@ -329,15 +312,10 @@ module LegacyMSBuildReferenceResolver
              |]    
 
         let assemblies = 
-#if FX_RESHAPED_MSBUILD
-            ignore references
-            [||]
-#else
             [| for (referenceName,baggage) in references -> 
                let item = new Microsoft.Build.Utilities.TaskItem(referenceName) :> ITaskItem
                item.SetMetadata("Baggage", baggage)
                item |]
-#endif
         let rar = 
             ResolveAssemblyReference(BuildEngine=engine, TargetFrameworkDirectories=targetFrameworkDirectories,
                                      FindRelatedFiles=false, FindDependencies=false, FindSatellites=false, 

src/fsharp/SimulatedMSBuildReferenceResolver.fs

@@ -35,15 +35,13 @@ let private SimulatedMSBuildResolver =
             | None -> "v4.5"
 
         member __.DotNetFrameworkReferenceAssembliesRootDirectory =
-#if !FX_RESHAPED_MSBUILD
             if System.Environment.OSVersion.Platform = System.PlatformID.Win32NT then
                 let PF =
                     match Environment.GetEnvironmentVariable("ProgramFiles(x86)") with
                     | null -> Environment.GetEnvironmentVariable("ProgramFiles")  // if PFx86 is null, then we are 32-bit and just get PF
                     | s -> s
                 PF + @"\Reference Assemblies\Microsoft\Framework\.NETFramework"
             else
-#endif
                 ""
 
         member __.Resolve(resolutionEnvironment, references, targetFrameworkVersion, targetFrameworkDirectories, targetProcessorArchitecture,
@@ -105,7 +103,6 @@ let private SimulatedMSBuildResolver =
                             success r
                 with e -> logWarningOrError false "SR001" (e.ToString())
 
-#if !FX_RESHAPED_MSBUILD
                 // For this one we need to get the version search exactly right, without doing a load
                 try
                     if not found && r.StartsWithOrdinal("FSharp.Core, Version=") && Environment.OSVersion.Platform = PlatformID.Win32NT then
@@ -120,7 +117,6 @@ let private SimulatedMSBuildResolver =
                         if FileSystem.SafeExists trialPath then
                             success trialPath
                 with e -> logWarningOrError false "SR001" (e.ToString())
-#endif
 
                 let isFileName =
                     r.EndsWith("dll", StringComparison.OrdinalIgnoreCase) ||
@@ -136,7 +132,6 @@ let private SimulatedMSBuildResolver =
                             success trialPath
                   with e -> logWarningOrError false "SR001" (e.ToString())
 
-#if !FX_RESHAPED_MSBUILD
                 try
                     // Search the GAC on Windows
                     if not found && not isFileName && Environment.OSVersion.Platform = PlatformID.Win32NT then
@@ -178,7 +173,6 @@ let private SimulatedMSBuildResolver =
                                             if FileSystem.SafeExists trialPath then
                                                 success trialPath
                 with e -> logWarningOrError false "SR001" (e.ToString())
-#endif
 
             results.ToArray() }