[main] Update dependencies from dotnet/msbuild

eng/Version.Details.props

@@ -6,10 +6,10 @@ This file should be imported by eng/Versions.props
 <Project>
   <PropertyGroup>
     <!-- dotnet/msbuild dependencies -->
-    <MicrosoftBuildPackageVersion>17.15.0-preview-25278-01</MicrosoftBuildPackageVersion>
-    <MicrosoftBuildFrameworkPackageVersion>17.15.0-preview-25278-01</MicrosoftBuildFrameworkPackageVersion>
-    <MicrosoftBuildTasksCorePackageVersion>17.15.0-preview-25278-01</MicrosoftBuildTasksCorePackageVersion>
-    <MicrosoftBuildUtilitiesCorePackageVersion>17.15.0-preview-25278-01</MicrosoftBuildUtilitiesCorePackageVersion>
+    <MicrosoftBuildPackageVersion>18.0.0-preview-25465-08</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildFrameworkPackageVersion>18.0.0-preview-25465-08</MicrosoftBuildFrameworkPackageVersion>
+    <MicrosoftBuildTasksCorePackageVersion>18.0.0-preview-25465-08</MicrosoftBuildTasksCorePackageVersion>
+    <MicrosoftBuildUtilitiesCorePackageVersion>18.0.0-preview-25465-08</MicrosoftBuildUtilitiesCorePackageVersion>
     <!-- dotnet/runtime dependencies -->
     <SystemCollectionsImmutablePackageVersion>9.0.0</SystemCollectionsImmutablePackageVersion>
     <SystemComponentModelCompositionPackageVersion>9.0.0</SystemComponentModelCompositionPackageVersion>

eng/Version.Details.xml

@@ -2,21 +2,21 @@
 <Dependencies>
   <Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="8ea69c337be69385ff7eb44b2a54db78010110d8" BarId="282240" />
   <ProductDependencies>
-    <Dependency Name="Microsoft.Build" Version="17.15.0-preview-25278-01">
+    <Dependency Name="Microsoft.Build" Version="18.0.0-preview-25465-08">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>6de64741f6440bb6730d9a342934ce49d600fcc9</Sha>
+      <Sha>36b870ef0e3bc607c96e23f1f2d20125947be598</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Framework" Version="17.15.0-preview-25278-01">
+    <Dependency Name="Microsoft.Build.Framework" Version="18.0.0-preview-25465-08">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>6de64741f6440bb6730d9a342934ce49d600fcc9</Sha>
+      <Sha>36b870ef0e3bc607c96e23f1f2d20125947be598</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Tasks.Core" Version="17.15.0-preview-25278-01">
+    <Dependency Name="Microsoft.Build.Tasks.Core" Version="18.0.0-preview-25465-08">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>6de64741f6440bb6730d9a342934ce49d600fcc9</Sha>
+      <Sha>36b870ef0e3bc607c96e23f1f2d20125947be598</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Utilities.Core" Version="17.15.0-preview-25278-01">
+    <Dependency Name="Microsoft.Build.Utilities.Core" Version="18.0.0-preview-25465-08">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>6de64741f6440bb6730d9a342934ce49d600fcc9</Sha>
+      <Sha>36b870ef0e3bc607c96e23f1f2d20125947be598</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.Metadata" Version="9.0.0">
       <Uri>https://github.com/dotnet/runtime</Uri>

src/Compiler/Facilities/SimulatedMSBuildReferenceResolver.fs

@@ -43,8 +43,23 @@ let private Net472 = "v4.7.2"
 [<Literal>]
 let private Net48 = "v4.8"
 
+[<Literal>]
+let private Net481 = "v4.8.1"
+
 let SupportedDesktopFrameworkVersions =
-    [ Net48; Net472; Net471; Net47; Net462; Net461; Net46; Net452; Net451; Net45 ]
+    [
+        Net481
+        Net48
+        Net472
+        Net471
+        Net47
+        Net462
+        Net461
+        Net46
+        Net452
+        Net451
+        Net45
+    ]
 
 let private SimulatedMSBuildResolver =
 

src/LegacyMSBuildResolver/LegacyMSBuildReferenceResolver.fs

@@ -69,8 +69,23 @@ let private Net472 = "v4.7.2"
 [<Literal>]
 let private Net48 = "v4.8"
 
+[<Literal>]
+let private Net481 = "v4.8.1"
+
 let SupportedDesktopFrameworkVersions =
-    [ Net48; Net472; Net471; Net47; Net462; Net461; Net46; Net452; Net451; Net45 ]
+    [
+        Net481
+        Net48
+        Net472
+        Net471
+        Net47
+        Net462
+        Net461
+        Net46
+        Net452
+        Net451
+        Net45
+    ]
 
 /// Get the path to the .NET Framework implementation assemblies by using ToolLocationHelper.GetPathToDotNetFramework
 /// This is only used to specify the "last resort" path for assembly resolution.
@@ -87,6 +102,7 @@ let GetPathToDotNetFrameworkImplementationAssemblies v : string list =
         | Net471 -> Some TargetDotNetFrameworkVersion.Version471
         | Net472 -> Some TargetDotNetFrameworkVersion.Version472
         | Net48 -> Some TargetDotNetFrameworkVersion.Version48
+        | Net481 -> Some TargetDotNetFrameworkVersion.Version481
         | _ ->
             assert false
             None
@@ -114,7 +130,9 @@ let GetPathToDotNetFrameworkReferenceAssemblies version =
 let HighestInstalledRefAssembliesOrDotNETFramework () =
     let getHighestInstalledDotNETFramework () =
         try
-            if not (isNull (box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version48)))) then
+            if not (isNull (box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version481)))) then
+                Net481
+            elif not (isNull (box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version48)))) then
                 Net48
             elif not (isNull (box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version472)))) then
                 Net472

tests/ILVerify/ilverify_FSharp.Compiler.Service_Debug_netstandard2.0.bsl

@@ -82,7 +82,7 @@
 [IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.IL+parseNamed@5311::Invoke([FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1<System.Tuple`4<string,FSharp.Compiler.AbstractIL.IL+ILType,bool,FSharp.Compiler.AbstractIL.IL+ILAttribElem>>, int32, int32)][offset 0x00000087][found Char] Unexpected type on the stack.
 [IL]: Error [StackUnexpected]: : Internal.Utilities.Collections.Utils::shortPath(string)][offset 0x00000048][found Char] Unexpected type on the stack.
 [IL]: Error [StackUnexpected]: : Internal.Utilities.FSharpEnvironment+probePathForDotnetHost@317::Invoke([FSharp.Core]Microsoft.FSharp.Core.Unit)][offset 0x00000028][found Char] Unexpected type on the stack.
-[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.SimulatedMSBuildReferenceResolver+Pipe #6 input at line 68@68::FSharp.Compiler.CodeAnalysis.ILegacyReferenceResolver.Resolve([FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.LegacyResolutionEnvironment, [S.P.CoreLib]System.Tuple`2<string,string>[], string, [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1<string>, string, string, [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1<string>, string, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<string,Microsoft.FSharp.Core.Unit>, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<bool,Microsoft.FSharp.Core.FSharpFunc`2<string,Microsoft.FSharp.Core.FSharpFunc`2<string,Microsoft.FSharp.Core.Unit>>>)][offset 0x0000034D][found Char] Unexpected type on the stack.
+[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.SimulatedMSBuildReferenceResolver+Pipe #6 input at line 83@83::FSharp.Compiler.CodeAnalysis.ILegacyReferenceResolver.Resolve([FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.LegacyResolutionEnvironment, [S.P.CoreLib]System.Tuple`2<string,string>[], string, [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1<string>, string, string, [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1<string>, string, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<string,Microsoft.FSharp.Core.Unit>, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<bool,Microsoft.FSharp.Core.FSharpFunc`2<string,Microsoft.FSharp.Core.FSharpFunc`2<string,Microsoft.FSharp.Core.Unit>>>)][offset 0x0000034D][found Char] Unexpected type on the stack.
 [IL]: Error [StackUnexpected]: : <StartupCode$FSharp-Compiler-Service>.$FSharp.Compiler.DiagnosticsLogger::.cctor()][offset 0x000000CD][found Char] Unexpected type on the stack.
 [IL]: Error [CallVirtOnValueType]: : FSharp.Compiler.Text.RangeModule+comparer@590::System.Collections.Generic.IEqualityComparer<FSharp.Compiler.Text.Range>.GetHashCode([FSharp.Compiler.Service]FSharp.Compiler.Text.Range)][offset 0x00000002] Callvirt on a value type method.
 [IL]: Error [StackUnexpected]: : Internal.Utilities.PathMapModule::applyDir([FSharp.Compiler.Service]Internal.Utilities.PathMap, string)][offset 0x00000037][found Char] Unexpected type on the stack.

tests/ILVerify/ilverify_FSharp.Compiler.Service_Release_netstandard2.0.bsl

@@ -109,7 +109,7 @@
 [IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.IL::parseNamed@5310(uint8[], [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1<System.Tuple`4<string,FSharp.Compiler.AbstractIL.IL+ILType,bool,FSharp.Compiler.AbstractIL.IL+ILAttribElem>>, int32, int32)][offset 0x0000007E][found Char] Unexpected type on the stack.
 [IL]: Error [StackUnexpected]: : Internal.Utilities.Collections.Utils::shortPath(string)][offset 0x0000003A][found Char] Unexpected type on the stack.
 [IL]: Error [StackUnexpected]: : Internal.Utilities.FSharpEnvironment::probePathForDotnetHost@316([FSharp.Core]Microsoft.FSharp.Core.Unit)][offset 0x0000002A][found Char] Unexpected type on the stack.
-[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.SimulatedMSBuildReferenceResolver+SimulatedMSBuildResolver@68::FSharp.Compiler.CodeAnalysis.ILegacyReferenceResolver.Resolve([FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.LegacyResolutionEnvironment, [S.P.CoreLib]System.Tuple`2<string,string>[], string, [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1<string>, string, string, [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1<string>, string, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<string,Microsoft.FSharp.Core.Unit>, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<bool,Microsoft.FSharp.Core.FSharpFunc`2<string,Microsoft.FSharp.Core.FSharpFunc`2<string,Microsoft.FSharp.Core.Unit>>>)][offset 0x000002F5][found Char] Unexpected type on the stack.
+[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.SimulatedMSBuildReferenceResolver+SimulatedMSBuildResolver@83::FSharp.Compiler.CodeAnalysis.ILegacyReferenceResolver.Resolve([FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.LegacyResolutionEnvironment, [S.P.CoreLib]System.Tuple`2<string,string>[], string, [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1<string>, string, string, [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1<string>, string, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<string,Microsoft.FSharp.Core.Unit>, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<bool,Microsoft.FSharp.Core.FSharpFunc`2<string,Microsoft.FSharp.Core.FSharpFunc`2<string,Microsoft.FSharp.Core.Unit>>>)][offset 0x000002F5][found Char] Unexpected type on the stack.
 [IL]: Error [StackUnexpected]: : <StartupCode$FSharp-Compiler-Service>.$FSharp.Compiler.DiagnosticsLogger::.cctor()][offset 0x000000B6][found Char] Unexpected type on the stack.
 [IL]: Error [CallVirtOnValueType]: : FSharp.Compiler.Text.RangeModule+comparer@590::System.Collections.Generic.IEqualityComparer<FSharp.Compiler.Text.Range>.GetHashCode([FSharp.Compiler.Service]FSharp.Compiler.Text.Range)][offset 0x00000002] Callvirt on a value type method.
 [IL]: Error [StackUnexpected]: : Internal.Utilities.PathMapModule::applyDir([FSharp.Compiler.Service]Internal.Utilities.PathMap, string)][offset 0x00000035][found Char] Unexpected type on the stack.

vsintegration/tests/Salsa/VsMocks.fs

@@ -1375,6 +1375,7 @@ module internal VsMocks =
     let vsTargetFrameworkAssemblies40 = vsTargetFrameworkAssembliesN 0x40000u
     let vsTargetFrameworkAssemblies45 = vsTargetFrameworkAssembliesN 0x40005u
     let vsTargetFrameworkAssemblies46 = vsTargetFrameworkAssembliesN 0x40006u
+    let vsTargetFrameworkAssemblies472 = vsTargetFrameworkAssembliesN 0x40007u
 
     let vsFrameworkMultiTargeting =
         { new IVsFrameworkMultiTargeting with
@@ -1601,6 +1602,11 @@ module internal VsMocks =
         sp.AddService(typeof<SVsTargetFrameworkAssemblies>, box vsTargetFrameworkAssemblies46, false)
         sp.AddService(typeof<SVsFrameworkMultiTargeting>, box vsFrameworkMultiTargeting, false)
         sp, ccn
+    let MakeMockServiceProviderAndConfigChangeNotifier472() =
+        let sp, ccn = MakeMockServiceProviderAndConfigChangeNotifierNoTargetFrameworkAssembliesService()
+        sp.AddService(typeof<SVsTargetFrameworkAssemblies>, box vsTargetFrameworkAssemblies472, false)
+        sp.AddService(typeof<SVsFrameworkMultiTargeting>, box vsFrameworkMultiTargeting, false)
+        sp, ccn
 
     // This is the mock thing that all tests, except the multitargeting tests call.
     // By default, let it use the 4.0 assembly version.

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

@@ -9,14 +9,35 @@ open UnitTests.TestLib.Utils.Asserts
 open UnitTests.TestLib.ProjectSystem
 open Microsoft.VisualStudio.FSharp.ProjectSystem
 
+[<AutoOpen>]
+module Helpers =
+    /// Active pattern to parse a float from an env var
+    let (|EnvFloat|_|) (envVar: string) =
+        match Environment.GetEnvironmentVariable(envVar) with
+        | null | "" -> None
+        | str ->
+            match System.Double.TryParse(str, System.Globalization.NumberStyles.Float, System.Globalization.CultureInfo.InvariantCulture) with
+            | true, v -> Some v
+            | _ -> None
+
+
+/// xUnit Fact attribute that skips the test unless VISUALSTUDIOVERSION >= 18.0
+type Vs18OrNewerFactAttribute() =
+    inherit FactAttribute()
+    do
+        match "VISUALSTUDIOVERSION" with
+        | EnvFloat v when v >= 18.0 -> ()
+        | EnvFloat v -> base.Skip <- $"Test requires Visual Studio 18.0 or newer (VISUALSTUDIOVERSION >= 18.0), found: {v}"
+        | _ -> base.Skip <- "Test requires Visual Studio 18.0 or newer (VISUALSTUDIOVERSION not set)"
+
 
 type ProjectItems() = 
     inherit TheTests()
 
     //TODO: look for a way to remove the helper functions
     static let ANYTREE = Tree("",Nil,Nil)
 
-    [<Fact>]
+    [<Vs18OrNewerFact>]
     member public this.``RemoveAssemblyReference.NoIVsTrackProjectDocuments2Events``() =
         this.MakeProjectAndDo(["file.fs"], ["System.Numerics"],"", (fun project ->
             let listener = project.Site.GetService(typeof<Salsa.VsMocks.IVsTrackProjectDocuments2Listener>) :?> Salsa.VsMocks.IVsTrackProjectDocuments2Listener

vsintegration/tests/UnitTests/TestLib.ProjectSystem.fs

@@ -120,12 +120,13 @@ type TheTests() =
             printfn "about to load .fsproj"
             project.Load(filename, null, null, 2u, &guid, &cancelled)
             printfn "loaded"
+
             let slfpe = new SolutionListenerForProjectEvents(project.Site)
             project.ProjectEventsProvider <- (slfpe :> IProjectEvents)
             slfpe.OnAfterOpenProject((project :> IVsHierarchy), 0) |> ignore
             MSBuildProject.SetGlobalProperty(project.BuildProject, "UTF8Output", forceUTF8)
             project
-        with 
+        with
         | e ->
             try
                 project.Close() |> ignore
@@ -298,13 +299,14 @@ type TheTests() =
             File.AppendAllText(file, TheTests.FsprojTextWithProjectReferencesAndOtherFlags(compileItems, references, [], null, other, targetFramework))
             let sp, cnn = 
                 match targetFramework with
-                | "v4.6" -> VsMocks.MakeMockServiceProviderAndConfigChangeNotifier46()
-                | "v4.5" -> VsMocks.MakeMockServiceProviderAndConfigChangeNotifier45()
-                | "v4.0" -> VsMocks.MakeMockServiceProviderAndConfigChangeNotifier40()
-                | "v3.5" -> VsMocks.MakeMockServiceProviderAndConfigChangeNotifier35()
-                | "v3.0" -> VsMocks.MakeMockServiceProviderAndConfigChangeNotifier30()
-                | "v2.0" -> VsMocks.MakeMockServiceProviderAndConfigChangeNotifier20()
-                | null -> VsMocks.MakeMockServiceProviderAndConfigChangeNotifier40()
+                | "v4.7.2" | "4.7.2" | "4.7" | "v4.7" -> VsMocks.MakeMockServiceProviderAndConfigChangeNotifier472()
+                | "v4.6" | "4.6" -> VsMocks.MakeMockServiceProviderAndConfigChangeNotifier46()
+                | "v4.5" | "4.5" -> VsMocks.MakeMockServiceProviderAndConfigChangeNotifier45()
+                | "v4.0" | "4.0" -> VsMocks.MakeMockServiceProviderAndConfigChangeNotifier40()
+                | "v3.5" | "3.5" -> VsMocks.MakeMockServiceProviderAndConfigChangeNotifier35()
+                | "v3.0" | "3.0" -> VsMocks.MakeMockServiceProviderAndConfigChangeNotifier30()
+                | "v2.0" | "2.0"-> VsMocks.MakeMockServiceProviderAndConfigChangeNotifier20()
+                | null -> VsMocks.MakeMockServiceProviderAndConfigChangeNotifier472()
                 | _ -> failwithf "unexpected targetFramework %s" targetFramework
             let project = TheTests.CreateProject(file, "false", cnn, sp)
             try