Skip to content

Commit 7d53b07

Browse files
dsymedsyme
authored
use .NET SDK 2.1.201 to build FCS (#5025)
* use .NET SDK 2.1.201 * try to fix linux builds of fcs * try to fix linux builds of fcs
1 parent b648e19 commit 7d53b07

File tree

12 files changed

+35
-3
lines changed

12 files changed

+35
-3
lines changed

‎fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
</Compile>
2727
</ItemGroup>
2828
<ItemGroup>
29+
<Reference Include="System.Runtime" />
30+
<Reference Include="System.IO" />
2931
<PackageReference Include="FSharp.Core" Version="4.1.*" />
3032
<ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
3133
<Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

‎fcs/FSharp.Compiler.Service.ProjectCracker/FSharp.Compiler.Service.ProjectCracker.fsproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
<Content Include="..\..\release\fcs\net45\FSharp.Compiler.Service.ProjectCrackerTool.exe.config" PackagePath="utilities\net45" />
2929
</ItemGroup>
3030
<ItemGroup>
31+
<Reference Include="System.Runtime" />
32+
<Reference Include="System.IO" />
3133
<PackageReference Include="FSharp.Core" Version="4.1.*" />
3234
<ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
3335
</ItemGroup>

‎fcs/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
<None Include="App.config" />
2222
<None Include="FSharp.Compiler.Service.ProjectCracker.targets" />
2323
<None Include="paket.references" />
24+
<Reference Include="System.Runtime" />
25+
<Reference Include="System.IO" />
2426
<Reference Include="FSharp.Core">
2527
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
2628
<Private>false</Private>

‎fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@
7777
</ItemGroup>
7878
<ItemGroup Condition="'$(TargetFramework)' == 'net46'">
7979
<Reference Include="mscorlib" />
80+
<Reference Include="System.Runtime" />
81+
<Reference Include="System.IO" />
8082
<Reference Include="System" />
8183
<Reference Include="System.Numerics" />
8284
<Reference Include="System.Windows.Forms" />

‎fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -647,8 +647,8 @@
647647
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.0" />
648648
</ItemGroup>
649649
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
650-
<Reference Include="System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
651-
<Reference Include="System.IO, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
650+
<Reference Include="System.Runtime" />
651+
<Reference Include="System.IO" />
652652
<Reference Include="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
653653
<Reference Include="System.ValueTuple">
654654
<HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>

‎fcs/build.fsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ let isMono = false
2424
// Utilities
2525
// --------------------------------------------------------------------------------------
2626

27-
let dotnetExePath = DotNetCli.InstallDotNetSDK "2.1.100"
27+
let dotnetExePath = DotNetCli.InstallDotNetSDK "2.1.201"
2828

2929
let runDotnet workingDir args =
3030
let result =

‎fcs/samples/EditorService/EditorService.fsproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,8 @@
1515
<ProjectReference Include="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
1616
<PackageReference Include="System.Reflection.Metadata" Version="1.4.2" />
1717
</ItemGroup>
18+
<ItemGroup Condition="'$(TargetFramework)' == 'net46'">
19+
<Reference Include="System.Runtime" />
20+
<Reference Include="System.IO" />
21+
</ItemGroup>
1822
</Project>

‎fcs/samples/FscExe/FscExe.fsproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,8 @@
1616
<PackageReference Include="FSharp.Core" Version="4.1.*" />
1717
<ProjectReference Include="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
1818
</ItemGroup>
19+
<ItemGroup Condition="'$(TargetFramework)' == 'net46'">
20+
<Reference Include="System.Runtime" />
21+
<Reference Include="System.IO" />
22+
</ItemGroup>
1923
</Project>

‎fcs/samples/FsiExe/FsiExe.fsproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,8 @@
1818
<PackageReference Include="FSharp.Core" Version="4.1.*" />
1919
<ProjectReference Include="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
2020
</ItemGroup>
21+
<ItemGroup Condition="'$(TargetFramework)' == 'net46'">
22+
<Reference Include="System.Runtime" />
23+
<Reference Include="System.IO" />
24+
</ItemGroup>
2125
</Project>

‎fcs/samples/InteractiveService/InteractiveService.fsproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,8 @@
1414
<PackageReference Include="FSharp.Core" Version="4.1.*" />
1515
<ProjectReference Include="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
1616
</ItemGroup>
17+
<ItemGroup Condition="'$(TargetFramework)' == 'net46'">
18+
<Reference Include="System.Runtime" />
19+
<Reference Include="System.IO" />
20+
</ItemGroup>
1721
</Project>

0 commit comments

Comments
 (0)