From c5e4d03e1ec38b7a097ecea22a5f48d32dcbd687 Mon Sep 17 00:00:00 2001 From: "Kevin Ransom (msft)" Date: Thu, 15 Sep 2016 20:10:19 -0700 Subject: [PATCH 1/6] Update projects for Preview 5 --- .../FSharp.Compiler.Server.Shared.fsproj | 3 ++- .../FSharp.LanguageService.Compiler.fsproj | 3 ++- vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj | 3 ++- .../FSharp.LanguageService.Base.csproj | 3 ++- .../src/FSharp.LanguageService/FSharp.LanguageService.fsproj | 1 + .../Project/ProjectSystem.Base.csproj | 3 ++- .../FSharp.PropertiesPages.vbproj | 3 ++- vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj | 3 ++- 8 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj index efe7c37235a..bc4fe84ba21 100644 --- a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj +++ b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj @@ -40,9 +40,10 @@ + - + diff --git a/src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj b/src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj index 449cc64b900..a1ae349bc1b 100644 --- a/src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj +++ b/src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj @@ -562,7 +562,7 @@ - + @@ -572,6 +572,7 @@ + $(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Framework.dll diff --git a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj index 77a73d101b1..62b7848bd5f 100644 --- a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj +++ b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj @@ -69,10 +69,11 @@ - + + diff --git a/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj b/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj index 495b15f67fe..df5b3822d93 100644 --- a/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj +++ b/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj @@ -77,9 +77,10 @@ - + + diff --git a/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj b/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj index d00f85a78a1..c707e7ade6d 100644 --- a/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj +++ b/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj @@ -72,6 +72,7 @@ + diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj index 0284bd6e3ce..11cbf459f54 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj @@ -91,7 +91,8 @@ - + + diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj index da40fbb61e2..d54b17855a6 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj @@ -72,9 +72,10 @@ - + + diff --git a/vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj b/vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj index 9faa0d0e968..387d7fff7ff 100644 --- a/vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj +++ b/vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj @@ -70,9 +70,10 @@ + - + From 0fe4affecac0f3932b71beadbf94b9ce812d5e36 Mon Sep 17 00:00:00 2001 From: "Kevin Ransom (msft)" Date: Thu, 15 Sep 2016 22:33:17 -0700 Subject: [PATCH 2/6] Add test to embedd a pdb and also do a better job of building on preview 4 and below dev 15 previews. --- .../FSharp.Compiler.Server.Shared.fsproj | 2 +- .../FSharp.LanguageService.Compiler.fsproj | 3 +-- tests/fsharpqa/Source/CompilerOptions/fsc/pdb/env.lst | 2 ++ vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj | 2 +- .../FSharp.LanguageService.Base.csproj | 2 +- .../src/FSharp.LanguageService/FSharp.LanguageService.fsproj | 2 +- .../Project/ProjectSystem.Base.csproj | 2 +- .../src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj | 2 +- .../FSharp.PropertiesPages.vbproj | 2 +- vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj | 2 +- 10 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj index bc4fe84ba21..0244fff8e37 100644 --- a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj +++ b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj @@ -43,7 +43,7 @@ - + diff --git a/src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj b/src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj index a1ae349bc1b..923272cef95 100644 --- a/src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj +++ b/src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj @@ -562,8 +562,7 @@ - - + diff --git a/tests/fsharpqa/Source/CompilerOptions/fsc/pdb/env.lst b/tests/fsharpqa/Source/CompilerOptions/fsc/pdb/env.lst index 1d1680d8d75..7c141e2efe7 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsc/pdb/env.lst +++ b/tests/fsharpqa/Source/CompilerOptions/fsc/pdb/env.lst @@ -14,6 +14,8 @@ NOMONO SOURCE=pdb01.fs SCFLAGS="--debug --pdb:.\\pdb01.pdb" PRECMD="IF EXIST pd NOMONO SOURCE=pdb01.fs SCFLAGS="-g --pdb:.\\pdb01.fs" PRECMD="IF EXIST pdb01.pdb DEL pdb01.pdb" POSTCMD="IF NOT EXIST pdb01.pdb EXIT 1" # different file w/ -g (try to overwrite) +NOMONO SOURCE=pdb01.fs SCFLAGS="-g --debug:embedded -o:pdb01embedded.exe" PRECMD="IF EXIST pdb01embedded.exe DEL pdb01embedded.exe" POSTCMD="IF NOT EXIST pdb01embedded.pdb EXIT 1" # If pdb file exists then it didn't embed + # Case sensitive SOURCE=pdb02.fs SCFLAGS="--PDB -g" POSTCMD="IF EXIST pdb02.pdb EXIT 1" # --PDB diff --git a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj index 62b7848bd5f..4be5eca033e 100644 --- a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj +++ b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj @@ -69,7 +69,7 @@ - + diff --git a/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj b/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj index df5b3822d93..2fb728037ea 100644 --- a/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj +++ b/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj @@ -77,7 +77,7 @@ - + diff --git a/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj b/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj index c707e7ade6d..de36efbec24 100644 --- a/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj +++ b/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj @@ -81,7 +81,7 @@ - + diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj index 11cbf459f54..68f7ee7986f 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj @@ -92,7 +92,7 @@ - + diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj b/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj index f5a21f30519..1a855661fee 100644 --- a/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj +++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj @@ -70,7 +70,7 @@ - + diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj index d54b17855a6..e4e9be2af41 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj @@ -72,7 +72,7 @@ - + diff --git a/vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj b/vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj index 387d7fff7ff..0858e94d1a4 100644 --- a/vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj +++ b/vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj @@ -73,7 +73,7 @@ - + From ec8a9f71360aaee3d56fee263a02efc9eb86b499 Mon Sep 17 00:00:00 2001 From: "Kevin Ransom (msft)" Date: Thu, 15 Sep 2016 23:52:06 -0700 Subject: [PATCH 3/6] alternate version detection --- .../FSharp.Compiler.Server.Shared.fsproj | 2 +- .../FSharp.LanguageService.Compiler.fsproj | 2 +- vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj | 2 +- .../FSharp.LanguageService.Base.csproj | 2 +- .../src/FSharp.LanguageService/FSharp.LanguageService.fsproj | 2 +- .../FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj | 2 +- .../src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj | 2 +- .../FSharp.PropertiesPages.vbproj | 2 +- vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj index 0244fff8e37..508e735449c 100644 --- a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj +++ b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj @@ -43,7 +43,7 @@ - + diff --git a/src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj b/src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj index 923272cef95..d4e2369acaf 100644 --- a/src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj +++ b/src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj @@ -562,7 +562,7 @@ - + diff --git a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj index 4be5eca033e..551da2c4f7a 100644 --- a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj +++ b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj @@ -69,7 +69,7 @@ - + diff --git a/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj b/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj index 2fb728037ea..17362e18a70 100644 --- a/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj +++ b/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj @@ -77,7 +77,7 @@ - + diff --git a/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj b/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj index de36efbec24..efb6b1dffc6 100644 --- a/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj +++ b/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj @@ -81,7 +81,7 @@ - + diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj index 68f7ee7986f..e4c5214964e 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj @@ -92,7 +92,7 @@ - + diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj b/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj index 1a855661fee..6ba9e0be290 100644 --- a/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj +++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj @@ -70,7 +70,7 @@ - + diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj index e4e9be2af41..2339d5b834d 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj @@ -72,7 +72,7 @@ - + diff --git a/vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj b/vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj index 0858e94d1a4..bae06aadfad 100644 --- a/vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj +++ b/vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj @@ -73,7 +73,7 @@ - + From 73187b9dcee5a0ab1954d700ec491fadc102d558 Mon Sep 17 00:00:00 2001 From: "Kevin Ransom (msft)" Date: Fri, 16 Sep 2016 08:45:44 -0700 Subject: [PATCH 4/6] Embed test failed on success .... fix it --- tests/fsharpqa/Source/CompilerOptions/fsc/pdb/env.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fsharpqa/Source/CompilerOptions/fsc/pdb/env.lst b/tests/fsharpqa/Source/CompilerOptions/fsc/pdb/env.lst index 7c141e2efe7..3d4b9d224dc 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsc/pdb/env.lst +++ b/tests/fsharpqa/Source/CompilerOptions/fsc/pdb/env.lst @@ -14,7 +14,7 @@ NOMONO SOURCE=pdb01.fs SCFLAGS="--debug --pdb:.\\pdb01.pdb" PRECMD="IF EXIST pd NOMONO SOURCE=pdb01.fs SCFLAGS="-g --pdb:.\\pdb01.fs" PRECMD="IF EXIST pdb01.pdb DEL pdb01.pdb" POSTCMD="IF NOT EXIST pdb01.pdb EXIT 1" # different file w/ -g (try to overwrite) -NOMONO SOURCE=pdb01.fs SCFLAGS="-g --debug:embedded -o:pdb01embedded.exe" PRECMD="IF EXIST pdb01embedded.exe DEL pdb01embedded.exe" POSTCMD="IF NOT EXIST pdb01embedded.pdb EXIT 1" # If pdb file exists then it didn't embed +NOMONO SOURCE=pdb01.fs SCFLAGS="-g --debug:embedded -o:pdb01embedded.exe" PRECMD="IF EXIST pdb01embedded.exe DEL pdb01embedded.exe" POSTCMD="IF EXIST pdb01embedded.pdb EXIT 1" # If pdb file exists then it didn't embed so fail. # Case sensitive SOURCE=pdb02.fs SCFLAGS="--PDB -g" POSTCMD="IF EXIST pdb02.pdb EXIT 1" # --PDB From df7b7db93b0faa9e8504525cdaa4168643ce4788 Mon Sep 17 00:00:00 2001 From: "Kevin Ransom (msft)" Date: Fri, 16 Sep 2016 10:37:34 -0700 Subject: [PATCH 5/6] clean up from prior failures for embedded test --- tests/fsharpqa/Source/CompilerOptions/fsc/pdb/env.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fsharpqa/Source/CompilerOptions/fsc/pdb/env.lst b/tests/fsharpqa/Source/CompilerOptions/fsc/pdb/env.lst index 3d4b9d224dc..b1bb3f462c0 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsc/pdb/env.lst +++ b/tests/fsharpqa/Source/CompilerOptions/fsc/pdb/env.lst @@ -14,7 +14,7 @@ NOMONO SOURCE=pdb01.fs SCFLAGS="--debug --pdb:.\\pdb01.pdb" PRECMD="IF EXIST pd NOMONO SOURCE=pdb01.fs SCFLAGS="-g --pdb:.\\pdb01.fs" PRECMD="IF EXIST pdb01.pdb DEL pdb01.pdb" POSTCMD="IF NOT EXIST pdb01.pdb EXIT 1" # different file w/ -g (try to overwrite) -NOMONO SOURCE=pdb01.fs SCFLAGS="-g --debug:embedded -o:pdb01embedded.exe" PRECMD="IF EXIST pdb01embedded.exe DEL pdb01embedded.exe" POSTCMD="IF EXIST pdb01embedded.pdb EXIT 1" # If pdb file exists then it didn't embed so fail. +NOMONO SOURCE=pdb01.fs SCFLAGS="-g --debug:embedded -o:pdb01embedded.exe" PRECMD="IF EXIST pdb01embedded.pdb DEL pdb01embedded.pdb" POSTCMD="IF EXIST pdb01embedded.pdb EXIT 1" # If pdb file exists then it didn't embed so fail. # Case sensitive SOURCE=pdb02.fs SCFLAGS="--PDB -g" POSTCMD="IF EXIST pdb02.pdb EXIT 1" # --PDB From 193948c0efe484b050db15f74150d9375331a446 Mon Sep 17 00:00:00 2001 From: "Kevin Ransom (msft)" Date: Fri, 16 Sep 2016 12:02:43 -0700 Subject: [PATCH 6/6] don't modify output name for embedded testcase --- tests/fsharpqa/Source/CompilerOptions/fsc/pdb/env.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fsharpqa/Source/CompilerOptions/fsc/pdb/env.lst b/tests/fsharpqa/Source/CompilerOptions/fsc/pdb/env.lst index b1bb3f462c0..9124761257b 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsc/pdb/env.lst +++ b/tests/fsharpqa/Source/CompilerOptions/fsc/pdb/env.lst @@ -14,7 +14,7 @@ NOMONO SOURCE=pdb01.fs SCFLAGS="--debug --pdb:.\\pdb01.pdb" PRECMD="IF EXIST pd NOMONO SOURCE=pdb01.fs SCFLAGS="-g --pdb:.\\pdb01.fs" PRECMD="IF EXIST pdb01.pdb DEL pdb01.pdb" POSTCMD="IF NOT EXIST pdb01.pdb EXIT 1" # different file w/ -g (try to overwrite) -NOMONO SOURCE=pdb01.fs SCFLAGS="-g --debug:embedded -o:pdb01embedded.exe" PRECMD="IF EXIST pdb01embedded.pdb DEL pdb01embedded.pdb" POSTCMD="IF EXIST pdb01embedded.pdb EXIT 1" # If pdb file exists then it didn't embed so fail. +NOMONO SOURCE=pdb01.fs SCFLAGS="-g --debug:embedded" PRECMD="IF EXIST pdb01.pdb DEL pdb01.pdb" POSTCMD="IF EXIST pdb01.pdb EXIT 1" # If pdb file exists then it didn't embed so fail. # Case sensitive SOURCE=pdb02.fs SCFLAGS="--PDB -g" POSTCMD="IF EXIST pdb02.pdb EXIT 1" # --PDB