Skip to content

Commit 02cfab6

Browse files
authored
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
2 parents 70bd177 + 20a6513 commit 02cfab6

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,7 @@ stages:
804804
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
805805
- template: eng/release/insert-into-vs.yml
806806
parameters:
807-
componentBranchName: refs/heads/release/dev17.8
807+
componentBranchName: refs/heads/release/dev17.9
808808
insertTargetBranch: main
809809
insertTeamEmail: [email protected]
810810
insertTeamName: 'F#'

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<!-- F# Version components -->
1616
<FSMajorVersion>8</FSMajorVersion>
1717
<FSMinorVersion>0</FSMinorVersion>
18-
<FSBuildVersion>100</FSBuildVersion>
18+
<FSBuildVersion>200</FSBuildVersion>
1919
<FSRevisionVersion>0</FSRevisionVersion>
2020
<!-- -->
2121
<!-- F# Language version -->

src/Compiler/Driver/CompilerDiagnostics.fs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,7 @@ type PhasedDiagnostic with
387387
| 3390 -> false // xmlDocBadlyFormed - off by default
388388
| 3395 -> false // tcImplicitConversionUsedForMethodArg - off by default
389389
| 3559 -> false // typrelNeverRefinedAwayFromTop - off by default
390+
| 3560 -> false // tcCopyAndUpdateRecordChangesAllFields - off by default
390391
| 3579 -> false // alwaysUseTypedStringInterpolation - off by default
391392
| 3582 -> false // infoIfFunctionShadowsUnionCase - off by default
392393
| _ ->

tests/FSharp.Compiler.ComponentTests/Diagnostics/Records.fs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ let updateOk r = { r with F1 = 1 }
1717
let updateWarn r = { r with F1 = 1; F2 = "" }
1818
"""
1919
|> withLangVersion80
20+
|> withOptions ["--warnon:FS3560"]
2021
|> typecheck
2122
|> shouldFail
2223
|> withDiagnostics [
@@ -46,7 +47,6 @@ type R = { F1: int; F2: string }
4647
let updateWarn r = { r with F1 = 1; F2 = "" }
4748
"""
4849
|> withLangVersion80
49-
|> withOptions ["--nowarn:3560"]
5050
|> typecheck
5151
|> shouldSucceed
5252

@@ -86,6 +86,7 @@ let t2 (x: RecTy) (a: AnotherNestedRecTy) = { x with D.C.c = { a with A = 3 } }
8686
let t3 (x: RecTy) (a: AnotherNestedRecTy) = { x with D.C.c = { a with A = 3; B = 4 } }
8787
"""
8888
|> withLangVersion80
89+
|> withOptions ["--warnon:FS3560"]
8990
|> typecheck
9091
|> shouldFail
9192
|> withDiagnostics [

0 commit comments

Comments
 (0)