Bugfix :: SRTP - ApplyDefaults for TyparConstraint.MayResolveMember (#19218)

T-Gro · web-flow · commit 422667d9993e · 2026-01-22T18:54:51.000Z
diff --git a/azure-pipelines-PR.yml b/azure-pipelines-PR.yml
@@ -906,3 +906,21 @@ stages:
           buildScript: build.sh
           displayName: FSharpPlus_Linux
           useVmImage: $(UbuntuMachineQueueName)
+        - repo: fsprojects/FSharpPlus
+          commit: 2648efe
+          buildScript: build.cmd
+          displayName: FsharpPlus_NET10
+         # remove this before merging
+        - repo: fsprojects/FSharpPlus
+          commit: 2648efe
+          buildScript: dotnet msbuild build.proj -t:Build;Test
+          displayName: FsharpPlus_NET10_Test
+        - repo: fsprojects/FSharpPlus
+          commit: 2648efe
+          buildScript: dotnet msbuild build.proj -t:Build;AllDocs
+          displayName: FsharpPlus_NET10_Docs
+        - repo: fsprojects/FSharpPlus
+          commit: 2648efe
+          buildScript: build.sh
+          displayName: FsharpPlus_Net10_Linux
+          useVmImage: $(UbuntuMachineQueueName)
diff --git a/docs/release-notes/.FSharp.Compiler.Service/10.0.200.md b/docs/release-notes/.FSharp.Compiler.Service/10.0.200.md
@@ -1,5 +1,6 @@
 ### Fixed
 
+* Fixed SRTP resolution regression causing FS0030 value restriction errors with FSharpPlus curryN-style patterns in .NET 9 SDK. ([PR #19218](https://github.com/dotnet/fsharp/pull/19218))
 * Fix FS3261 nullness warning when implementing INotifyPropertyChanged or ICommand CLIEvent properties. ([Issue #18361](https://github.com/dotnet/fsharp/issues/18361), [Issue #18349](https://github.com/dotnet/fsharp/issues/18349), [PR #19221](https://github.com/dotnet/fsharp/pull/19221))
 * Type relations cache: optimize key generation ([Issue #19116](https://github.com/dotnet/fsharp/issues/18767)) ([PR #19120](https://github.com/dotnet/fsharp/pull/19120))
 * Fixed QuickParse to correctly handle optional parameter syntax with `?` prefix, resolving syntax highlighting issues. ([Issue #11008753](https://developercommunity.visualstudio.com/t/F-Highlighting-fails-on-optional-parame/11008753)) ([PR #XXXXX](https://github.com/dotnet/fsharp/pull/XXXXX))
diff --git a/eng/templates/regression-test-jobs.yml b/eng/templates/regression-test-jobs.yml
@@ -5,29 +5,29 @@ parameters:
 - name: testMatrix
   type: object
 - name: dependsOn
-  type: string
+  type:  string
   default: 'EndToEndBuildTests'
 
 jobs:
 - ${{ each item in parameters.testMatrix }}:
   - job: RegressionTest_${{ replace(item.displayName, '-', '_') }}_${{ replace(replace(item.repo, '/', '_'), '-', '_') }}
-    displayName: '${{ item.displayName }} Regression Test'
+    displayName:  '${{ item.displayName }} Regression Test'
     dependsOn: ${{ parameters.dependsOn }}
     ${{ if item.useVmImage }}:
       pool:
         vmImage: ${{ item.useVmImage }}
     ${{ else }}:
       pool:
         name: $(DncEngPublicBuildPool)
-        demands: ImageOverride -equals $(_WindowsMachineQueueName)
+        demands:  ImageOverride -equals $(_WindowsMachineQueueName)
     timeoutInMinutes: 60
     steps:
     - checkout: self
       displayName: Checkout F# compiler repo (for scripts)
 
     - task: DownloadPipelineArtifact@2
       displayName: Download F# Compiler FSC Artifacts
-      inputs:
+      inputs: 
         artifactName: 'FSharpCompilerFscArtifacts'
         downloadPath: '$(Pipeline.Workspace)/FSharpCompiler/artifacts/bin/fsc'
 
@@ -38,17 +38,17 @@ jobs:
         downloadPath: '$(Pipeline.Workspace)/FSharpCompiler/artifacts/bin/FSharp.Core'
 
     - task: DownloadPipelineArtifact@2
-      displayName: Download UseLocalCompiler props
+      displayName:  Download UseLocalCompiler props
       inputs:
         artifactName: 'UseLocalCompilerProps'
         downloadPath: '$(Pipeline.Workspace)/Props'
 
     - pwsh: |
-        Write-Host "Cloning repository: ${{ item.repo }}"
+        Write-Host "Cloning repository:  ${{ item.repo }}"
         git clone --recursive https://github.com/${{ item.repo }}.git $(Pipeline.Workspace)/TestRepo
         Set-Location $(Pipeline.Workspace)/TestRepo
         
-        Write-Host "Checking out commit: ${{ item.commit }}"
+        Write-Host "Checking out commit:  ${{ item.commit }}"
         git checkout ${{ item.commit }}
         
         Write-Host "Initializing submodules (if any)..."
@@ -60,25 +60,22 @@ jobs:
         Write-Host "Repository structure:"
         Get-ChildItem -Name
         
-        # Check if buildScript is a built-in dotnet command or a file-based script
-        # Note: buildScript comes from the pipeline YAML configuration (testMatrix parameter),
-        # not from external user input, so it's safe to use
-        $buildScript = "${{ item.buildScript }}"
+        $buildScript = '${{ item.buildScript }}'
         if ($buildScript -like "dotnet*") {
-          Write-Host "Build command is a built-in dotnet command: $buildScript"
+          Write-Host "Build command is a built-in dotnet command:  $buildScript"
           Write-Host "Skipping file existence check for built-in command"
         } else {
-          Write-Host "Verifying build script exists: $buildScript"
+          Write-Host "Verifying build script exists:  $buildScript"
           if (Test-Path $buildScript) {
             Write-Host "Build script found: $buildScript"
           } else {
-            Write-Host "Build script not found: $buildScript"
+            Write-Host "Build script not found:  $buildScript"
             Write-Host "Available files in root:"
             Get-ChildItem
             exit 1
           }
         }
-      displayName: Checkout ${{ item.displayName }} at specific commit
+      displayName:  Checkout ${{ item.displayName }} at specific commit
 
     - pwsh: |
         Set-Location $(Pipeline.Workspace)/TestRepo
@@ -92,14 +89,14 @@ jobs:
       displayName: Remove global.json to use latest SDK
 
     - task: UseDotNet@2
-      displayName: Install .NET SDK 8.0.x for ${{ item.displayName }}
+      displayName:  Install .NET SDK 8.0.x for ${{ item.displayName }}
       inputs:
         packageType: sdk
         version: '8.0.x'
         installationPath: $(Pipeline.Workspace)/TestRepo/.dotnet
 
     - task: UseDotNet@2
-      displayName: Install .NET SDK 10.0.100 for ${{ item.displayName }}
+      displayName:  Install .NET SDK 10.0.100 for ${{ item.displayName }}
       inputs:
         packageType: sdk
         version: '10.0.100'
@@ -153,23 +150,47 @@ jobs:
         Write-Host "============================================"
         Write-Host ""
         
-        $buildScript = "${{ item.buildScript }}"
+        $buildScript = '${{ item.buildScript }}'
+        $errorLogPath = "$(Pipeline.Workspace)/build-errors.log"
+        $fullLogPath = "$(Pipeline.Workspace)/build-full.log"
+        
+        # Function to filter and capture important lines
+        function Process-BuildOutput {
+          param([string]$line)
+          Write-Host $line
+          if ($line -match ':  error ' -or 
+              $line -match ': warning ' -or 
+              $line -match 'FAILED|Failed!' -or
+              $line -match '^\s+X\s+' -or
+              $line -match 'Exception: ' -or
+              $line -match '^\s+at\s+.*\(\)' -or
+              $line -match 'Build FAILED') {
+            Add-Content -Path $errorLogPath -Value $line
+          }
+        }
         
-        # Check if it's a built-in dotnet command or a file-based script
-        # Note: buildScript comes from the pipeline YAML configuration (testMatrix parameter),
-        # not from external user input, so using Invoke-Expression is safe here
         if ($buildScript -like "dotnet*") {
-          Write-Host "Executing built-in command: $buildScript"
-          Invoke-Expression $buildScript
+          Write-Host "Executing built-in command:  $buildScript"
+          if ($IsWindows) {
+            cmd /c $buildScript 2>&1 | Tee-Object -FilePath $fullLogPath | ForEach-Object {
+              Process-BuildOutput $_
+            }
+          } else {
+            bash -c "$buildScript" 2>&1 | Tee-Object -FilePath $fullLogPath | ForEach-Object {
+              Process-BuildOutput $_
+            }
+          }
         } elseif ($IsWindows) {
-          # Execute the provided script on Windows
           Write-Host "Executing file-based script: $buildScript"
-          & ".\$buildScript"
+          & ".\$buildScript" 2>&1 | Tee-Object -FilePath $fullLogPath | ForEach-Object {
+            Process-BuildOutput $_
+          }
         } else {
-          # Execute the provided script on Linux
           Write-Host "Executing file-based script: $buildScript"
           chmod +x "$buildScript"
-          bash -c "./$buildScript"
+          bash -c "./$buildScript" 2>&1 | Tee-Object -FilePath $fullLogPath | ForEach-Object {
+            Process-BuildOutput $_
+          }
         }
         $exitCode = $LASTEXITCODE
         
@@ -182,14 +203,14 @@ jobs:
         if ($exitCode -ne 0) {
           exit $exitCode
         }
-      displayName: Build ${{ item.displayName }} with local F# compiler
+      displayName:  Build ${{ item.displayName }} with local F# compiler
       env:
         LocalFSharpCompilerPath: $(Pipeline.Workspace)/FSharpCompiler
         LoadLocalFSharpBuild: 'True'
         LocalFSharpCompilerConfiguration: Release
-      timeoutInMinutes: 45
+      timeoutInMinutes:  120
 
-    - pwsh: |
+    - pwsh:  |
         Set-Location $(Pipeline.Workspace)/TestRepo
         $binlogDir = "$(Pipeline.Workspace)/BinaryLogs"
         New-Item -ItemType Directory -Force -Path $binlogDir | Out-Null
@@ -200,18 +221,18 @@ jobs:
           Write-Host "No .binlog files found"
         } else {
           foreach ($binlog in $binlogs) {
-            Write-Host "Copying: $($binlog.FullName)"
+            Write-Host "Copying:  $($binlog.FullName)"
             Copy-Item $binlog.FullName -Destination $binlogDir
           }
           Write-Host "Collected $($binlogs.Count) .binlog files"
         }
-      displayName: Collect Binary Logs
+      displayName:  Collect Binary Logs
       condition: always()
       continueOnError: true
 
     - task: PublishPipelineArtifact@1
-      displayName: Publish ${{ item.displayName }} Binary Logs
-      inputs:
+      displayName:  Publish ${{ item.displayName }} Binary Logs
+      inputs: 
         targetPath: '$(Pipeline.Workspace)/BinaryLogs'
         artifactName: '${{ item.displayName }}_BinaryLogs'
         publishLocation: pipeline
@@ -226,51 +247,80 @@ jobs:
         Write-Host "Repository: ${{ item.repo }}"
         Write-Host "Commit: ${{ item.commit }}"
         Write-Host "Build Script: ${{ item.buildScript }}"
+        
         if ($env:AGENT_JOBSTATUS -eq "Succeeded") {
           Write-Host "Status: SUCCESS"
           Write-Host "The ${{ item.displayName }} library builds successfully with the new F# compiler"
         } else {
           Write-Host "Status: FAILED"
           Write-Host "The ${{ item.displayName }} library failed to build with the new F# compiler"
           
-          # Build multiline error message with reproduction steps
-          $lines = @(
-            "Regression test FAILED for ${{ item.displayName }} (${{ item.repo }}@${{ item.commit }})",
-            "",
-            "LOCAL REPRODUCTION STEPS (from fsharp repo root):",
-            "==========================================",
-            "# 1. Build the F# compiler",
-            "./build.sh -c Release",
-            "",
-            "# 2. Clone and checkout the failing library",
-            "cd ..",
-            "git clone --recursive https://github.com/${{ item.repo }}.git TestRepo",
-            "cd TestRepo",
-            "git checkout ${{ item.commit }}",
-            "git submodule update --init --recursive",
-            "rm -f global.json",
-            "",
-            "# 3. Prepare the repo for local compiler",
-            "dotnet fsi ../fsharp/eng/scripts/PrepareRepoForRegressionTesting.fsx `"../fsharp/UseLocalCompiler.Directory.Build.props`"",
-            "",
-            "# 4. Build with local compiler",
-            "export LocalFSharpCompilerPath=`$PWD/../fsharp",
-            "export LoadLocalFSharpBuild=True",
-            "export LocalFSharpCompilerConfiguration=Release",
-            "./${{ item.buildScript }}",
-            "=========================================="
-          )
-          
-          # Report using VSO error format - each line separately
-          foreach ($line in $lines) {
-            Write-Host "##[error]$line"
+          $errorLogPath = "$(Pipeline.Workspace)/build-errors.log"
+          if (Test-Path $errorLogPath) {
+            Write-Host ""
+            Write-Host "##[error]============================================"
+            Write-Host "##[error]FAILURE SUMMARY for ${{ item.displayName }}"
+            Write-Host "##[error]============================================"
+            
+            $errors = Get-Content $errorLogPath | Select-Object -First 100
+            $errorCount = 0
+            $warningCount = 0
+            $testFailCount = 0
+            
+            foreach ($line in $errors) {
+              if ($line -match ': error ') {
+                Write-Host "##[error]$line"
+                $errorCount++
+              } elseif ($line -match ': warning ') {
+                Write-Host "##[warning]$line"
+                $warningCount++
+              } elseif ($line -match 'FAILED|Failed! |^\s+X\s+') {
+                Write-Host "##[error][TEST] $line"
+                $testFailCount++
+              } else {
+                Write-Host "##[error]$line"
+              }
+            }
+            
+            $totalLines = (Get-Content $errorLogPath | Measure-Object -Line).Lines
+            if ($totalLines -gt 100) {
+              Write-Host "##[warning]... and $($totalLines - 100) more lines (see full log or binary logs)"
+            }
+            
+            Write-Host ""
+            Write-Host "##[error]Summary: $errorCount error(s), $warningCount warning(s), $testFailCount test failure(s)"
+            Write-Host "##[error]============================================"
+          } else {
+            Write-Host "##[warning]No error log captured - check full build output above"
           }
           
-          # Also log as VSO issue for Azure DevOps integration
+          Write-Host ""
+          Write-Host "##[section]LOCAL REPRODUCTION STEPS (from fsharp repo root):"
+          Write-Host "# 1. Build the F# compiler"
+          Write-Host "./build.sh -c Release"
+          Write-Host ""
+          Write-Host "# 2. Clone and checkout the failing library"
+          Write-Host "cd .."
+          Write-Host "git clone --recursive https://github.com/${{ item.repo }}.git TestRepo"
+          Write-Host "cd TestRepo"
+          Write-Host "git checkout ${{ item.commit }}"
+          Write-Host "git submodule update --init --recursive"
+          Write-Host "rm -f global.json"
+          Write-Host ""
+          Write-Host "# 3. Prepare the repo for local compiler"
+          Write-Host "dotnet fsi ../fsharp/eng/scripts/PrepareRepoForRegressionTesting.fsx `"../fsharp/UseLocalCompiler.Directory.Build.props`""
+          Write-Host ""
+          Write-Host "# 4. Build with local compiler"
+          Write-Host "export LocalFSharpCompilerPath=`$PWD/../fsharp"
+          Write-Host "export LoadLocalFSharpBuild=True"
+          Write-Host "export LocalFSharpCompilerConfiguration=Release"
+          Write-Host "${{ item.buildScript }}"
+          
           Write-Host "##vso[task.logissue type=error;sourcepath=azure-pipelines-PR.yml]Regression test failed: ${{ item.displayName }}"
         }
         Write-Host "============================================"
         
+        Write-Host ""
         Write-Host "Binary logs found:"
         Get-ChildItem "*.binlog" -Recurse -ErrorAction SilentlyContinue | ForEach-Object { Write-Host $_.FullName }
       displayName: Report ${{ item.displayName }} test result
diff --git a/src/Compiler/Checking/CheckDeclarations.fs b/src/Compiler/Checking/CheckDeclarations.fs
@@ -5672,10 +5672,13 @@ let ApplyDefaults (cenv: cenv) g denvAtEnd m moduleContents extraAttribs =
                     // the defaults will be propagated to the new type variable. 
                     ApplyTyparDefaultAtPriority denvAtEnd cenv.css priority tp)
 
-        // OK, now apply defaults for any unsolved TyparStaticReq.HeadType 
+        // OK, now apply defaults for any unsolved TyparStaticReq.HeadType or typars with SRTP (MayResolveMember) constraints
+        // Note: We also check for MayResolveMember constraints because some SRTP typars may not have StaticReq set
+        // (this can happen when the typar is involved in an SRTP constraint but isn't the "head type" itself)
         unsolved |> List.iter (fun tp ->     
             if not tp.IsSolved then 
-                if (tp.StaticReq <> TyparStaticReq.None) then
+                let hasSRTPConstraint = tp.Constraints |> List.exists (function TyparConstraint.MayResolveMember _ -> true | _ -> false)
+                if (tp.StaticReq <> TyparStaticReq.None) || hasSRTPConstraint then
                     ChooseTyparSolutionAndSolve cenv.css denvAtEnd tp)
     with RecoverableException exn ->
         errorRecovery exn m
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/IWSAMsAndSRTPs/IWSAMsAndSRTPsTests.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/IWSAMsAndSRTPs/IWSAMsAndSRTPsTests.fs
