Implement robust Visual Studio installation discovery for integration/editor tests

azure-pipelines-PR.yml

@@ -475,6 +475,69 @@ stages:
           - checkout: self
             clean: true
 
+          - task: PowerShell@2
+            displayName: Detect / ensure VisualStudioVersion=17.0 (testVs only)
+            condition: and(succeeded(), eq(variables._testKind, 'testVs'))
+            inputs:
+              targetType: inline
+              pwsh: false
+              script: |
+                Write-Host "VS Detect: starting"
+
+                function Set-VSV([string]$v) {
+                  $env:VisualStudioVersion = $v
+                  Write-Host "##vso[task.setvariable variable=VisualStudioVersion]$v"
+                  Write-Host "VS Detect: SET VisualStudioVersion=$v"
+                }
+
+                $vswhere = $null
+                $cmd = Get-Command vswhere.exe -ErrorAction SilentlyContinue
+                if ($cmd) {
+                  $vswhere = $cmd.Source
+                } else {
+                  $candidates = @(
+                    "$env:ProgramFiles(x86)\Microsoft Visual Studio\Installer\vswhere.exe",
+                    "$env:ProgramFiles\Microsoft Visual Studio\Installer\vswhere.exe"
+                  )
+                  foreach ($c in $candidates) { if (Test-Path $c) { $vswhere = $c; break } }
+                }
+
+                if ($vswhere -and (Test-Path $vswhere)) {
+                  Write-Host "VS Detect: using vswhere '$vswhere'"
+                  $json = & $vswhere -latest -prerelease -products * -format json 2>$null
+                  if ($LASTEXITCODE -eq 0 -and $json) {
+                    try {
+                      $obj = $json | ConvertFrom-Json
+                      if ($obj -is [System.Array]) { $obj = $obj[0] }
+                      $ver = $obj.installationVersion
+                      Write-Host "VS Detect: installationVersion=$ver"
+                      if ($ver -match '^17\.') {
+                        if (-not $env:VisualStudioVersion) { Set-VSV "17.0" }
+                      } else {
+                        Write-Host "VS Detect: latest VS not 17.x (ver=$ver) – leaving fallback logic"
+                      }
+                    } catch {
+                      Write-Host "VS Detect: JSON parse failed: $($_.Exception.Message)"
+                    }
+                  } else {
+                    Write-Host "VS Detect: vswhere produced no usable data"
+                  }
+                } else {
+                  Write-Host "VS Detect: vswhere not found"
+                }
+
+                if (-not $env:VisualStudioVersion) {
+                  Write-Host "VS Detect: forcing VisualStudioVersion=17.0 (fallback)"
+                  Set-VSV "17.0"
+                }
+
+                $final = if ($env:VisualStudioVersion) { $env:VisualStudioVersion } else { "<unset>" }
+                Write-Host "VS Detect: done (final VisualStudioVersion='$final')"
+
+          - script: echo VisualStudioVersion=$(VisualStudioVersion)
+            displayName: Echo VisualStudioVersion
+            condition: and(succeeded(), eq(variables._testKind, 'testVs'))
+
           - powershell: eng\SetupVSHive.ps1
             displayName: Setup VS Hive
             condition: eq(variables.setupVsHive, 'true')

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>17.15.0-preview-25461-02</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildFrameworkPackageVersion>17.15.0-preview-25461-02</MicrosoftBuildFrameworkPackageVersion>
+    <MicrosoftBuildTasksCorePackageVersion>17.15.0-preview-25461-02</MicrosoftBuildTasksCorePackageVersion>
+    <MicrosoftBuildUtilitiesCorePackageVersion>17.15.0-preview-25461-02</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="17.15.0-preview-25461-02">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>6de64741f6440bb6730d9a342934ce49d600fcc9</Sha>
+      <Sha>610aa6fdc1ab787670d0ba2db53a4546ae63a874</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Framework" Version="17.15.0-preview-25278-01">
+    <Dependency Name="Microsoft.Build.Framework" Version="17.15.0-preview-25461-02">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>6de64741f6440bb6730d9a342934ce49d600fcc9</Sha>
+      <Sha>610aa6fdc1ab787670d0ba2db53a4546ae63a874</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Tasks.Core" Version="17.15.0-preview-25278-01">
+    <Dependency Name="Microsoft.Build.Tasks.Core" Version="17.15.0-preview-25461-02">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>6de64741f6440bb6730d9a342934ce49d600fcc9</Sha>
+      <Sha>610aa6fdc1ab787670d0ba2db53a4546ae63a874</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Utilities.Core" Version="17.15.0-preview-25278-01">
+    <Dependency Name="Microsoft.Build.Utilities.Core" Version="17.15.0-preview-25461-02">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>6de64741f6440bb6730d9a342934ce49d600fcc9</Sha>
+      <Sha>610aa6fdc1ab787670d0ba2db53a4546ae63a874</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.Metadata" Version="9.0.0">
       <Uri>https://github.com/dotnet/runtime</Uri>

fuckingtest.ps1

@@ -0,0 +1,56 @@
+# (A1) Build (Release) – create all artifacts needed by tests
+.\Build.cmd -c Release
+
+# (A2) Set up the VS experimental hive (same as CI step 'Setup VS Hive')
+# This script will:
+#   - Discover / validate a VS 17.x install
+#   - Set / persist required hive registry + layout
+#   - Emit the required environment variables in the current session
+# If it has a -Configuration parameter in your branch, pass it; otherwise omit.
+powershell -ExecutionPolicy Bypass -File .\eng\SetupVSHive.ps1 -Configuration Release
+
+# (A3) (Optional) Verify env vars now exist
+"`nVSAPPIDDIR=$env:VSAPPIDDIR"
+"VS170COMNTOOLS=$env:VS170COMNTOOLS"
+
+if (-not $env:VSAPPIDDIR -or -not $env:VS170COMNTOOLS) {
+    Write-Host "Hive setup did not set required env vars. Aborting." -ForegroundColor Red
+    exit 1
+}
+
+# (A4) Path to the unit test assembly
+$testDll = Join-Path $PWD "artifacts\bin\VisualFSharp.UnitTests\Release\net472\VisualFSharp.UnitTests.dll"
+
+if (-not (Test-Path $testDll)) {
+    Write-Host "Test assembly missing: $testDll" -ForegroundColor Red
+    exit 1
+}
+
+# (A5) Enable your instrumentation
+$env:FSharpAutoImportDiag = "1"
+$env:FSharpTargetsDiagnostic = "true"
+
+# (A6) Run only the failing test using vstest.console (closer to CI than dotnet test for VS integration)
+$vswhere = Join-Path "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer" "vswhere.exe"
+if (-not (Test-Path $vswhere)) {
+    Write-Host "vswhere.exe not found; ensure VS 2022 installed." -ForegroundColor Yellow
+}
+
+# Optionally locate vstest.console if not on PATH
+$vstest = Get-ChildItem -Path "${env:ProgramFiles(x86)}\Microsoft Visual Studio" -Recurse -Include vstest.console.exe -ErrorAction SilentlyContinue |
+          Where-Object { $_.FullName -like "*\Common7\IDE\Extensions\TestPlatform\vstest.console.exe" } |
+          Sort-Object Length | Select-Object -First 1
+
+if (-not $vstest) {
+    Write-Host "Could not locate vstest.console.exe; falling back to 'dotnet test'." -ForegroundColor Yellow
+    dotnet test $testDll --framework net472 --filter "FullyQualifiedName=Tests.ProjectSystem.ProjectItems.RemoveAssemblyReference.NoIVsTrackProjectDocuments2Events"
+    exit $LASTEXITCODE
+}
+
+& $vstest.FullName `
+    $testDll `
+    /Framework:".NETFramework,Version=v4.7.2" `
+    /TestCaseFilter:"FullyQualifiedName=Tests.ProjectSystem.ProjectItems.RemoveAssemblyReference.NoIVsTrackProjectDocuments2Events" `
+    /Logger:trx /InIsolation
+
+Write-Host "`nDone."

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/FSharp.Build/Fsc.fs

@@ -785,7 +785,22 @@ type public Fsc() as this =
         | "" -> ()
         | NonNull dotnetFscCompilerPath -> builder.AppendSwitch(dotnetFscCompilerPath)
 
-        builder.ToString()
+        let cmd = builder.ToString()
+
+        // FWDIAG-FSC
+        try
+            let nf = noFramework
+            let refs =
+                match references with
+                | arr -> arr.Length
+            System.Diagnostics.Trace.WriteLine(
+                sprintf "FWDIAG-FSC VS=%s NoFramework=%b RefCount=%d OutputAssembly=%s"
+                    (System.Environment.GetEnvironmentVariable("VisualStudioVersion"))
+                    nf refs outputAssembly
+            )
+        with _ -> ()
+
+        cmd
 
     override _.GenerateResponseFileCommands() =
         let builder = generateCommandLineBuilder ()

src/FSharp.Build/Microsoft.FSharp.Targets

@@ -128,6 +128,28 @@ this file.
         <UsingXBuild Condition="'$(MSBuildAssemblyVersion)' == ''">true</UsingXBuild>
     </PropertyGroup>
 
+	<!-- DIAGNOSTIC: opt‑in legacy reference resolution tracing -->
+	<PropertyGroup>
+		<!-- Enable with: /p:FSharpTargetsDiagnostic=true -->
+		<FSharpTargetsDiagnostic Condition="'$(FSharpTargetsDiagnostic)'==''">false</FSharpTargetsDiagnostic>
+	</PropertyGroup>
+
+	<Target Name="FSharpLegacyRefDiag"
+            AfterTargets="ResolveAssemblyReferences"
+            Condition="'$(FSharpTargetsDiagnostic)'=='true'">
+		<Message Importance="high" Text="FSharpDiag: ===== Legacy Reference Resolution Diagnostics BEGIN =====" />
+		<Message Importance="high" Text="FSharpDiag: VisualStudioVersion=$(VisualStudioVersion) MSBuildToolsVersion=$(MSBuildToolsVersion) MSBuildAssemblyVersion=$(MSBuildAssemblyVersion)" />
+		<Message Importance="high" Text="FSharpDiag: TargetFrameworkIdentifier=$(TargetFrameworkIdentifier) TargetFrameworkVersion=$(TargetFrameworkVersion) TargetFrameworkProfile=$(TargetFrameworkProfile)" />
+		<Message Importance="high" Text="FSharpDiag: FSharp_Shim_Present=$(FSharp_Shim_Present) FSharpPreferNetFrameworkTools=$(FSharpPreferNetFrameworkTools) FSharpPrefer64BitTools=$(FSharpPrefer64BitTools) FSharpPreferAnyCpuTools=$(FSharpPreferAnyCpuTools)" />
+		<Message Importance="high" Text="FSharpDiag: FscToolPath=$(FscToolPath) FscToolExe=$(FscToolExe) DotnetFscCompilerPath=$(DotnetFscCompilerPath)" />
+		<Message Importance="high" Text="FSharpDiag: DisableImplicitFrameworkReferences=$(DisableImplicitFrameworkReferences) ImplicitlyExpandDesignTimeFacades=$(ImplicitlyExpandDesignTimeFacades)" />
+		<Message Importance="high" Text="FSharpDiag: Reference Identities: @(Reference->'%(Identity)')" />
+		<Message Importance="high" Text="FSharpDiag: Reference HintPaths: @(Reference->'%(Identity)=%(HintPath)')" />
+		<Message Importance="high" Text="FSharpDiag: ReferencePathWithRefAssemblies (count=%(ReferencePathWithRefAssemblies.Identity->Count())): @(ReferencePathWithRefAssemblies)" />
+		<Message Importance="high" Text="FSharpDiag: Raw Fsc References Arg Source: @(ReferencePathWithRefAssemblies->'%(Filename)')" />
+		<Message Importance="high" Text="FSharpDiag: ===== Legacy Reference Resolution Diagnostics END =====" />
+	</Target>
+
     <Target
         Name="CreateManifestResourceNames"
         Condition="'@(EmbeddedResource)' != ''"

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

vsintegration/src/FSharp.LanguageService/FSharpSource.fs

@@ -358,6 +358,15 @@ type internal FSharpSource_DEPRECATED(service:LanguageService_DEPRECATED, textLi
                     yield "--define:COMPILED"
 
                 |]
+
+                        // FWDIAG LS
+            try
+                let hasNF = flags |> Array.exists ((=) "--noframework")
+                System.Diagnostics.Trace.WriteLine(sprintf "FWDIAG-LS GetParseTree VS=%s hasNoFramework=%b flags=%A"
+                                                       (System.Environment.GetEnvironmentVariable("VisualStudioVersion"))
+                                                       hasNF flags)
+            with _ -> ()
+
             // get a sync parse of the file
             let co, _ = 
                 { ProjectFileName = fileName + ".dummy.fsproj"