Skip to content

Commit

Permalink
Update projects for Preview 5 (#1541)
Browse files Browse the repository at this point in the history 
* Update projects for Preview 5

* Add test to embedd a pdb and also do a better job of building on preview 4 and below dev 15 previews.

* alternate version detection

* Embed test failed on success .... fix it

* clean up from prior failures for embedded test

* don't modify output name for embedded testcase
  • Loading branch information
@KevinRansom
KevinRansom authored Sep 17, 2016
1 parent ea60a9d commit 6afc4f9
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 10 deletions.
3 changes: 2 additions & 1 deletion src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,10 @@
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.$(VisualStudioVersion)" />
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Utilities, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition="'$(VisualStudioVersion)' != '12.0'" />
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" Condition="!Exists('$(VS150COMNTOOLS)..\IDE\PublicAssemblies\Microsoft.VisualStudio.Shell.Framework.dll')" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -562,8 +562,7 @@
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" Condition="!Exists('$(VS150COMNTOOLS)..\IDE\PublicAssemblies\Microsoft.VisualStudio.Shell.Framework.dll')" />
<Reference Include="Microsoft.VisualStudio.Shell.$(VisualStudioVersion)" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
Expand All @@ -572,6 +571,7 @@
<Reference Include="Microsoft.VisualStudio.Shell.Interop.dll" />
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Shell.Design, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.Build.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Framework.dll</HintPath>
Expand Down
2 changes: 2 additions & 0 deletions tests/fsharpqa/Source/CompilerOptions/fsc/pdb/env.lst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" 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

Expand Down
3 changes: 2 additions & 1 deletion vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,11 @@
<Reference Include="Microsoft.VisualStudio.Text.Logic" />
<Reference Include="Microsoft.VisualStudio.CoreUtility" />
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" Condition="!Exists('$(VS150COMNTOOLS)..\IDE\PublicAssemblies\Microsoft.VisualStudio.Shell.Framework.dll')" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
<Reference Include="Microsoft.VisualStudio.ProjectAggregator" />
<Reference Include="Microsoft.VisualStudio.Shell.Design, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Utilities, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop.dll" />
Expand Down
3 changes: 2 additions & 1 deletion vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,10 @@
<Reference Include="VSLangProj" />
<Reference Include="VSLangProj80" />
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" Condition="!Exists('$(VS150COMNTOOLS)..\IDE\PublicAssemblies\Microsoft.VisualStudio.Shell.Framework.dll')" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.$(VisualStudioVersion)" />
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0.dll" />
Expand Down
3 changes: 2 additions & 1 deletion vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
<Reference Include="VSLangProj80" />
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.$(VisualStudioVersion)" />
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
Expand All @@ -80,7 +81,7 @@
<Reference Include="Microsoft.VisualStudio.Shell.Design, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Utilities, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Package.LanguageService.$(VisualStudioVersion)" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" Condition="!Exists('$(VS150COMNTOOLS)..\IDE\PublicAssemblies\Microsoft.VisualStudio.Shell.Framework.dll')" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
<Reference Include="Microsoft.VisualStudio.ProjectAggregator" />
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.dll" />
Expand Down
3 changes: 2 additions & 1 deletion vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@
<Reference Include="microsoft.visualstudio.vcprojectengine" />
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.$(VisualStudioVersion)" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" Condition="!Exists('$(VS150COMNTOOLS)..\IDE\PublicAssemblies\Microsoft.VisualStudio.Shell.Framework.dll')" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
Expand Down
2 changes: 1 addition & 1 deletion vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<Reference Include="VSLangProj80" />
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" Condition="!Exists('$(VS150COMNTOOLS)..\IDE\PublicAssemblies\Microsoft.VisualStudio.Shell.Framework.dll')" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
Expand Down
3 changes: 2 additions & 1 deletion vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,10 @@
<Reference Include="envdte80.dll" />
<Reference Include="Microsoft.VisualStudio.ManagedInterfaces" />
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" Condition="!Exists('$(VS150COMNTOOLS)..\IDE\PublicAssemblies\Microsoft.VisualStudio.Shell.Framework.dll')" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
<Reference Include="Microsoft.VisualStudio.ProjectAggregator" />
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Shell.Design, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Utilities, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
Expand Down
3 changes: 2 additions & 1 deletion vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,10 @@
<Reference Include="VSLangProj80" />
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.$(VisualStudioVersion)" />
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Utilities, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition="'$(VisualStudioVersion)' != '12.0'" />
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" Condition="!Exists('$(VS150COMNTOOLS)..\IDE\PublicAssemblies\Microsoft.VisualStudio.Shell.Framework.dll')" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
Expand Down

0 comments on commit 6afc4f9

Please sign in to comment.