From 5356cebb82fc94a0d84b1e4a65eea2661787d718 Mon Sep 17 00:00:00 2001 From: cartermp Date: Fri, 13 Nov 2020 16:17:37 -0800 Subject: [PATCH 1/5] Turn XML doc and Sig<->Impl mismatch warnings on by default --- src/fsharp/CompilerDiagnostics.fs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/fsharp/CompilerDiagnostics.fs b/src/fsharp/CompilerDiagnostics.fs index 80c84edf17b..a990d849a41 100644 --- a/src/fsharp/CompilerDiagnostics.fs +++ b/src/fsharp/CompilerDiagnostics.fs @@ -374,9 +374,7 @@ let warningOn err level specificWarnOn = // Some specific warnings are never on by default, i.e. unused variable warnings match n with | 1182 -> false // chkUnusedValue - off by default - | 3218 -> false // ArgumentsInSigAndImplMismatch - off by default | 3180 -> false // abImplicitHeapAllocation - off by default - | 3390 -> false // xmlDocBadlyFormed - off by default | _ -> level >= GetWarningLevel err let SplitRelatedDiagnostics(err: PhasedDiagnostic) : PhasedDiagnostic * PhasedDiagnostic list = From 3e28dd561ae8a03af9141d7612e13e69f84a1481 Mon Sep 17 00:00:00 2001 From: cartermp Date: Fri, 13 Nov 2020 16:51:44 -0800 Subject: [PATCH 2/5] Adjustments --- .../FSharp.DependencyManager.fs | 4 ++-- .../DummyProviderForLanguageServiceTesting.fsproj | 1 + .../DummyProviderForLanguageServiceTesting/ProvidedTypes.fsi | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/fsharp/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs b/src/fsharp/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs index 5389bb2cc09..01d198bd8d1 100644 --- a/src/fsharp/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs +++ b/src/fsharp/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs @@ -242,14 +242,14 @@ type FSharpDependencyManager (outputDir:string option) = sprintf """ #r "nuget:FSharp.Data";; // %s 'FSharp.Data' %s""" (SR.loadNugetPackage()) (SR.highestVersion()) |] - member this.ResolveDependencies(scriptExt: string, packageManagerTextLines: (string * string) seq, targetFramework: string, runtimeIdentifier: string) : obj = + member this.ResolveDependencies(scriptExt: string, packageManagerTextLines: (string * string) seq, targetFrameworkMoniker: string, runtimeIdentifier: string) : obj = let poundRprefix = match scriptExt with | ".csx" -> "#r \"" | _ -> "#r @\"" let generateAndBuildProjectArtifacts = - let resolutionResult = prepareDependencyResolutionFiles (scriptExt, packageManagerTextLines, targetFramework, runtimeIdentifier) + let resolutionResult = prepareDependencyResolutionFiles (scriptExt, packageManagerTextLines, targetFrameworkMoniker, runtimeIdentifier) match resolutionResult.resolutionsFile with | Some file -> let resolutions = getResolutionsFromFile file diff --git a/vsintegration/tests/MockTypeProviders/DummyProviderForLanguageServiceTesting/DummyProviderForLanguageServiceTesting.fsproj b/vsintegration/tests/MockTypeProviders/DummyProviderForLanguageServiceTesting/DummyProviderForLanguageServiceTesting.fsproj index 28541d96ad1..2d7a2805031 100644 --- a/vsintegration/tests/MockTypeProviders/DummyProviderForLanguageServiceTesting/DummyProviderForLanguageServiceTesting.fsproj +++ b/vsintegration/tests/MockTypeProviders/DummyProviderForLanguageServiceTesting/DummyProviderForLanguageServiceTesting.fsproj @@ -5,6 +5,7 @@ net472 true + --nowarn:3390 diff --git a/vsintegration/tests/MockTypeProviders/DummyProviderForLanguageServiceTesting/ProvidedTypes.fsi b/vsintegration/tests/MockTypeProviders/DummyProviderForLanguageServiceTesting/ProvidedTypes.fsi index 3267c5b9ea4..fbd66a3a507 100644 --- a/vsintegration/tests/MockTypeProviders/DummyProviderForLanguageServiceTesting/ProvidedTypes.fsi +++ b/vsintegration/tests/MockTypeProviders/DummyProviderForLanguageServiceTesting/ProvidedTypes.fsi @@ -427,7 +427,8 @@ type ProvidedAssembly = /// and adjust the 'Assembly' property of all provided type definitions to return that /// assembly. /// - /// A path of type names to wrap the generated types. The generated types are then generated as nested types. + /// A list of nested ProvidedTypeDefinitions to add to the ProvidedAssembly. + /// A path of type names to wrap the generated types. The generated types are then generated as nested types. member AddNestedTypes : types : ProvidedTypeDefinition list * enclosingGeneratedTypeNames: string list -> unit #if FX_NO_LOCAL_FILESYSTEM From 462052bc460fdce0ca4483e29ed4355ae0d4f33f Mon Sep 17 00:00:00 2001 From: cartermp Date: Fri, 13 Nov 2020 17:20:44 -0800 Subject: [PATCH 3/5] adjustments --- .../DummyProviderForLanguageServiceTesting.fsproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vsintegration/tests/MockTypeProviders/DummyProviderForLanguageServiceTesting/DummyProviderForLanguageServiceTesting.fsproj b/vsintegration/tests/MockTypeProviders/DummyProviderForLanguageServiceTesting/DummyProviderForLanguageServiceTesting.fsproj index 2d7a2805031..5bdfd8af56f 100644 --- a/vsintegration/tests/MockTypeProviders/DummyProviderForLanguageServiceTesting/DummyProviderForLanguageServiceTesting.fsproj +++ b/vsintegration/tests/MockTypeProviders/DummyProviderForLanguageServiceTesting/DummyProviderForLanguageServiceTesting.fsproj @@ -5,7 +5,7 @@ net472 true - --nowarn:3390 + --nowarn:3390 --nowarn:3218 From 140be4f5c84e982f63543149bab79e038673141c Mon Sep 17 00:00:00 2001 From: cartermp Date: Mon, 16 Nov 2020 10:32:12 -0800 Subject: [PATCH 4/5] Fix up more providedtypes --- tests/service/data/TestTP/ProvidedTypes.fsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/service/data/TestTP/ProvidedTypes.fsi b/tests/service/data/TestTP/ProvidedTypes.fsi index 3eb5025f6d4..3988d1f1f00 100644 --- a/tests/service/data/TestTP/ProvidedTypes.fsi +++ b/tests/service/data/TestTP/ProvidedTypes.fsi @@ -412,7 +412,8 @@ type ProvidedAssembly = /// and adjust the 'Assembly' property of all provided type definitions to return that /// assembly. /// - /// A path of type names to wrap the generated types. The generated types are then generated as nested types. + /// A list of nested ProvidedTypeDefinitions to add to the ProvidedAssembly. + /// A path of type names to wrap the generated types. The generated types are then generated as nested types. member AddNestedTypes : types : ProvidedTypeDefinition list * enclosingGeneratedTypeNames: string list -> unit #if FX_NO_LOCAL_FILESYSTEM From 4d3bf46f57d2c0eebeecf7214126f87988af3f95 Mon Sep 17 00:00:00 2001 From: cartermp Date: Mon, 16 Nov 2020 10:55:43 -0800 Subject: [PATCH 5/5] Update testTP --- tests/service/data/TestTP/TestTP.fsproj | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/service/data/TestTP/TestTP.fsproj b/tests/service/data/TestTP/TestTP.fsproj index 66087982151..4343a1d8a4a 100644 --- a/tests/service/data/TestTP/TestTP.fsproj +++ b/tests/service/data/TestTP/TestTP.fsproj @@ -5,6 +5,7 @@ net472 true nunit + --nowarn:3390 --nowarn:3218