WIP

Author: safesparrow

FSharp.sln

@@ -101,11 +101,14 @@ EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "HistoricalBenchmark", "tests\benchmarks\FCSBenchmarks\BenchmarkComparison\HistoricalBenchmark.fsproj", "{BEC6E796-7E53-4888-AAFC-B8FD55C425DF}"
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Benchmarks", "tests\benchmarks\FCSBenchmarks\CompilerServiceBenchmarks\FSharp.Compiler.Benchmarks.fsproj", "{9C7523BA-7AB2-4604-A5FD-653E82C2BAD1}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D58BFE8B-7C85-4D3B-B5F3-9A7BB90FF1EE}"
 	ProjectSection(SolutionItems) = preProject
 		src\Compiler\FSComp.txt = src\Compiler\FSComp.txt
 	EndProjectSection
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Service.Tests2", "tests\FSharp.Compiler.Service.Tests2\FSharp.Compiler.Service.Tests2.fsproj", "{7F58653C-1B72-41C7-9A06-43CAAC3051B5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -428,6 +431,18 @@ Global
 		{9C7523BA-7AB2-4604-A5FD-653E82C2BAD1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9C7523BA-7AB2-4604-A5FD-653E82C2BAD1}.Release|x86.ActiveCfg = Release|Any CPU
 		{9C7523BA-7AB2-4604-A5FD-653E82C2BAD1}.Release|x86.Build.0 = Release|Any CPU
+		{7F58653C-1B72-41C7-9A06-43CAAC3051B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F58653C-1B72-41C7-9A06-43CAAC3051B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F58653C-1B72-41C7-9A06-43CAAC3051B5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7F58653C-1B72-41C7-9A06-43CAAC3051B5}.Debug|x86.Build.0 = Debug|Any CPU
+		{7F58653C-1B72-41C7-9A06-43CAAC3051B5}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F58653C-1B72-41C7-9A06-43CAAC3051B5}.Proto|Any CPU.Build.0 = Debug|Any CPU
+		{7F58653C-1B72-41C7-9A06-43CAAC3051B5}.Proto|x86.ActiveCfg = Debug|Any CPU
+		{7F58653C-1B72-41C7-9A06-43CAAC3051B5}.Proto|x86.Build.0 = Debug|Any CPU
+		{7F58653C-1B72-41C7-9A06-43CAAC3051B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7F58653C-1B72-41C7-9A06-43CAAC3051B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F58653C-1B72-41C7-9A06-43CAAC3051B5}.Release|x86.ActiveCfg = Release|Any CPU
+		{7F58653C-1B72-41C7-9A06-43CAAC3051B5}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -460,6 +475,7 @@ Global
 		{209C7D37-8C01-413C-8698-EC25F4C86976} = {B8DDA694-7939-42E3-95E5-265C2217C142}
 		{BEC6E796-7E53-4888-AAFC-B8FD55C425DF} = {CE70D631-C5DC-417E-9CDA-B16097BEF1AC}
 		{9C7523BA-7AB2-4604-A5FD-653E82C2BAD1} = {CE70D631-C5DC-417E-9CDA-B16097BEF1AC}
+		{7F58653C-1B72-41C7-9A06-43CAAC3051B5} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BD5177C7-1380-40E7-94D2-7768E1A8B1B8}

src/fsc/fscArm64Project/fscArm64.fsproj

@@ -8,6 +8,10 @@
     <TargetExt>.exe</TargetExt>
     <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
   </PropertyGroup>
+  
+  <ItemGroup>
+    <InternalsVisibleTo Include="FSharp.Compiler.Service.Tests2" />
+  </ItemGroup>
 
   <Import Project="$([MSBuild]::GetPathOfFileAbove('fsc.targets', '$(MSBuildThisFileDirectory)../'))" />
 

src/fsc/fscProject/fsc.fsproj

@@ -15,6 +15,10 @@
     <PlatformTarget Condition="'$(TargetFramework)' == 'net472'">x86</PlatformTarget>
   </PropertyGroup>
 
+  <ItemGroup>
+    <InternalsVisibleTo Include="FSharp.Compiler.Service.Tests2" />
+  </ItemGroup>
+
   <Import Project="$([MSBuild]::GetPathOfFileAbove('fsc.targets', '$(MSBuildThisFileDirectory)../'))" />
 
 </Project>

tests/FSharp.Compiler.Service.Tests2/DepResolving.fs

@@ -48,7 +48,6 @@ type ModuleSegment = string
 
 type TrieNode =
     {
-        // parent?
         // TODO Use ValueTuples if not already
         Children : IDictionary<ModuleSegment, TrieNode>
         mutable Reachable : bool

tests/FSharp.Compiler.Service.Tests2/FSharp.Compiler.Service.Tests2.fsproj

@@ -28,6 +28,7 @@
     </Compile>
     <Compile Include="TypeTests.fs" />
     <Compile Include="DepResolving.fs" />
+    <Compile Include="RunCompiler.fs" />
     <Compile Include="..\service\Program.fs">
       <Link>Program.fs</Link>
     </Compile>
@@ -43,6 +44,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
     <PackageReference Include="Buildalyzer" Version="4.1.2" />
     <ProjectReference Include="..\..\src\Compiler\FSharp.Compiler.Service.fsproj" />
+    <ProjectReference Include="..\..\src\fsc\fscProject\fsc.fsproj" />
     <ProjectReference Include="..\..\tests\FSharp.Test.Utilities\FSharp.Test.Utilities.fsproj" />
   </ItemGroup>
 

tests/FSharp.Compiler.Service.Tests2/RunCompiler.fs

@@ -0,0 +1,8 @@
+module FSharp.Compiler.Service.Tests.RunCompiler
+
+open FSharp.Build
+
+let runCompiler () =
+    let args =
+        System.IO.File.ReadAllLines(@"C:\projekty\fsharp\heuristic\tests\FSharp.Compiler.Service.Tests2\args.txt") |> Array.skip 1
+    FSharp.Compiler.CommandLineMain.main args

tests/service/Program.fs

@@ -2,5 +2,5 @@
 
 [<EntryPoint>]
 let main argv = 
-    FSharp.Compiler.Service.Tests.DepResolving.Test()
-    0
+    //FSharp.Compiler.Service.Tests.DepResolving.Test()
+    FSharp.Compiler.Service.Tests.RunCompiler.runCompiler()