Merge pull request #16383 from dotnet/merges/main-to-feature/nullness

Merge main to feature/nullness

Author: T-Gro

CoordinateXlif.targets

@@ -0,0 +1,3 @@
+<Project>
+  <Target Name = "CoordinateXliff" DependsOnTargets="GenerateFSharpTextResources" BeforeTargets="GetXlfSources" />
+</Project>

CoordinateXliff.targets

@@ -1,7 +1,7 @@
 <Project>
   <Import Project="FSharpBuild.Directory.Build.targets" Condition = " '$(FSharpTestCompilerVersion)' == '' "/>
   <Import Project="FSharpTests.Directory.Build.targets" Condition = " '$(FSharpTestCompilerVersion)' != '' "/>
-  <Import Project="CoordinateXlif.targets" Condition = " '$(FSharpBuildAssemblyFile)' != '' and '$(XliffTasksAssembly)' != '' "/>
+  <Import Project="CoordinateXliff.targets" Condition = " '$(FSharpBuildAssemblyFile)' != '' and '$(XliffTasksAssembly)' != '' "/>
 
   <ItemGroup Condition="'$(UnitTestType)' == 'nunit'">
     <PackageReference Include="NUnit" Version="$(NUnitVersion)" />

Directory.Build.targets

@@ -395,6 +395,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
         | 3570 -> false // tcAmbiguousDiscardDotLambda - off by default

src/Compiler/Driver/CompilerDiagnostics.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 [