Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main to feature/nullness #16383

Merged
merged 10 commits into from
Dec 5, 2023
Merged

Merge main to feature/nullness #16383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b734f40
Localized file check-in by OneLocBuild Task: Build definition ID 499:…
dotnet-bot Oct 20, 2023
48f745b
Localized file check-in by OneLocBuild Task: Build definition ID 499:…
dotnet-bot Oct 20, 2023
ec227be
Localized file check-in by OneLocBuild Task: Build definition ID 499:…
dotnet-bot Oct 20, 2023
bb3a5ce
Merge pull request #16149 from dotnet/locfiles/d6196399-7159-464d-be3…
vzarytovskii Oct 20, 2023
f41fe15
Turn 3560 off by default, since it's hugely breaking (#16160)
vzarytovskii Oct 23, 2023
a5fb803
Merge branch 'main' into merges/release/dev17.8-to-main
KevinRansom Oct 24, 2023
dbf565d
Fixed typo in a target (#16349)
psfinaki Dec 4, 2023
2a30e25
Merge branch 'main' into merges/release/dev17.8-to-main
0101 Dec 4, 2023
ba72421
Merge pull request #16164 from dotnet/merges/release/dev17.8-to-main
vzarytovskii Dec 4, 2023
4a19eb4
Merge branch 'feature/nullness' into merges/main-to-feature/nullness
T-Gro Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions CoordinateXlif.targets
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions CoordinateXliff.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<Project>
<Target Name = "CoordinateXliff" DependsOnTargets="GenerateFSharpTextResources" BeforeTargets="GetXlfSources" />
</Project>
2 changes: 1 addition & 1 deletion Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)" />
Expand Down
1 change: 1 addition & 0 deletions src/Compiler/Driver/CompilerDiagnostics.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion tests/FSharp.Compiler.ComponentTests/Diagnostics/Records.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 [
Expand Down Expand Up @@ -46,7 +47,6 @@ type R = { F1: int; F2: string }
let updateWarn r = { r with F1 = 1; F2 = "" }
"""
|> withLangVersion80
|> withOptions ["--nowarn:3560"]
|> typecheck
|> shouldSucceed

Expand Down Expand Up @@ -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 [
Expand Down