Skip to content

Commit 6f90f39

Browse files
dsymedsyme
committed
various fixes
1 parent 55fb7e6 commit 6f90f39

File tree

3 files changed

+14
-23
lines changed

3 files changed

+14
-23
lines changed

‎build.bat‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
@echo off
22

33
:: Check prerequisites
4-
set _msbuildexe="%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe"
5-
if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\12.0\Bin\MSBuild.exe"
6-
if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe"
4+
set _msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe"
75
if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\14.0\Bin\MSBuild.exe"
6+
if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe"
7+
if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\12.0\Bin\MSBuild.exe"
88
if not exist %_msbuildexe% echo Error: Could not find MSBuild.exe. Please see http://www.microsoft.com/en-us/download/details.aspx?id=40760. && goto :eof
99

1010
set msbuildflags=/maxcpucount

‎src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
<BuildWith>LKG</BuildWith>
2121
<AllowCrossTargeting>true</AllowCrossTargeting>
2222
<OtherFlags>$(OtherFlags) --warnon:1182</OtherFlags>
23-
<OtherFlags>$(OtherFlags) --staticlink:System.Collections.Immutable</OtherFlags>
24-
<OtherFlags>$(OtherFlags) --staticlink:Microsoft.DiaSymReader</OtherFlags>
25-
<OtherFlags>$(OtherFlags) --staticlink:System.Reflection.Metadata</OtherFlags>
2623
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
2724
</PropertyGroup>
2825
<!-- MonoDevelop likes these here to recognise the configurations -->
@@ -480,8 +477,8 @@
480477
<Reference Include="System.Runtime.Remoting" />
481478
<Reference Include="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
482479
<Reference Include="Microsoft.Build.Framework, Version=$(MSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
483-
<Private>True</Private>
484-
</Reference>
480+
<Private>True</Private>
481+
</Reference>
485482
<Reference Include="Microsoft.Build.Engine, Version=$(MSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
486483
<Private>True</Private>
487484
</Reference>
@@ -496,15 +493,19 @@
496493
</Reference>
497494
<Reference Include="Microsoft.DiaSymReader.PortablePdb">
498495
<HintPath>..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.1.1.0\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath>
496+
<Private>True</Private>
499497
</Reference>
500498
<Reference Include="Microsoft.DiaSymReader">
501499
<HintPath>..\..\..\packages\Microsoft.DiaSymReader.1.0.8\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath>
500+
<Private>True</Private>
502501
</Reference>
503502
<Reference Include="System.Reflection.Metadata">
504503
<HintPath>..\..\..\packages\System.Reflection.Metadata.1.4.1-beta-24227-04\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
504+
<Private>True</Private>
505505
</Reference>
506506
<Reference Include="System.Collections.Immutable">
507507
<HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
508+
<Private>True</Private>
508509
</Reference>
509510
</ItemGroup>
510511
<Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />

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

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
<TargetFrameworkVersion Condition="'$(TargetFramework)'=='net40'">v4.5</TargetFrameworkVersion>
2222
<BaseAddress>0x06800000</BaseAddress>
2323
<OtherFlags>$(OtherFlags) --warnon:1182</OtherFlags>
24-
<OtherFlags>$(OtherFlags) --staticlink:System.Collections.Immutable</OtherFlags>
25-
<OtherFlags>$(OtherFlags) --staticlink:Microsoft.DiaSymReader</OtherFlags>
26-
<OtherFlags>$(OtherFlags) --staticlink:System.Reflection.Metadata</OtherFlags>
2724
<OtherFlags Condition=" '$(TargetFramework)'=='coreclr'">$(OtherFlags) --targetprofile:netcore</OtherFlags>
2825
</PropertyGroup>
2926
<!-- MonoDevelop likes these here to recognise the configurations -->
@@ -591,18 +588,22 @@
591588
<Reference Include="Microsoft.Build.Tasks.$(MSBuildVersionSuffix), Version=$(MSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
592589
<Private>True</Private>
593590
</Reference>
594-
<Reference Include="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
591+
<Reference Include="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
595592
<Reference Include="Microsoft.DiaSymReader.PortablePdb">
596593
<HintPath>..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.1.1.0\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath>
594+
<Private>True</Private>
597595
</Reference>
598596
<Reference Include="Microsoft.DiaSymReader">
599597
<HintPath>..\..\..\packages\Microsoft.DiaSymReader.1.0.8\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath>
598+
<Private>True</Private>
600599
</Reference>
601600
<Reference Include="System.Reflection.Metadata">
602601
<HintPath>..\..\..\packages\System.Reflection.Metadata.1.4.1-beta-24227-04\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
602+
<Private>True</Private>
603603
</Reference>
604604
<Reference Include="System.Collections.Immutable">
605605
<HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
606+
<Private>True</Private>
606607
</Reference>
607608
</ItemGroup>
608609
<ItemGroup>
@@ -615,15 +616,4 @@
615616
<Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
616617
<Import Project="$(FsLexYaccpath)\FsLexYacc.targets" />
617618

618-
<Import Project="$(FSharpSourcesRoot)\..\lkg\FSharp-$(LkgVersion)\bin\FSharp.PowerPack.targets" />
619-
<Target Name="GatherBinariesToBeSigned" AfterTargets="Localize">
620-
<ItemGroup>
621-
<BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
622-
<BinariesToBeSigned Include="$(OutDir)localize\**\$(AssemblyName).resources.dll" />
623-
<FilesToSign Include="@(BinariesToBeSigned)">
624-
<Authenticode>Microsoft</Authenticode>
625-
<StrongName>StrongName</StrongName>
626-
</FilesToSign>
627-
</ItemGroup>
628-
</Target>
629619
</Project>

0 commit comments

Comments
 (0)