Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9

dotnet · Nov 10, 2023 · 2aba8f1 · 2aba8f1
2 parents 977323a + 9b11cb3
commit 2aba8f1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -804,7 +804,7 @@ stages:
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
   - template: eng/release/insert-into-vs.yml
     parameters:
-      componentBranchName: refs/heads/release/dev17.8
+      componentBranchName: refs/heads/release/dev17.9
       insertTargetBranch: main
       insertTeamEmail: fsharpteam@microsoft.com
       insertTeamName: 'F#'

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -15,7 +15,7 @@
     <!-- F# Version components -->
     <FSMajorVersion>8</FSMajorVersion>
     <FSMinorVersion>0</FSMinorVersion>
-    <FSBuildVersion>100</FSBuildVersion>
+    <FSBuildVersion>200</FSBuildVersion>
     <FSRevisionVersion>0</FSRevisionVersion>
     <!-- -->
     <!-- F# Language version -->

diff --git a/src/Compiler/Driver/CompilerDiagnostics.fs b/src/Compiler/Driver/CompilerDiagnostics.fs
@@ -387,6 +387,7 @@ type PhasedDiagnostic with
         | 3390 -> false // xmlDocBadlyFormed - off by default
         | 3395 -> false // tcImplicitConversionUsedForMethodArg - off by default
         | 3559 -> false // typrelNeverRefinedAwayFromTop - off by default
+        | 3560 -> false // tcCopyAndUpdateRecordChangesAllFields - off by default
         | 3579 -> false // alwaysUseTypedStringInterpolation - off by default
         | 3582 -> false // infoIfFunctionShadowsUnionCase - off by default
         | _ ->

diff --git a/tests/FSharp.Compiler.ComponentTests/Diagnostics/Records.fs b/tests/FSharp.Compiler.ComponentTests/Diagnostics/Records.fs
@@ -17,6 +17,7 @@ let updateOk r = { r with F1 = 1 }
 let updateWarn r = { r with F1 = 1; F2 = "" }
     """
     |> withLangVersion80
+    |> withOptions ["--warnon:FS3560"]
     |> typecheck
     |> shouldFail
     |> withDiagnostics [
@@ -46,7 +47,6 @@ type R = { F1: int; F2: string }
 let updateWarn r = { r with F1 = 1; F2 = "" }
     """
     |> withLangVersion80
-    |> withOptions ["--nowarn:3560"]
     |> typecheck
     |> shouldSucceed
 
@@ -86,6 +86,7 @@ let t2 (x: RecTy) (a: AnotherNestedRecTy) = { x with D.C.c = { a with A = 3 } }
 let t3 (x: RecTy) (a: AnotherNestedRecTy) = { x with D.C.c = { a with A = 3; B = 4 } }
     """
     |> withLangVersion80
+    |> withOptions ["--warnon:FS3560"]
     |> typecheck
     |> shouldFail
     |> withDiagnostics [