Fix master CI (#5564)

* Binding redirects and update Microsoft.Build.* packages to latest

* Update checked in binaries for FSharp.Data

build.cmd

@@ -1,5 +1,5 @@
 rem Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
-@if "%_echo%"=="" echo off 
+@if "%_echo%"=="" echo off
 
 setlocal enableDelayedExpansion
 

build/targets/PackageVersions.props

@@ -20,7 +20,7 @@
     <MicrosoftVisualStudioLanguageServicesPackageVersion>$(RoslynPackageVersion)</MicrosoftVisualStudioLanguageServicesPackageVersion>
 
     <!-- Microsoft Build packages -->
-    <MicrosoftBuildOverallPackagesVersion>15.6.85</MicrosoftBuildOverallPackagesVersion>
+    <MicrosoftBuildOverallPackagesVersion>15.8.166</MicrosoftBuildOverallPackagesVersion>
     <MicrosoftBuildPackageVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildPackageVersion>
     <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildTasksCorePackageVersion>

fcs/FSharp.Compiler.Service.Tests/App.config

@@ -3,6 +3,10 @@
   <runtime>
     <legacyUnhandledExceptionPolicy enabled="true" />
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="2.0.0.0-4.5.0.0" newVersion="4.5.0.0"/>
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <startup>

packages.config

@@ -25,10 +25,10 @@
   <package id="Microsoft.Build.Utilities.Core" version="14.3.0" />
   <package id="Microsoft.Build.Tasks.Core" version="14.3.0" />
 
-  <package id="Microsoft.Build" version="15.6.85" />
-  <package id="Microsoft.Build.Framework" version="15.6.85" />
-  <package id="Microsoft.Build.Utilities.Core" version="15.6.85" />
-  <package id="Microsoft.Build.Tasks.Core" version="15.6.85" />
+  <package id="Microsoft.Build" version="15.8.166" />
+  <package id="Microsoft.Build.Framework" version="15.8.166" />
+  <package id="Microsoft.Build.Utilities.Core" version="15.8.166" />
+  <package id="Microsoft.Build.Tasks.Core" version="15.8.166" />
   <package id="System.IO.Compression" version="4.3.0" />
 
   <!-- Testing -->

vsintegration/tests/GetTypesVSUnitTests/GetTypesVSUnitTests.fsproj

@@ -18,7 +18,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="EnvDTE80" Version="$(EnvDTE80PackageVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;build;analyzers;native" />
     <PackageReference Include="NUnit" Version="$(NUnitPackageVersion)" />
+    <PackageReference Include="VSSDK.VSLangProj.8" Version="$(VSSDKVSLangProj8PackageVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;build;analyzers;native" />
   </ItemGroup>
 
   <ItemGroup>

vsintegration/tests/UnitTests/App.config

@@ -33,5 +33,11 @@
         <bindingRedirect oldVersion="0.0.0.0-15.1.0.0" newVersion="15.1.0.0" />
       </dependentAssembly>
     </assemblyBinding>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="2.0.0.0-4.5.0.0" newVersion="4.5.0.0"/>
+      </dependentAssembly>
+    </assemblyBinding>
   </runtime>
 </configuration>

vsintegration/tests/UnitTests/LegacyProjectSystem/Tests.ProjectSystem.Configs.fs

@@ -13,6 +13,7 @@ open NUnit.Framework
 // VS namespaces 
 open Microsoft.VisualStudio
 open Microsoft.VisualStudio.Shell.Interop
+open Microsoft.VisualStudio.FSharp
 open Microsoft.VisualStudio.FSharp.ProjectSystem
 
 // Internal unittest namespaces
@@ -22,6 +23,12 @@ open UnitTests.TestLib.Utils.FilesystemHelpers
 open UnitTests.TestLib.ProjectSystem
 
 
+[<SetUpFixture>]
+type public AssemblyResolverTestFixture () =
+
+    [<OneTimeSetUp>]
+    member public __.Init () = AssemblyResolver.addResolver ()
+
 [<TestFixture>][<Category "ProjectSystem">]
 type Config() = 
     inherit TheTests()

vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj

@@ -189,7 +189,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EnvDTE80" Version="$(EnvDTE80PackageVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
+    <PackageReference Include="EnvDTE80" Version="$(EnvDTE80PackageVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;build;analyzers;native" />
     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;analyzers;native" />
     <PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures" Version="$(MicrosoftCodeAnalysisEditorFeaturesPackageVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;analyzers;native" />
     <PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="$(MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;analyzers;native" />
@@ -217,7 +217,7 @@
     <PackageReference Include="NUnit" Version="$(NUnitPackageVersion)" />
     <PackageReference Include="System.ValueTuple" Version="$(SystemValueTuplePackageVersion)" />
     <PackageReference Include="VSSDK.VSHelp" Version="$(VSSDKVSHelpPackageVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
-    <PackageReference Include="VSSDK.VSLangProj.8" Version="$(VSSDKVSLangProj8PackageVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
+    <PackageReference Include="VSSDK.VSLangProj.8" Version="$(VSSDKVSLangProj8PackageVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;build;analyzers;native" />
   </ItemGroup>
 
 </Project>