diff --git a/build.fsx b/build.fsx index befcbdc060..f0cc5e8261 100644 --- a/build.fsx +++ b/build.fsx @@ -82,6 +82,11 @@ Target "GenerateFSIStrings" (fun _ -> p.WorkingDirectory <- dir p.FileName <- !! "packages/FsSrGen/lib/net46/fssrgen.exe" |> Seq.head ) TimeSpan.MaxValue |> ignore +// execProcess (fun p -> + // p.Arguments <- "u+x packages/FsSrGen/lib/net46/fssrgen.exe" + // p.WorkingDirectory <- __SOURCE_DIRECTORY__ + // p.FileName <- "chmod") TimeSpan.MaxValue + // |> ignore ) Target "Build" (fun _ -> diff --git a/src/fsharp/FSharp.Compiler.Service.ProjectCrackerTool/App.config b/src/fsharp/FSharp.Compiler.Service.ProjectCrackerTool/App.config index 2d749d9c84..fdab151af2 100644 --- a/src/fsharp/FSharp.Compiler.Service.ProjectCrackerTool/App.config +++ b/src/fsharp/FSharp.Compiler.Service.ProjectCrackerTool/App.config @@ -7,11 +7,11 @@ - + - + diff --git a/src/fsharp/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj b/src/fsharp/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj index 05fcde3212..1062cc01d9 100644 --- a/src/fsharp/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj +++ b/src/fsharp/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj @@ -67,13 +67,13 @@ - + True - + True - + True diff --git a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj index 4f0d8ec287..82892fdafb 100644 --- a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj +++ b/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj @@ -49,12 +49,12 @@ $(DefineConstants);NO_STRONG_NAMES $(DefineConstants);TRACE 4.4.0.0 - ..\..\..\ + $(MSBuildProjectDirectory)\..\..\..\ - ..\..\..\lib\bootstrap\4.0 - ..\..\..\packages\FsSrGen\lib\net46 + $(SolutionDir)lib\bootstrap\4.0 + $(SolutionDir)packages\FsSrGen\lib\net46 $(FsLexYaccPath) $(FsLexYaccPath) fslex.exe @@ -661,7 +661,7 @@ - + diff --git a/tests/service/ProjectOptionsTests.fs b/tests/service/ProjectOptionsTests.fs index e6377a0fe3..245b0f482a 100644 --- a/tests/service/ProjectOptionsTests.fs +++ b/tests/service/ProjectOptionsTests.fs @@ -95,6 +95,7 @@ let ``Project file parsing VS2013_FSharp_Portable_Library_net45``() = [] let ``Project file parsing Sample_VS2013_FSharp_Portable_Library_net451_adjusted_to_profile78``() = let projectFile = __SOURCE_DIRECTORY__ + @"/../projects/Sample_VS2013_FSharp_Portable_Library_net451_adjusted_to_profile78/Sample_VS2013_FSharp_Portable_Library_net451.fsproj" + Directory.SetCurrentDirectory(__SOURCE_DIRECTORY__ + @"/../projects/Sample_VS2013_FSharp_Portable_Library_net451_adjusted_to_profile78/") let options = ProjectCracker.GetProjectOptionsFromProjectFile(projectFile, []) checkOption options.OtherOptions "--targetprofile:netcore" @@ -207,7 +208,7 @@ let ``Project file parsing -- Logging``() = Assert.That(log, Is.StringContaining("Reference System.Core resolved")) Assert.That(log, Is.StringContaining("Using task ResolveAssemblyReference from Microsoft.Build.Tasks.ResolveAssemblyReference")) else - Assert.That(log, Is.StringContaining("""Using "ResolveAssemblyReference" task from assembly "Microsoft.Build.Tasks.v12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a".""")) + Assert.That(log, Is.StringContaining("""Using "ResolveAssemblyReference" task from assembly "Microsoft.Build.Tasks.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a".""")) [] let ``Project file parsing -- Full path``() = @@ -409,5 +410,16 @@ let ``Project file parsing -- space in file name``() = |> set |> should equal (set [ "Test2File1.fs"; "Test2File2.fs" ]) +[] +let ``Project file parsing -- report files``() = + if not runningOnMono then + for f in Directory.EnumerateFiles(@"C:\Program Files (x86)\Reference Assemblies\Microsoft\FSharp\","*",SearchOption.AllDirectories) do + printfn "File: %s" f + for f in Directory.EnumerateFiles(@"C:\Program Files (x86)\Microsoft SDKs\F#\4.0\","*",SearchOption.AllDirectories) do + printfn "File: %s" f + + #endif + +