Fixed merge issues

Author: ncave

.vscode/launch.json

@@ -97,7 +97,7 @@
             "name": "FCS Test",
             "type": "coreclr",
             "request": "launch",
-            "program": "${workspaceFolder}/artifacts/bin/fcs-test/Debug/net8.0/fcs-test.dll",
+            "program": "${workspaceFolder}/artifacts/bin/fcs-test/Debug/net10.0/fcs-test.dll",
             "args": [],
             "cwd": "${workspaceFolder}/fcs/fcs-test",
             "console": "internalConsole",

buildtools/buildtools.targets

@@ -20,7 +20,7 @@
           BeforeTargets="CoreCompile">
 
     <PropertyGroup>
-        <FsLexPath Condition="'$(FsLexPath)' == ''">$(ArtifactsDir)\bin\fslex\Release\net9.0\linux-x64\fslex.dll</FsLexPath>
+        <FsLexPath Condition="'$(FsLexPath)' == ''">$(ArtifactsDir)\bin\fslex\Release\net10.0\linux-x64\fslex.dll</FsLexPath>
     </PropertyGroup>
 
     <!-- Create the output directory -->
@@ -44,7 +44,7 @@
           BeforeTargets="CoreCompile">
 
     <PropertyGroup>
-        <FsYaccPath Condition="'$(FsYaccPath)' == ''">$(ArtifactsDir)\bin\fsyacc\Release\net9.0\linux-x64\fsyacc.dll</FsYaccPath>
+        <FsYaccPath Condition="'$(FsYaccPath)' == ''">$(ArtifactsDir)\bin\fsyacc\Release\net10.0\linux-x64\fsyacc.dll</FsYaccPath>
     </PropertyGroup>
 
     <!-- Create the output directory -->

fcs/build.sh

@@ -3,5 +3,5 @@
 dotnet build -c Release buildtools/fslex
 dotnet build -c Release buildtools/fsyacc
 dotnet build -c Release src/Compiler
-dotnet run -c Release --project fcs/fcs-test
+dotnet run -c Release --project fcs/fcs-test/fcs-test.fsproj
 echo "Binaries can be found here: /artifacts/bin/FSharp.Compiler.Service/Release/netstandard2.0/"

fcs/fcs-test/Program.fs

@@ -8,7 +8,7 @@ open Buildalyzer
 
 let getProjectOptionsFromProjectFile (isMain: bool) (projFile: string) =
 
-    let tryGetResult (isMain: bool) (manager: AnalyzerManager) (maybeCsprojFile: string) =
+    let tryGetResult (_isMain: bool) (manager: AnalyzerManager) (maybeCsprojFile: string) =
 
         let analyzer = manager.GetProject(maybeCsprojFile)
         let env = analyzer.EnvironmentFactory.GetBuildEnvironment(Environment.EnvironmentOptions(DesignTime=true,Restore=false))
@@ -129,7 +129,7 @@ let printAst title (projectResults: FSharpCheckProjectResults) =
     decls |> printfn "%s"
 
 [<EntryPoint>]
-let main argv = 
+let main _argv = 
     let projName = "Project.fsproj"
     let fileName = __SOURCE_DIRECTORY__ + "/test_script.fsx"
     let fileNames = [| fileName |]

fcs/fcs-test/fcs-test.fsproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
   </PropertyGroup>
 

fcs/service_slim.fs

@@ -169,7 +169,7 @@ module internal ParseAndCheck =
         let dependencyFiles = parseResults |> Seq.map (fun x -> x.DependencyFiles) |> Array.concat
         let getAssemblyData () = None
         let details = (compilerState.tcGlobals, compilerState.tcImports, tcState.Ccu, tcState.CcuSig, symbolUses, topAttrsOpt,
-                        getAssemblyData, assemblyRef, access, tcImplFilesOpt, dependencyFiles, compilerState.projectOptions)
+                        getAssemblyData, assemblyRef, access, tcImplFilesOpt, dependencyFiles, Some compilerState.projectOptions)
         let keepAssemblyContents = true
         FSharpCheckProjectResults (projectFileName, Some compilerState.tcConfig, keepAssemblyContents, errors, Some details)
 
@@ -203,7 +203,7 @@ module internal ParseAndCheck =
         let input = parseResults.ParseTree
         let diagnosticsOptions = compilerState.tcConfig.diagnosticsOptions
         let capturingLogger = CompilationDiagnosticLogger("TypeCheckFile", diagnosticsOptions)
-        let diagnosticsLogger = GetDiagnosticsLoggerFilteringByScopedPragmas(false, input.ScopedPragmas, diagnosticsOptions, capturingLogger)
+        let diagnosticsLogger = GetDiagnosticsLoggerFilteringByScopedNowarn(diagnosticsOptions, capturingLogger)
         use _scope = new CompilationGlobalsScope (diagnosticsLogger, BuildPhase.TypeCheck)
 
         let checkForErrors () = parseResults.ParseHadErrors || diagnosticsLogger.ErrorCount > 0
@@ -235,7 +235,7 @@ module internal ParseAndCheck =
         let errors = Array.append parseResults.Diagnostics tcErrors
 
         let scope = TypeCheckInfo (compilerState.tcConfig, compilerState.tcGlobals, ccuSigForFile, tcState.Ccu, compilerState.tcImports, tcEnvAtEnd.AccessRights,
-                                projectFileName, fileName, compilerState.projectOptions, sink.GetResolutions(), sink.GetSymbolUses(), tcEnvAtEnd.NameEnv,
+                                projectFileName, fileName, Some compilerState.projectOptions, sink.GetResolutions(), sink.GetSymbolUses(), tcEnvAtEnd.NameEnv,
                                 loadClosure, implFile, sink.GetOpenDeclarations())
         FSharpCheckFileResults (fileName, errors, Some scope, parseResults.DependencyFiles, None, keepAssemblyContents)
 

src/Compiler/Service/FSharpCheckerResults.fsi

@@ -256,7 +256,7 @@ type internal TypeCheckInfo =
         tcAccessRights: AccessorDomain *
         projectFileName: string *
         mainInputFileName: string *
-        projectOptions: FSharpProjectOptions *
+        projectOptions: FSharpProjectOptions option *
         sResolutions: TcResolutions *
         sSymbolUses: TcSymbolUses *
         sFallback: NameResolutionEnv *