Skip to content

Commit 915cf0a

Browse files
dsymedsyme
committed
fix build
1 parent 4fb3c09 commit 915cf0a

File tree

8 files changed

+63
-85
lines changed

8 files changed

+63
-85
lines changed

‎lib/bootstrap/4.0/FSharp.Core.dll‎

375 KB
Binary file not shown.

‎lib/bootstrap/4.0/FSharp.Core.optdata‎

74.3 KB
Binary file not shown.

‎lib/bootstrap/4.0/FSharp.Core.sigdata‎

61.8 KB
Binary file not shown.

‎src/FSharpSource.targets‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
<LkgPath2>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.0.0.1\tools</LkgPath2>
1010
<SolutionDir>$(FSharpSourcesRoot)\..\</SolutionDir>
1111
<FsLexUnicode>true</FsLexUnicode>
12+
<MSBuildVersionSuffix>v12.0</MSBuildVersionSuffix>
13+
<MSBuildVersionFull>12.0.0.0</MSBuildVersionFull>
1214
<OtherFlags>$(OtherFlags) --times</OtherFlags>
1315
<NoWarn>$(NoWarn);69;65;54;61;75</NoWarn>
1416
<DebugSymbols>true</DebugSymbols>

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,21 @@
5050
</Reference>
5151
<Reference Include="System" />
5252
<Reference Include="System.Numerics" />
53-
<Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
54-
<Private>True</Private>
55-
</Reference>
56-
<Reference Include="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
57-
<Private>True</Private>
58-
</Reference>
59-
<Reference Include="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" >
60-
<Private>True</Private>
61-
</Reference>
62-
<Reference Include="Microsoft.Build.Utilities.v12.0">
63-
<Private>True</Private>
64-
</Reference>
65-
<Reference Include="Microsoft.Build.Tasks.v12.0">
66-
<Private>True</Private>
67-
</Reference>
53+
<Reference Include="Microsoft.Build.Framework, Version=$(MSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
54+
<Private>True</Private>
55+
</Reference>
56+
<Reference Include="Microsoft.Build.Engine, Version=$(MSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
57+
<Private>True</Private>
58+
</Reference>
59+
<Reference Include="Microsoft.Build, Version=$(MSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
60+
<Private>True</Private>
61+
</Reference>
62+
<Reference Include="Microsoft.Build.Utilities.$(MSBuildVersionSuffix), Version=$(MSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
63+
<Private>True</Private>
64+
</Reference>
65+
<Reference Include="Microsoft.Build.Tasks.$(MSBuildVersionSuffix), Version=$(MSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
66+
<Private>True</Private>
67+
</Reference>
6868
</ItemGroup>
6969
<Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
7070
</Project>

‎src/fsharp/FSharp.Build/FSharp.Build.fsproj‎

Lines changed: 16 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -64,26 +64,21 @@
6464
<ItemGroup Condition=" '$(TargetFramework)' != 'coreclr' ">
6565
<Reference Include="mscorlib" />
6666
<Reference Include="System" />
67-
<Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
68-
<Private>True</Private>
69-
</Reference>
70-
<Reference Include="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
71-
<Private>True</Private>
72-
</Reference>
73-
<Reference Include="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" >
74-
<Private>True</Private>
75-
</Reference>
76-
<Reference Include="Microsoft.Build.Utilities.v12.0">
77-
<Private>True</Private>
78-
</Reference>
79-
<Reference Include="Microsoft.Build.Tasks.v12.0">
80-
<Private>True</Private>
81-
</Reference>
82-
<Reference Include="Microsoft.Build.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
83-
<Reference Include="Microsoft.Build.Engine, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
84-
<Reference Include="Microsoft.Build, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
85-
<Reference Include="Microsoft.Build.Utilities.$(MSBuildVersionSuffix), Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
86-
<Reference Include="Microsoft.Build.Tasks.$(MSBuildVersionSuffix), Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
67+
<Reference Include="Microsoft.Build.Framework, Version=$(MSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
68+
<Private>True</Private>
69+
</Reference>
70+
<Reference Include="Microsoft.Build.Engine, Version=$(MSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
71+
<Private>True</Private>
72+
</Reference>
73+
<Reference Include="Microsoft.Build, Version=$(MSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
74+
<Private>True</Private>
75+
</Reference>
76+
<Reference Include="Microsoft.Build.Utilities.$(MSBuildVersionSuffix), Version=$(MSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
77+
<Private>True</Private>
78+
</Reference>
79+
<Reference Include="Microsoft.Build.Tasks.$(MSBuildVersionSuffix), Version=$(MSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
80+
<Private>True</Private>
81+
</Reference>
8782
</ItemGroup>
8883
<ItemGroup>
8984
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
@@ -102,22 +97,13 @@
10297
<!-- Microsoft.FSharp.Targets or Microsoft.FSharp.targets : Used in the Visual F# Tools distribution (on Windows it doesn't matter). -->
10398
<!-- Microsoft.FSharp.targets : Used in the source tree as of 08/04/2016 (prior this was Microsoft.FSharp.Targets) -->
10499

105-
<Target Name="CopyToBuiltBin">
100+
<Target Name="CopyToBuiltBin">
106101
<Copy SourceFiles="Microsoft.FSharp.targets" DestinationFiles="$(OutputPath)/Microsoft.FSharp.Targets" SkipUnchangedFiles="true" >
107102
<Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
108103
</Copy>
109104
<Copy SourceFiles="Microsoft.Portable.FSharp.targets" DestinationFiles="$(OutputPath)/Microsoft.Portable.FSharp.Targets" SkipUnchangedFiles="true" >
110105
<Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
111106
</Copy>
112-
<Target Name="GatherBinariesToBeSigned" AfterTargets="Localize">
113-
<ItemGroup>
114-
<BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
115-
<BinariesToBeSigned Include="$(OutDir)localize\**\$(AssemblyName).resources.dll" />
116-
<FilesToSign Include="@(BinariesToBeSigned)">
117-
<Authenticode>Microsoft</Authenticode>
118-
<StrongName>StrongName</StrongName>
119-
</FilesToSign>
120-
</ItemGroup>
121107
</Target>
122108

123109
</Project>

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

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -476,21 +476,21 @@
476476
<Reference Include="System.Windows.Forms" />
477477
<Reference Include="System.Runtime.Remoting" />
478478
<Reference Include="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
479-
<Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
480-
<Private>True</Private>
481-
</Reference>
482-
<Reference Include="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
483-
<Private>True</Private>
484-
</Reference>
485-
<Reference Include="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" >
486-
<Private>True</Private>
487-
</Reference>
488-
<Reference Include="Microsoft.Build.Tasks.v12.0">
489-
<Private>True</Private>
490-
</Reference>
491-
<Reference Include="Microsoft.Build.Utilities.v12.0">
492-
<Private>True</Private>
493-
</Reference>
479+
<Reference Include="Microsoft.Build.Framework, Version=$(MSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
480+
<Private>True</Private>
481+
</Reference>
482+
<Reference Include="Microsoft.Build.Engine, Version=$(MSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
483+
<Private>True</Private>
484+
</Reference>
485+
<Reference Include="Microsoft.Build, Version=$(MSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
486+
<Private>True</Private>
487+
</Reference>
488+
<Reference Include="Microsoft.Build.Utilities.$(MSBuildVersionSuffix), Version=$(MSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
489+
<Private>True</Private>
490+
</Reference>
491+
<Reference Include="Microsoft.Build.Tasks.$(MSBuildVersionSuffix), Version=$(MSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
492+
<Private>True</Private>
493+
</Reference>
494494
<Reference Include="Microsoft.DiaSymReader.PortablePdb">
495495
<HintPath>..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.1.0.0-rc-60301\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath>
496496
<Private>True</Private>
@@ -507,16 +507,6 @@
507507
<HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0-rc3-23805\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
508508
<Private>True</Private>
509509
</Reference>
510-
<Reference Include="Microsoft.Build, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
511-
<Reference Include="Microsoft.Build.Utilities.$(MSBuildVersionSuffix), Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
512-
<Reference Include="Microsoft.Build.Tasks.$(MSBuildVersionSuffix), Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
513-
<Reference Include="Microsoft.Build.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
514-
<Reference Include="Microsoft.Build.Engine, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
515-
<Reference Include="Microsoft.Build, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
516-
<Reference Include="Microsoft.DiaSymReader.PortablePdb"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.1.0.0-rc-60301\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath></Reference>
517-
<Reference Include="Microsoft.DiaSymReader"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.1.0.7\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath></Reference>
518-
<Reference Include="System.Reflection.Metadata"><HintPath>..\..\..\packages\System.Reflection.Metadata.1.3.0-beta-23816\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath></Reference>
519-
<Reference Include="System.Collections.Immutable"><HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0-rc3-23805\lib\portable-net45+win8+wp8+wpa81</HintPath></Reference>
520510
</ItemGroup>
521511
<Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
522512
<Import Project="$(LkgPath)\FsLexYacc.targets" />

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -573,21 +573,21 @@
573573
<Reference Include="System.Numerics" />
574574
<Reference Include="System.Windows.Forms" />
575575
<Reference Include="System.Runtime.Remoting" />
576-
<Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
577-
<Private>True</Private>
578-
</Reference>
579-
<Reference Include="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
580-
<Private>True</Private>
581-
</Reference>
582-
<Reference Include="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" >
583-
<Private>True</Private>
584-
</Reference>
585-
<Reference Include="Microsoft.Build.Tasks.v12.0">
586-
<Private>True</Private>
587-
</Reference>
588-
<Reference Include="Microsoft.Build.Utilities.v12.0">
589-
<Private>True</Private>
590-
</Reference>
576+
<Reference Include="Microsoft.Build.Framework, Version=$(MSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
577+
<Private>True</Private>
578+
</Reference>
579+
<Reference Include="Microsoft.Build.Engine, Version=$(MSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
580+
<Private>True</Private>
581+
</Reference>
582+
<Reference Include="Microsoft.Build, Version=$(MSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
583+
<Private>True</Private>
584+
</Reference>
585+
<Reference Include="Microsoft.Build.Utilities.$(MSBuildVersionSuffix), Version=$(MSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
586+
<Private>True</Private>
587+
</Reference>
588+
<Reference Include="Microsoft.Build.Tasks.$(MSBuildVersionSuffix), Version=$(MSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
589+
<Private>True</Private>
590+
</Reference>
591591
<Reference Include="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
592592
<Reference Include="Microsoft.DiaSymReader.PortablePdb">
593593
<HintPath>..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.1.0.0-rc-60301\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath>

0 commit comments

Comments
 (0)