Skip to content

Commit 0692a9c

Browse files
author
Omar Tawfik
committed
Resolve merge conflicts
1 parent 189c409 commit 0692a9c

File tree

11 files changed

+7
-47
lines changed

11 files changed

+7
-47
lines changed

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,6 @@
3939
<Reference Include="Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion), Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
4040
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion).$(RoslynVSPackagesVersion)\lib\Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion).dll</HintPath>
4141
</Reference>
42-
</ItemGroup>
43-
<ItemGroup>
44-
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
45-
<Reference Include="Microsoft.VisualStudio.Shell.$(VisualStudioVersion)" />
46-
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
47-
<Reference Include="Microsoft.VisualStudio.Utilities, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition="'$(VisualStudioVersion)' != '12.0'" />
48-
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
49-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" Condition="!Exists('$(VS150COMNTOOLS)..\IDE\PublicAssemblies\Microsoft.VisualStudio.Shell.Framework.dll')" />
50-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
51-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
52-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
5342
<Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0.dll" />
5443
<Reference Include="Microsoft.VisualStudio.Shell.Interop.dll" />
5544
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -567,8 +567,6 @@
567567
<Reference Include="Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion), Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
568568
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion).$(RoslynVSPackagesVersion)\lib\Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion).dll</HintPath>
569569
</Reference>
570-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" Condition="!Exists('$(VS150COMNTOOLS)..\IDE\PublicAssemblies\Microsoft.VisualStudio.Shell.Framework.dll')" />
571-
<Reference Include="Microsoft.VisualStudio.Shell.$(VisualStudioVersion)" />
572570
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
573571
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
574572
<Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0.dll" />
@@ -580,9 +578,6 @@
580578
<Reference Include="Microsoft.VisualStudio.Shell.Design, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
581579
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Design.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Shell.Design.dll</HintPath>
582580
</Reference>
583-
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
584-
<Reference Include="Microsoft.VisualStudio.Shell.Design, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
585-
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
586581
<Reference Include="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
587582
<Reference Include="Microsoft.Build.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
588583
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Framework.dll</HintPath>

‎vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,8 @@
5959
<Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" Path="ItemTemplates" d:TargetPath="|SignatureFile;TemplateProjectOutputGroup|" d:ProjectName="SignatureFile" d:VsixSubPath="ItemTemplates" />
6060
<Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" Path="ItemTemplates" d:TargetPath="|TextFile;TemplateProjectOutputGroup|" d:ProjectName="TextFile" d:VsixSubPath="ItemTemplates" />
6161
<Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" Path="ItemTemplates" d:TargetPath="|XMLFile;TemplateProjectOutputGroup|" d:ProjectName="XMLFile" d:VsixSubPath="ItemTemplates" />
62+
63+
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" AssemblyName="|FSharp.Editor;AssemblyName|" />
64+
<Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" />
6265
</Assets>
6366
</PackageManifest>

‎vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<VSRootSuffix>FSharpDev</VSRootSuffix>
4545
<UseCodebase>true</UseCodebase>
4646
<DeployExtension Condition="'$(AppVeyor)' != '' or '$(HUDSON_COOKIE)' != '' or '$(UsingMicrobuild)' != ''">False</DeployExtension>
47-
<DeployExtension Condition="'$(AppVeyor)' == '' and '$(HUDSON_COOKIE)' == '' and '$(UsingMicrobuild)' == ''">False</DeployExtension>
47+
<DeployExtension Condition="'$(AppVeyor)' == '' and '$(HUDSON_COOKIE)' == '' and '$(UsingMicrobuild)' == ''">True</DeployExtension>
4848
<ProjectGuid>{E6A45CDF-B408-420F-B475-74611BEFC52B}</ProjectGuid>
4949
<IsPackage>true</IsPackage>
5050
<RootNamespace>VisualFSharpOpenSource</RootNamespace>

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,9 @@
138138
</Reference>
139139
<Reference Include="System.Windows.Forms" />
140140
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
141-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" Condition="!Exists('$(VS150COMNTOOLS)..\IDE\PublicAssemblies\Microsoft.VisualStudio.Shell.Framework.dll')" />
141+
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
142142
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
143143
<Reference Include="Microsoft.VisualStudio.ProjectAggregator" />
144-
<Reference Include="Microsoft.VisualStudio.Shell.Design, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
145-
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
146-
<Reference Include="Microsoft.VisualStudio.Utilities, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
147-
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
148144
<Reference Include="Microsoft.VisualStudio.Shell.Interop.dll" />
149145
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
150146
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,8 @@
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" Condition="!Exists('$(VS150COMNTOOLS)..\IDE\PublicAssemblies\Microsoft.VisualStudio.Shell.Framework.dll')" />
80+
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
8181
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
82-
<Reference Include="Microsoft.VisualStudio.Shell.$(VisualStudioVersion)" />
83-
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
8482
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
8583
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
8684
<Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0.dll" />

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,12 @@
7979
<Reference Include="VSLangProj" />
8080
<Reference Include="VSLangProj80" />
8181
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
82-
<Reference Include="Microsoft.VisualStudio.Shell.$(VisualStudioVersion)" />
83-
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
84-
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
8582
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
8683
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
8784
<Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0.dll" />
8885
<Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0.dll" />
8986
<Reference Include="Microsoft.VisualStudio.Shell.Interop.dll" />
9087
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
91-
<Reference Include="Microsoft.VisualStudio.Shell.Design, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
92-
<Reference Include="Microsoft.VisualStudio.Utilities, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
93-
<Reference Include="Microsoft.VisualStudio.Package.LanguageService.$(VisualStudioVersion)" />
94-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" Condition="!Exists('$(VS150COMNTOOLS)..\IDE\PublicAssemblies\Microsoft.VisualStudio.Shell.Framework.dll')" />
9588
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
9689
<Reference Include="Microsoft.VisualStudio.ProjectAggregator" />
9790
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.dll" />

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@
9191
<Reference Include="microsoft.visualstudio.vcprojectengine" />
9292
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
9393
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
94-
<Reference Include="Microsoft.VisualStudio.Shell.$(VisualStudioVersion)" />
95-
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
96-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" Condition="!Exists('$(VS150COMNTOOLS)..\IDE\PublicAssemblies\Microsoft.VisualStudio.Shell.Framework.dll')" />
9794
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
9895
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
9996
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@
7070
<Reference Include="VSLangProj80" />
7171
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
7272
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
73-
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
74-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" Condition="!Exists('$(VS150COMNTOOLS)..\IDE\PublicAssemblies\Microsoft.VisualStudio.Shell.Framework.dll')" />
7573
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
7674
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
7775
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
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" Condition="!Exists('$(VS150COMNTOOLS)..\IDE\PublicAssemblies\Microsoft.VisualStudio.Shell.Framework.dll')" />
75+
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
7676
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
7777
<Reference Include="Microsoft.VisualStudio.ProjectAggregator" />
7878
<Reference Include="Microsoft.VisualStudio.Shell.Design, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -87,10 +87,6 @@
8787
<Reference Include="Microsoft.VisualStudio.Utilities, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
8888
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Utilities.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
8989
</Reference>
90-
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
91-
<Reference Include="Microsoft.VisualStudio.Shell.Design, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
92-
<Reference Include="Microsoft.VisualStudio.Utilities, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
93-
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
9490
<Reference Include="Microsoft.VisualStudio.Shell.Interop.dll" />
9591
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
9692
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />

0 commit comments

Comments
 (0)