Skip to content

Commit 6afc4f9

Browse files
KevinRansomKevinRansom
authored
Update projects for Preview 5 (#1541)
* 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
1 parent ea60a9d commit 6afc4f9

File tree

10 files changed

+19
-10
lines changed

10 files changed

+19
-10
lines changed

‎src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@
4040
<ItemGroup>
4141
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
4242
<Reference Include="Microsoft.VisualStudio.Shell.$(VisualStudioVersion)" />
43+
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
4344
<Reference Include="Microsoft.VisualStudio.Utilities, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition="'$(VisualStudioVersion)' != '12.0'" />
4445
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
45-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
46+
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" Condition="!Exists('$(VS150COMNTOOLS)..\IDE\PublicAssemblies\Microsoft.VisualStudio.Shell.Framework.dll')" />
4647
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
4748
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
4849
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />

‎src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -562,8 +562,7 @@
562562
<Reference Include="System.Drawing" />
563563
<Reference Include="System.Windows.Forms" />
564564
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
565-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
566-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
565+
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" Condition="!Exists('$(VS150COMNTOOLS)..\IDE\PublicAssemblies\Microsoft.VisualStudio.Shell.Framework.dll')" />
567566
<Reference Include="Microsoft.VisualStudio.Shell.$(VisualStudioVersion)" />
568567
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
569568
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
@@ -572,6 +571,7 @@
572571
<Reference Include="Microsoft.VisualStudio.Shell.Interop.dll" />
573572
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
574573
<Reference Include="Microsoft.VisualStudio.Shell.Design, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
574+
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
575575
<Reference Include="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
576576
<Reference Include="Microsoft.Build.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
577577
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Framework.dll</HintPath>

‎tests/fsharpqa/Source/CompilerOptions/fsc/pdb/env.lst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ NOMONO SOURCE=pdb01.fs SCFLAGS="--debug --pdb:.\\pdb01.pdb" PRECMD="IF EXIST pd
1414

1515
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)
1616

17+
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.
18+
1719
# Case sensitive
1820
SOURCE=pdb02.fs SCFLAGS="--PDB -g" POSTCMD="IF EXIST pdb02.pdb EXIT 1" # --PDB
1921

‎vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,11 @@
6969
<Reference Include="Microsoft.VisualStudio.Text.Logic" />
7070
<Reference Include="Microsoft.VisualStudio.CoreUtility" />
7171
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
72-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
72+
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" Condition="!Exists('$(VS150COMNTOOLS)..\IDE\PublicAssemblies\Microsoft.VisualStudio.Shell.Framework.dll')" />
7373
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
7474
<Reference Include="Microsoft.VisualStudio.ProjectAggregator" />
7575
<Reference Include="Microsoft.VisualStudio.Shell.Design, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
76+
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
7677
<Reference Include="Microsoft.VisualStudio.Utilities, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
7778
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
7879
<Reference Include="Microsoft.VisualStudio.Shell.Interop.dll" />

‎vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,10 @@
7777
<Reference Include="VSLangProj" />
7878
<Reference Include="VSLangProj80" />
7979
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
80-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
80+
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" Condition="!Exists('$(VS150COMNTOOLS)..\IDE\PublicAssemblies\Microsoft.VisualStudio.Shell.Framework.dll')" />
8181
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
8282
<Reference Include="Microsoft.VisualStudio.Shell.$(VisualStudioVersion)" />
83+
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
8384
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
8485
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
8586
<Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0.dll" />

‎vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
<Reference Include="VSLangProj80" />
7373
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
7474
<Reference Include="Microsoft.VisualStudio.Shell.$(VisualStudioVersion)" />
75+
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
7576
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
7677
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
7778
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
@@ -80,7 +81,7 @@
8081
<Reference Include="Microsoft.VisualStudio.Shell.Design, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
8182
<Reference Include="Microsoft.VisualStudio.Utilities, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
8283
<Reference Include="Microsoft.VisualStudio.Package.LanguageService.$(VisualStudioVersion)" />
83-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
84+
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" Condition="!Exists('$(VS150COMNTOOLS)..\IDE\PublicAssemblies\Microsoft.VisualStudio.Shell.Framework.dll')" />
8485
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
8586
<Reference Include="Microsoft.VisualStudio.ProjectAggregator" />
8687
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.dll" />

‎vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@
9191
<Reference Include="microsoft.visualstudio.vcprojectengine" />
9292
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
9393
<Reference Include="Microsoft.VisualStudio.Shell.$(VisualStudioVersion)" />
94-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
94+
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
95+
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" Condition="!Exists('$(VS150COMNTOOLS)..\IDE\PublicAssemblies\Microsoft.VisualStudio.Shell.Framework.dll')" />
9596
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
9697
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
9798
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />

‎vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<Reference Include="VSLangProj80" />
7171
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
7272
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
73-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
73+
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" Condition="!Exists('$(VS150COMNTOOLS)..\IDE\PublicAssemblies\Microsoft.VisualStudio.Shell.Framework.dll')" />
7474
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
7575
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
7676
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />

‎vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,10 @@
7272
<Reference Include="envdte80.dll" />
7373
<Reference Include="Microsoft.VisualStudio.ManagedInterfaces" />
7474
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
75-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
75+
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" Condition="!Exists('$(VS150COMNTOOLS)..\IDE\PublicAssemblies\Microsoft.VisualStudio.Shell.Framework.dll')" />
7676
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
7777
<Reference Include="Microsoft.VisualStudio.ProjectAggregator" />
78+
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
7879
<Reference Include="Microsoft.VisualStudio.Shell.Design, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
7980
<Reference Include="Microsoft.VisualStudio.Utilities, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
8081
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

‎vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,10 @@
7070
<Reference Include="VSLangProj80" />
7171
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
7272
<Reference Include="Microsoft.VisualStudio.Shell.$(VisualStudioVersion)" />
73+
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
7374
<Reference Include="Microsoft.VisualStudio.Utilities, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition="'$(VisualStudioVersion)' != '12.0'" />
7475
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
75-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
76+
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" Condition="!Exists('$(VS150COMNTOOLS)..\IDE\PublicAssemblies\Microsoft.VisualStudio.Shell.Framework.dll')" />
7677
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
7778
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
7879
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />

0 commit comments

Comments
 (0)