[main] Update dependencies from dotnet/msbuild

VisualFSharp.sln

@@ -1,15 +1,19 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.1.32113.165
+# Visual Studio Version 18
+VisualStudioVersion = 18.3.11210.18 main
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VisualFSharp.UnitTests Support", "VisualFSharp.UnitTests Support", "{3F044931-FB83-4433-B934-AE66AB27B278}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VisualFSharp", "VisualFSharp", "{4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}"
 	ProjectSection(SolutionItems) = preProject
+		vsintegration\Directory.Build.props = vsintegration\Directory.Build.props
+		vsintegration\Directory.Build.targets = vsintegration\Directory.Build.targets
 		vsintegration\readme.md = vsintegration\readme.md
+		vsintegration\Templates.Directory.Build.props = vsintegration\Templates.Directory.Build.props
+		vsintegration\Templates.Directory.Build.targets = vsintegration\Templates.Directory.Build.targets
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compiler", "Compiler", "{3881429D-A97A-49EB-B7AE-A82BA5FE9C77}"

eng/Version.Details.props

@@ -6,17 +6,17 @@ This file should be imported by eng/Versions.props
 <Project>
   <PropertyGroup>
     <!-- dotnet/msbuild dependencies -->
-    <MicrosoftBuildPackageVersion>18.1.0-preview-25515-01</MicrosoftBuildPackageVersion>
-    <MicrosoftBuildFrameworkPackageVersion>18.1.0-preview-25515-01</MicrosoftBuildFrameworkPackageVersion>
-    <MicrosoftBuildTasksCorePackageVersion>18.1.0-preview-25515-01</MicrosoftBuildTasksCorePackageVersion>
-    <MicrosoftBuildUtilitiesCorePackageVersion>18.1.0-preview-25515-01</MicrosoftBuildUtilitiesCorePackageVersion>
+    <MicrosoftBuildPackageVersion>18.3.0-preview-25576-02</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildFrameworkPackageVersion>18.3.0-preview-25576-02</MicrosoftBuildFrameworkPackageVersion>
+    <MicrosoftBuildTasksCorePackageVersion>18.3.0-preview-25576-02</MicrosoftBuildTasksCorePackageVersion>
+    <MicrosoftBuildUtilitiesCorePackageVersion>18.3.0-preview-25576-02</MicrosoftBuildUtilitiesCorePackageVersion>
     <!-- dotnet/runtime dependencies -->
-    <SystemCollectionsImmutablePackageVersion>9.0.0</SystemCollectionsImmutablePackageVersion>
-    <SystemComponentModelCompositionPackageVersion>9.0.0</SystemComponentModelCompositionPackageVersion>
-    <SystemCompositionPackageVersion>9.0.0</SystemCompositionPackageVersion>
-    <SystemDiagnosticsDiagnosticSourcePackageVersion>9.0.0</SystemDiagnosticsDiagnosticSourcePackageVersion>
-    <SystemReflectionMetadataPackageVersion>9.0.0</SystemReflectionMetadataPackageVersion>
-    <SystemThreadingTasksDataflowPackageVersion>9.0.0</SystemThreadingTasksDataflowPackageVersion>
+    <SystemCollectionsImmutablePackageVersion>9.0.9</SystemCollectionsImmutablePackageVersion>
+    <SystemComponentModelCompositionPackageVersion>9.0.9</SystemComponentModelCompositionPackageVersion>
+    <SystemCompositionPackageVersion>9.0.9</SystemCompositionPackageVersion>
+    <SystemDiagnosticsDiagnosticSourcePackageVersion>9.0.9</SystemDiagnosticsDiagnosticSourcePackageVersion>
+    <SystemReflectionMetadataPackageVersion>9.0.9</SystemReflectionMetadataPackageVersion>
+    <SystemThreadingTasksDataflowPackageVersion>9.0.9</SystemThreadingTasksDataflowPackageVersion>
     <!-- dotnet/roslyn dependencies -->
     <MicrosoftCodeAnalysisPackageVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisPackageVersion>
     <MicrosoftCodeAnalysisCompilersPackageVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisCompilersPackageVersion>

eng/Version.Details.xml

@@ -2,45 +2,39 @@
 <Dependencies>
   <Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="01abb3ec5c4cbffec5b33e02156bd3d2a8913b04" BarId="286825" />
   <ProductDependencies>
-    <Dependency Name="Microsoft.Build" Version="18.1.0-preview-25515-01">
+    <Dependency Name="Microsoft.Build" Version="18.3.0-preview-25576-02">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>5e273ccd45ba73d9db9b34fceaf9a110412e64e8</Sha>
+      <Sha>ec0251ebba30d16063b46cb04f7e70b5564cbe8e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Framework" Version="18.1.0-preview-25515-01">
+    <Dependency Name="Microsoft.Build.Framework" Version="18.3.0-preview-25576-02">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>5e273ccd45ba73d9db9b34fceaf9a110412e64e8</Sha>
+      <Sha>ec0251ebba30d16063b46cb04f7e70b5564cbe8e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Tasks.Core" Version="18.1.0-preview-25515-01">
+    <Dependency Name="Microsoft.Build.Tasks.Core" Version="18.3.0-preview-25576-02">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>5e273ccd45ba73d9db9b34fceaf9a110412e64e8</Sha>
+      <Sha>ec0251ebba30d16063b46cb04f7e70b5564cbe8e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Utilities.Core" Version="18.1.0-preview-25515-01">
+    <Dependency Name="Microsoft.Build.Utilities.Core" Version="18.3.0-preview-25576-02">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>5e273ccd45ba73d9db9b34fceaf9a110412e64e8</Sha>
+      <Sha>ec0251ebba30d16063b46cb04f7e70b5564cbe8e</Sha>
     </Dependency>
-    <Dependency Name="System.Reflection.Metadata" Version="9.0.0">
+    <Dependency Name="System.Reflection.Metadata" Version="9.0.9">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
     </Dependency>
-    <Dependency Name="System.ComponentModel.Composition" Version="9.0.0">
+    <Dependency Name="System.ComponentModel.Composition" Version="9.0.9">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
     </Dependency>
-    <Dependency Name="System.Composition" Version="9.0.0">
+    <Dependency Name="System.Composition" Version="9.0.9">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
     </Dependency>
-    <Dependency Name="System.Collections.Immutable" Version="9.0.0">
+    <Dependency Name="System.Collections.Immutable" Version="9.0.9">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
     </Dependency>
-    <Dependency Name="System.Threading.Tasks.Dataflow" Version="9.0.0">
+    <Dependency Name="System.Threading.Tasks.Dataflow" Version="9.0.9">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="9.0.0">
+    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="9.0.9">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
     </Dependency>
     <Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-2.25480.7">
       <Uri>https://github.com/dotnet/roslyn</Uri>

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "10.0.100-rc.2.25502.107",
+    "version": "10.0.100",
     "allowPrerelease": true,
     "paths": [
       ".dotnet",
@@ -9,14 +9,14 @@
     "errorMessage": "The .NET SDK could not be found, please run ./eng/common/dotnet.sh."
   },
   "tools": {
-    "dotnet": "10.0.100-rc.2.25502.107",
+    "dotnet": "10.0.100",
     "vs": {
-      "version": "17.14",
+      "version": "18.0",
       "components": [
         "Microsoft.VisualStudio.Component.FSharp"
       ]
     },
-    "xcopy-msbuild": "17.14.16"
+    "xcopy-msbuild": "18.0.0"
   },
   "native-tools": {
     "perl": "5.38.2.2"

src/fsc/fsc.targets

@@ -51,10 +51,8 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" />
     <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" />
-    <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
   </ItemGroup>
 
 </Project>

tests/FSharp.Test.Utilities/CompilerAssert.fs

@@ -31,34 +31,49 @@ open System.Collections.Immutable
 #if !NETCOREAPP
 module AssemblyResolver =
 
+    open System.Collections.Generic
+
     let probingPaths = [|
         AppDomain.CurrentDomain.BaseDirectory
         Path.GetDirectoryName(typeof<FactForDESKTOPAttribute>.Assembly.Location)
     |]
 
+    // Add a static HashSet to track currently resolving assemblies
+    let private resolvingAssemblies = HashSet<string>()
+
     let addResolver () =
         AppDomain.CurrentDomain.add_AssemblyResolve(fun h args ->
-            let found () =
-                (probingPaths ) |> Seq.tryPick(fun p ->
-                    try
-                        let name = AssemblyName(args.Name)
-                        let codebase = Path.GetFullPath(Path.Combine(p, name.Name))
-                        if File.Exists(codebase + ".dll") then
-                            name.CodeBase <- codebase  + ".dll"
-                            name.CultureInfo <- Unchecked.defaultof<CultureInfo>
-                            name.Version <- Unchecked.defaultof<Version>
-                            Some (name)
-                        elif File.Exists(codebase + ".exe") then
-                                name.CodeBase <- codebase + ".exe"
-                                name.CultureInfo <- Unchecked.defaultof<CultureInfo>
-                                name.Version <- Unchecked.defaultof<Version>
-                                Some (name)
-                        else None
-                    with | _ -> None
-                    )
-            match found() with
-            | None -> Unchecked.defaultof<Assembly>
-            | Some name -> Assembly.Load(name) )
+            let assemblyName = args.Name
+            // Prevent recursion: skip if already resolving this assembly
+            if resolvingAssemblies.Contains(assemblyName) then
+                null
+            else
+                try
+                    resolvingAssemblies.Add(assemblyName) |> ignore
+                    let found () =
+                        (probingPaths ) |> Seq.tryPick(fun p ->
+                            try
+                                let name = AssemblyName(args.Name)
+                                let codebase = Path.GetFullPath(Path.Combine(p, name.Name))
+                                if File.Exists(codebase + ".dll") then
+                                    name.CodeBase <- codebase  + ".dll"
+                                    name.CultureInfo <- Unchecked.defaultof<CultureInfo>
+                                    name.Version <- Unchecked.defaultof<Version>
+                                    Some (name)
+                                elif File.Exists(codebase + ".exe") then
+                                    name.CodeBase <- codebase + ".exe"
+                                    name.CultureInfo <- Unchecked.defaultof<CultureInfo>
+                                    name.Version <- Unchecked.defaultof<Version>
+                                    Some (name)
+                                else None
+                            with | _ -> None
+                        )
+                    match found() with
+                    | None -> null
+                    | Some name -> Assembly.Load(name)
+                finally
+                    resolvingAssemblies.Remove(assemblyName) |> ignore
+        )
 #endif
 
 type ExecutionOutcome = 

vsintegration/Directory.Build.targets

@@ -12,9 +12,7 @@
     <PackageReference Include="Microsoft.VisualStudio.TextManager.Interop" Version="$(MicrosoftVisualStudioTextManagerInteropVersion)" PrivateAssets="compile" ExcludeAssets="compile" />
     <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;analyzers;native" />
     <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;analyzers;native" />
-    <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;analyzers;native" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;analyzers;native" />
-	<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;analyzers;native" />
   </ItemGroup>
 
   <!-- New VS does not allow embedded interop assemblies ... this turns off the target that turns it on -->