Skip to content

Commit 673fe42

Browse files
author
Omar Tawfik
committed
Fix build errors
1 parent 8edd521 commit 673fe42

File tree

6 files changed

+44
-20
lines changed

6 files changed

+44
-20
lines changed

‎VisualFSharp.sln‎

Lines changed: 37 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.25123.0
5-
# Visual Studio 14
6-
VisualStudioVersion = 14.0.24720.0
4+
VisualStudioVersion = 15.0.25302.0
75
MinimumVisualStudioVersion = 10.0.40219.1
86
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler", "src\fsharp\FSharp.Compiler\FSharp.Compiler.fsproj", "{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
97
EndProject
@@ -120,17 +118,20 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextFile", "vsintegration\I
120118
EndProject
121119
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLFile", "vsintegration\ItemTemplates\XMLFile\XMLFile.csproj", "{1FB1DD07-06AA-45B4-B5AC-20FF5BEE98B6}"
122120
EndProject
123-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualFSharpVsix", "vsintegration\VisualFSharpVsix\VisualFSharpVsix.csproj", "{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090}"
124-
EndProject
125121
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A83A9A70-8C33-4253-BF6F-3AADB509F21C}"
126122
ProjectSection(SolutionItems) = preProject
127123
Performance1.psess = Performance1.psess
128124
EndProjectSection
129125
EndProject
126+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Vsix", "Vsix", "{141F6C23-E1B1-4D89-9F10-F0B8AD58E71F}"
127+
EndProject
128+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualFSharpDesktop", "vsintegration\Vsix\VisualFSharpDesktop\VisualFSharpDesktop.csproj", "{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090}"
129+
EndProject
130+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualFSharpFull", "vsintegration\Vsix\VisualFSharpFull\VisualFSharpFull.csproj", "{59ADCE46-9740-4079-834D-9A03A3494EBC}"
131+
EndProject
132+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualFSharpWeb", "vsintegration\Vsix\VisualFSharpWeb\VisualFSharpWeb.csproj", "{58730C8B-16F5-4956-9291-BB68E17C9142}"
133+
EndProject
130134
Global
131-
GlobalSection(Performance) = preSolution
132-
HasPerformanceSessions = true
133-
EndGlobalSection
134135
GlobalSection(SolutionConfigurationPlatforms) = preSolution
135136
Debug|Any CPU = Debug|Any CPU
136137
Debug|x86 = Debug|x86
@@ -715,6 +716,30 @@ Global
715716
{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090}.Release|Any CPU.Build.0 = Release|Any CPU
716717
{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090}.Release|x86.ActiveCfg = Release|Any CPU
717718
{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090}.Release|x86.Build.0 = Release|Any CPU
719+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
720+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
721+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Debug|x86.ActiveCfg = Debug|Any CPU
722+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Debug|x86.Build.0 = Debug|Any CPU
723+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|Any CPU.ActiveCfg = Proto|Any CPU
724+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|Any CPU.Build.0 = Proto|Any CPU
725+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|x86.ActiveCfg = Proto|Any CPU
726+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|x86.Build.0 = Proto|Any CPU
727+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
728+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Release|Any CPU.Build.0 = Release|Any CPU
729+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Release|x86.ActiveCfg = Release|Any CPU
730+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Release|x86.Build.0 = Release|Any CPU
731+
{58730C8B-16F5-4956-9291-BB68E17C9142}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
732+
{58730C8B-16F5-4956-9291-BB68E17C9142}.Debug|Any CPU.Build.0 = Debug|Any CPU
733+
{58730C8B-16F5-4956-9291-BB68E17C9142}.Debug|x86.ActiveCfg = Debug|Any CPU
734+
{58730C8B-16F5-4956-9291-BB68E17C9142}.Debug|x86.Build.0 = Debug|Any CPU
735+
{58730C8B-16F5-4956-9291-BB68E17C9142}.Proto|Any CPU.ActiveCfg = Proto|Any CPU
736+
{58730C8B-16F5-4956-9291-BB68E17C9142}.Proto|Any CPU.Build.0 = Proto|Any CPU
737+
{58730C8B-16F5-4956-9291-BB68E17C9142}.Proto|x86.ActiveCfg = Proto|Any CPU
738+
{58730C8B-16F5-4956-9291-BB68E17C9142}.Proto|x86.Build.0 = Proto|Any CPU
739+
{58730C8B-16F5-4956-9291-BB68E17C9142}.Release|Any CPU.ActiveCfg = Release|Any CPU
740+
{58730C8B-16F5-4956-9291-BB68E17C9142}.Release|Any CPU.Build.0 = Release|Any CPU
741+
{58730C8B-16F5-4956-9291-BB68E17C9142}.Release|x86.ActiveCfg = Release|Any CPU
742+
{58730C8B-16F5-4956-9291-BB68E17C9142}.Release|x86.Build.0 = Release|Any CPU
718743
EndGlobalSection
719744
GlobalSection(SolutionProperties) = preSolution
720745
HideSolutionNode = FALSE
@@ -771,6 +796,9 @@ Global
771796
{E3FDD4AC-46B6-4B9F-B672-317D1202CC50} = {F6DAEE9A-8BE1-4C4A-BC83-09215517C7DA}
772797
{D11FC318-8F5D-4C8C-9287-AB40A016D13C} = {F6DAEE9A-8BE1-4C4A-BC83-09215517C7DA}
773798
{1FB1DD07-06AA-45B4-B5AC-20FF5BEE98B6} = {F6DAEE9A-8BE1-4C4A-BC83-09215517C7DA}
774-
{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
799+
{141F6C23-E1B1-4D89-9F10-F0B8AD58E71F} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
800+
{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090} = {141F6C23-E1B1-4D89-9F10-F0B8AD58E71F}
801+
{59ADCE46-9740-4079-834D-9A03A3494EBC} = {141F6C23-E1B1-4D89-9F10-F0B8AD58E71F}
802+
{58730C8B-16F5-4956-9291-BB68E17C9142} = {141F6C23-E1B1-4D89-9F10-F0B8AD58E71F}
775803
EndGlobalSection
776804
EndGlobal

‎setup/Swix/Microsoft.FSharp.LangPack/Microsoft.FSharp.LangPack.swixproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
55
<OutputArchitecture>neutral</OutputArchitecture>
6-
<OutputLocalized>true</OutputLocalized>
6+
<OutputLocalized>false</OutputLocalized>
77
<OutputType>vsix</OutputType>
88
<IsPackage>true</IsPackage>
99
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>

‎setup/Swix/Microsoft.FSharp.SDK/Microsoft.FSharp.SDK.swixproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
55
<OutputArchitecture>neutral</OutputArchitecture>
6-
<OutputLocalized>true</OutputLocalized>
6+
<OutputLocalized>false</OutputLocalized>
77
<OutputType>manifest</OutputType>
88
<OutputName>Microsoft.FSharp.SDK.$(LocaleCode)</OutputName>
99
<IsPackage>true</IsPackage>

‎vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<UseCodebase>true</UseCodebase>
4646
<DeployExtension Condition="'$(AppVeyor)' != '' or '$(HUDSON_COOKIE)' != '' or '$(UsingMicrobuild)' != ''">False</DeployExtension>
4747
<DeployExtension Condition="'$(AppVeyor)' == '' and '$(HUDSON_COOKIE)' == '' and '$(UsingMicrobuild)' == ''">False</DeployExtension>
48-
<ProjectGuid>{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090}</ProjectGuid>
48+
<ProjectGuid>{59ADCE46-9740-4079-834D-9A03A3494EBC}</ProjectGuid>
4949
<IsPackage>true</IsPackage>
5050
<RootNamespace>VisualFSharpFull</RootNamespace>
5151
<RootBinPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetFramework)\bin</RootBinPath>
@@ -296,15 +296,13 @@
296296
<IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
297297
</ProjectReference>
298298
</ItemGroup>
299-
300299
<Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
301300
<Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
302-
303301
<Target Name="GatherBinariesToBeSigned" AfterTargets="Localize">
304302
<ItemGroup>
305303
<BinariesToBeSigned Include="$(OutDir)$(AssemblyName).vsix" />
306304
<FilesToSign Include="@(BinariesToBeSigned)">
307-
<Authenticode>VsixSHA2</Authenticode>
305+
<Authenticode>VsixSHA2</Authenticode>
308306
</FilesToSign>
309307
</ItemGroup>
310308
</Target>

‎vsintegration/Vsix/VisualFSharpWeb/VisualFSharpWeb.csproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<UseCodebase>true</UseCodebase>
4646
<DeployExtension Condition="'$(AppVeyor)' != '' or '$(HUDSON_COOKIE)' != '' or '$(UsingMicrobuild)' != ''">False</DeployExtension>
4747
<DeployExtension Condition="'$(AppVeyor)' == '' and '$(HUDSON_COOKIE)' == '' and '$(UsingMicrobuild)' == ''">False</DeployExtension>
48-
<ProjectGuid>{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090}</ProjectGuid>
48+
<ProjectGuid>{58730C8B-16F5-4956-9291-BB68E17C9142}</ProjectGuid>
4949
<IsPackage>true</IsPackage>
5050
<RootNamespace>VisualFSharpWeb</RootNamespace>
5151
<RootBinPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetFramework)\bin</RootBinPath>
@@ -261,15 +261,13 @@
261261
<IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
262262
</ProjectReference>
263263
</ItemGroup>
264-
265264
<Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
266265
<Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
267-
268266
<Target Name="GatherBinariesToBeSigned" AfterTargets="Localize">
269267
<ItemGroup>
270268
<BinariesToBeSigned Include="$(OutDir)$(AssemblyName).vsix" />
271269
<FilesToSign Include="@(BinariesToBeSigned)">
272-
<Authenticode>VsixSHA2</Authenticode>
270+
<Authenticode>VsixSHA2</Authenticode>
273271
</FilesToSign>
274272
</ItemGroup>
275273
</Target>

‎vsintegration/src/FSharp.ProjectSystem.FSharp/Project.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ namespace rec Microsoft.VisualStudio.FSharp.ProjectSystem
389389
let mutable sourcesAndFlags : option<(array<string> * array<string>)> = None
390390
#if DEBUG
391391
let mutable shouldLog = false // can poke this in the debugger to turn on logging
392-
let logger = new Microsoft.Build.BuildEngine.ConsoleLogger(Microsoft.Build.Framework.LoggerVerbosity.Diagnostic,
392+
let logger = new Microsoft.Build.Logging.ConsoleLogger(Microsoft.Build.Framework.LoggerVerbosity.Diagnostic,
393393
(fun s ->
394394
let self = this
395395
ignore self // ensure debugger has local in scope, so can poke self.shouldLog

0 commit comments

Comments
 (0)