Merge branch 'main' into witnesses

Author: Smaug123

docs/release-notes/.FSharp.Core/10.0.200.md

@@ -0,0 +1,3 @@
+### Fixed
+
+* Fix IL2091 trimming warning in `LazyExtensions.Create` by adding `DynamicallyAccessedMembers` attribute to the generic type parameter. ([Issue #17356](https://github.com/dotnet/fsharp/issues/17356), [PR #18302](https://github.com/dotnet/fsharp/pull/18302))

eng/Version.Details.props

@@ -27,7 +27,7 @@ This file should be imported by eng/Versions.props
     <MicrosoftCodeAnalysisFeaturesPackageVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisFeaturesPackageVersion>
     <MicrosoftVisualStudioLanguageServicesPackageVersion>5.0.0-2.25480.7</MicrosoftVisualStudioLanguageServicesPackageVersion>
     <!-- dotnet/arcade dependencies -->
-    <MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25575.1</MicrosoftDotNetArcadeSdkPackageVersion>
+    <MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25601.2</MicrosoftDotNetArcadeSdkPackageVersion>
     <!-- _git/dotnet-optimization dependencies -->
     <optimizationlinuxarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationlinuxarm64MIBCRuntimePackageVersion>
     <optimizationlinuxx64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationlinuxx64MIBCRuntimePackageVersion>

eng/Version.Details.xml

@@ -76,9 +76,9 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25575.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25601.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>e29f11a331730bd4f51024ba83fa067d2ab80ca9</Sha>
+      <Sha>846929727a388f2b1fd3ccf21f67694f44b91b4d</Sha>
     </Dependency>
     <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25502.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

global.json

@@ -22,7 +22,7 @@
     "perl": "5.38.2.2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25575.1",
+    "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25601.2",
     "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2"
   }
 }

src/FSharp.Core/prim-types.fs

@@ -7299,11 +7299,12 @@ namespace Microsoft.FSharp.Core
 namespace Microsoft.FSharp.Control
 
     open System
+    open System.Diagnostics.CodeAnalysis
     open Microsoft.FSharp.Core
     open Microsoft.FSharp.Core.Operators
 
     module LazyExtensions = 
-        type Lazy<'T> with
+        type Lazy<[<DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)>]'T> with
             [<CompiledName("Create")>] // give the extension member a 'nice', unmangled compiled name, unique within this module
             static member Create(creator : unit -> 'T) : Lazy<'T> =
                 let creator = Func<'T>(creator)

src/FSharp.Core/prim-types.fsi

@@ -6144,6 +6144,7 @@ namespace Microsoft.FSharp.Core
 
 namespace Microsoft.FSharp.Control
 
+    open System.Diagnostics.CodeAnalysis
     open Microsoft.FSharp.Core
 
     /// <summary>Extensions related to Lazy values.</summary>
@@ -6152,7 +6153,7 @@ namespace Microsoft.FSharp.Control
     [<AutoOpen>]
     module LazyExtensions =
 
-        type System.Lazy<'T> with
+        type System.Lazy<[<DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)>]'T> with
 
             /// <summary>Creates a lazy computation that evaluates to the result of the given function when forced.</summary>
             ///

tests/AheadOfTime/Trimming/Program.fs

@@ -9365,6 +9365,20 @@ module NonStructuralComparisonOverTimeSpanDirect =
     do check "test9407" (NonStructuralComparison.hash 11L) (Operators.hash 11L)
     do check "test9408" (NonStructuralComparison.hash 11UL) (Operators.hash 11UL)
 
+let testLazySimple () =
+    let f23 () = let z = lazy (12345) in z.Force()
+    check "lazy_simple" 12345 (f23())
+
+let testSeqWithTryFinally () =
+    let result = 
+        seq {
+            try
+                yield 1
+                yield 2
+            with
+            | ex -> ()
+        } |> Seq.toList
+    check "seq_try_with" [1; 2] result
 
 [<EntryPoint>]
 let main _ =
@@ -9385,6 +9399,8 @@ let main _ =
     PercentAPublicTests.tests ()
     PercentAInternalTests.tests ()
     ClassWithEvents.testWithEventClass ()
+    testLazySimple ()
+    testSeqWithTryFinally ()
 
     match !failures with 
     | [] -> 

tests/AheadOfTime/Trimming/check.ps1

@@ -1,33 +1,39 @@
-function CheckTrim($root, $tfm, $outputfile, $expected_len) {
+function CheckTrim($root, $tfm, $outputfile, $expected_len, $callerLineNumber) {
     Write-Host "Publish and Execute: ${tfm} - ${root}"
     Write-Host "Expecting ${expected_len} for ${outputfile}"
 
+    $errors = @()
+    $scriptFile = $PSCommandPath
+
     $cwd = Get-Location
     Set-Location (Join-Path $PSScriptRoot "${root}")
     $build_output = dotnet publish -restore -c release -f:$tfm "${root}.fsproj" -bl:"../../../../artifacts/log/Release/AheadOfTime/Trimming/${root}_${tfm}.binlog"
     Set-Location ${cwd}
     if ($LASTEXITCODE -ne 0)
     {
-        Write-Error "Build failed with exit code ${LASTEXITCODE}"
-        Write-Error "${build_output}" -ErrorAction Stop
+        $errors += "Build failed with exit code ${LASTEXITCODE}"
+        Write-Host "##vso[task.logissue type=error;sourcepath=${scriptFile};linenumber=${callerLineNumber}]Build failed for ${root} with exit code ${LASTEXITCODE}"
+        return $errors
     }
 
     $process = Start-Process -FilePath $(Join-Path $PSScriptRoot "${root}\bin\release\${tfm}\win-x64\publish\${root}.exe") -Wait -NoNewWindow -PassThru -RedirectStandardOutput $(Join-Path $PSScriptRoot "output.txt")
 
     # Checking that the test passed
     $output = Get-Content $(Join-Path $PSScriptRoot output.txt)
     $expected = "All tests passed"
-    if ($LASTEXITCODE -ne 0)
+    if ($process.ExitCode -ne 0)
     {
-        Write-Error "Test failed with exit code ${LASTEXITCODE}" -ErrorAction Stop
+        $errors += "Test failed with exit code $($process.ExitCode)"
+        Write-Host "##vso[task.logissue type=error;sourcepath=${scriptFile};linenumber=${callerLineNumber}]Test execution failed for ${root} with exit code $($process.ExitCode)"
     }
-    if ($output -eq $expected)
+    elseif ($output -ne $expected)
     {
-        Write-Host "Test passed"
+        $errors += "Test failed with unexpected output: Expected '${expected}', Actual '${output}'"
+        Write-Host "##vso[task.logissue type=error;sourcepath=${scriptFile};linenumber=${callerLineNumber}]Test failed for ${root} with unexpected output: Expected '${expected}', Actual '${output}'"
     }
     else
     {
-        Write-Error "Test failed with unexpected output:`nExpected:`n`t${expected}`nActual`n`t${output}" -ErrorAction Stop
+        Write-Host "Test passed"
     }
 
     # Checking that the trimmed outputfile binary is of expected size (needs adjustments if test is updated).
@@ -39,24 +45,46 @@ function CheckTrim($root, $tfm, $outputfile, $expected_len) {
     }
     elseif ($file_len -ne $expected_len)
     {
-        Write-Error "Test failed with unexpected ${tfm}  -  trimmed ${outputfile} length:`nExpected:`n`t${expected_len} Bytes`nActual:`n`t${file_len} Bytes`nEither codegen or trimming logic have changed. Please investigate and update expected dll size or report an issue." -ErrorAction Stop
+        $errors += "Test failed with unexpected ${tfm} - trimmed ${outputfile} length: Expected ${expected_len} Bytes, Actual ${file_len} Bytes"
+        Write-Host "##vso[task.logissue type=error;sourcepath=${scriptFile};linenumber=${callerLineNumber}]Trimmed ${outputfile} size mismatch for ${root}: Expected ${expected_len} Bytes, Actual ${file_len} Bytes. Either codegen or trimming logic have changed. Please investigate and update expected dll size or report an issue."
     }
 
     $fileBeforePublish = Get-Item (Join-Path $PSScriptRoot "${root}\bin\release\${tfm}\win-x64\${outputfile}")
     $sizeBeforePublish = $fileBeforePublish.Length
     $sizeDiff = $sizeBeforePublish - $file_len
     Write-Host "Size of ${tfm} - ${outputfile} before publish: ${sizeBeforePublish} Bytes, which means the diff is ${sizeDiff} Bytes"
+
+    return $errors
 }
 
 # NOTE: Trimming now errors out on desktop TFMs, as shown below:
 # error NETSDK1124: Trimming assemblies requires .NET Core 3.0 or higher.
 
+$allErrors = @()
+
 # Check net9.0 trimmed assemblies
-CheckTrim -root "SelfContained_Trimming_Test" -tfm "net9.0" -outputfile "FSharp.Core.dll" -expected_len 300032
+$allErrors += CheckTrim -root "SelfContained_Trimming_Test" -tfm "net9.0" -outputfile "FSharp.Core.dll" -expected_len 311296 -callerLineNumber 66
 
 # Check net9.0 trimmed assemblies with static linked FSharpCore
-CheckTrim -root "StaticLinkedFSharpCore_Trimming_Test" -tfm "net9.0" -outputfile "StaticLinkedFSharpCore_Trimming_Test.dll" -expected_len 9154048
+$allErrors += CheckTrim -root "StaticLinkedFSharpCore_Trimming_Test" -tfm "net9.0" -outputfile "StaticLinkedFSharpCore_Trimming_Test.dll" -expected_len 9169408 -callerLineNumber 69
 
 # Check net9.0 trimmed assemblies with F# metadata resources removed
-CheckTrim -root "FSharpMetadataResource_Trimming_Test" -tfm "net9.0" -outputfile "FSharpMetadataResource_Trimming_Test.dll" -expected_len 7607296
+$allErrors += CheckTrim -root "FSharpMetadataResource_Trimming_Test" -tfm "net9.0" -outputfile "FSharpMetadataResource_Trimming_Test.dll" -expected_len 7609344 -callerLineNumber 72
+
+# Report all errors and exit with failure if any occurred
+if ($allErrors.Count -gt 0) {
+    Write-Host ""
+    Write-Host "============================================"
+    Write-Host "TRIMMING TESTS FAILED"
+    Write-Host "============================================"
+    Write-Host "Total errors: $($allErrors.Count)"
+    foreach ($err in $allErrors) {
+        Write-Error $err
+    }
+    exit 1
+}
 
+Write-Host ""
+Write-Host "============================================"
+Write-Host "ALL TRIMMING TESTS PASSED"
+Write-Host "============================================"

tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj

@@ -102,7 +102,8 @@
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" />
   </ItemGroup>
 <PropertyGroup>
- <NoWarn>$(NoWarn);NU1510</NoWarn> <!-- NU1510: Project is explicitly referencing the runtime assembly 'System.Collections.Immutable', however, if we remove it, it tries to find it on the wrong path. Also, local NoWarn does not help - This is just me trying to enforce it -->
+ <NoWarn>$(NoWarn);NU1510;44</NoWarn> <!-- NU1510: Project is explicitly referencing the runtime assembly 'System.Collections.Immutable', however, if we remove it, it tries to find it on the wrong path. Also, local NoWarn does not help - This is just me trying to enforce it -->
+ <!-- 44: AssemblyName.CodeBase is deprecated but needed for assembly resolution in VS integration tests -->
 </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" GeneratePathProperty="true"  />

tests/FSharp.Test.Utilities/VSInstallDiscovery.fs

@@ -126,3 +126,55 @@ module VSInstallDiscovery =
         | NotFound reason -> 
             logAction $"Visual Studio installation not found: {reason}"
             None
+
+    /// Gets the VS installation directory or fails with a detailed error message.
+    /// This is the recommended method for test scenarios that require VS to be installed.
+    let getVSInstallDirOrFail () : string =
+        match tryFindVSInstallation () with
+        | Found (path, _) -> path
+        | NotFound reason -> 
+            failwith $"Visual Studio installation not found: {reason}. Ensure VS is installed or environment variables (VSAPPIDDIR, VS*COMNTOOLS) are set."
+
+/// Assembly resolver for Visual Studio test infrastructure.
+/// Provides centralized assembly resolution for VS integration tests.
+module VSAssemblyResolver =
+    open System
+    open System.IO
+    open System.Reflection
+    open System.Globalization
+
+    /// Adds an assembly resolver that probes Visual Studio installation directories.
+    /// This should be called early in test initialization to ensure VS assemblies can be loaded.
+    let addResolver () =
+        let vsInstallDir = VSInstallDiscovery.getVSInstallDirOrFail ()
+        
+        let probingPaths =
+            [|
+                Path.Combine(vsInstallDir, @"IDE\CommonExtensions\Microsoft\Editor")
+                Path.Combine(vsInstallDir, @"IDE\PublicAssemblies")
+                Path.Combine(vsInstallDir, @"IDE\PrivateAssemblies")
+                Path.Combine(vsInstallDir, @"IDE\CommonExtensions\Microsoft\ManagedLanguages\VBCSharp\LanguageServices")
+                Path.Combine(vsInstallDir, @"IDE\Extensions\Microsoft\CodeSense\Framework")
+                Path.Combine(vsInstallDir, @"IDE")
+            |]
+
+        AppDomain.CurrentDomain.add_AssemblyResolve(fun _ args ->
+            let found () =
+                probingPaths
+                |> Seq.tryPick (fun p ->
+                    try
+                        let name = AssemblyName(args.Name)
+                        let codebase = Path.GetFullPath(Path.Combine(p, name.Name) + ".dll")
+                        if File.Exists(codebase) then
+                            name.CodeBase <- codebase
+                            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))