Skip to content

Commit 19f6afb

Browse files
dsymebaronfel
dsyme
authored and
baronfel
committed
update FCS dependencies (#6388)
* update FCS dependencies * update FCS dependencies * fix up build * code review
1 parent 06f811d commit 19f6afb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+98
-97
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Import Project="..\fcs.props" />
66
<Import Project="..\netfx.props" />
77
<PropertyGroup>
8-
<TargetFrameworks>net45</TargetFrameworks>
8+
<TargetFrameworks>net461</TargetFrameworks>
99
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1010
<DefineConstants>$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
1111
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
@@ -28,7 +28,7 @@
2828
<ItemGroup>
2929
<Reference Include="System.Runtime" />
3030
<Reference Include="System.IO" />
31-
<PackageReference Include="FSharp.Core" Version="4.5.2" />
31+
<PackageReference Include="FSharp.Core" Version="4.6.2" />
3232
<ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
3333
<Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
3434
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Framework.dll</HintPath>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="..\fcs.props" />
33
<Import Project="..\netfx.props" />
44
<PropertyGroup>
5-
<TargetFrameworks>net45</TargetFrameworks>
5+
<TargetFrameworks>net461</TargetFrameworks>
66
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
77
</PropertyGroup>
88
<PropertyGroup>
@@ -20,14 +20,14 @@
2020
<Link>ProjectCrackerOptions.fs</Link>
2121
</Compile>
2222
<Compile Include="ProjectCracker.fs" />
23-
<Content Include="..\FSharp.Compiler.Service.ProjectCrackerTool\FSharp.Compiler.Service.ProjectCracker.targets" PackagePath="build\net45" />
24-
<Content Include="$(ArtifactsBinDir)\fcs\net45\FSharp.Compiler.Service.ProjectCrackerTool.exe" PackagePath="utilities\net45" />
25-
<Content Include="$(ArtifactsBinDir)\fcs\net45\FSharp.Compiler.Service.ProjectCrackerTool.exe.config" PackagePath="utilities\net45" />
23+
<Content Include="..\FSharp.Compiler.Service.ProjectCrackerTool\FSharp.Compiler.Service.ProjectCracker.targets" PackagePath="build\net461" />
24+
<Content Include="$(ArtifactsBinDir)\fcs\net461\FSharp.Compiler.Service.ProjectCrackerTool.exe" PackagePath="utilities\net461" />
25+
<Content Include="$(ArtifactsBinDir)\fcs\net461\FSharp.Compiler.Service.ProjectCrackerTool.exe.config" PackagePath="utilities\net461" />
2626
</ItemGroup>
2727
<ItemGroup>
2828
<Reference Include="System.Runtime" />
2929
<Reference Include="System.IO" />
30-
<PackageReference Include="FSharp.Core" Version="4.5.2" />
30+
<PackageReference Include="FSharp.Core" Version="4.6.2" />
3131
<ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
3232
</ItemGroup>
3333
</Project>

‎fcs/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCracker.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Target Name="ProjectCrackerToolCopy" AfterTargets="Build">
4-
<Copy SourceFiles="$(MSBuildThisFileDirectory)\..\..\utilities\net45\FSharp.Compiler.Service.ProjectCrackerTool.exe" DestinationFolder="$(OutputPath)" />
5-
<Copy SourceFiles="$(MSBuildThisFileDirectory)\..\..\utilities\net45\FSharp.Compiler.Service.ProjectCrackerTool.exe.config" DestinationFolder="$(OutputPath)" />
4+
<Copy SourceFiles="$(MSBuildThisFileDirectory)\..\..\utilities\net461\FSharp.Compiler.Service.ProjectCrackerTool.exe" DestinationFolder="$(OutputPath)" />
5+
<Copy SourceFiles="$(MSBuildThisFileDirectory)\..\..\utilities\net461\FSharp.Compiler.Service.ProjectCrackerTool.exe.config" DestinationFolder="$(OutputPath)" />
66
</Target>
77
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<Import Project="..\netfx.props" />
88
<PropertyGroup>
99
<OutputType>Exe</OutputType>
10-
<TargetFrameworks>net45</TargetFrameworks>
10+
<TargetFrameworks>net461</TargetFrameworks>
1111
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1212
<DefineConstants>$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
1313
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
@@ -24,7 +24,7 @@
2424
<None Include="paket.references" />
2525
<Reference Include="System.Runtime" />
2626
<Reference Include="System.IO" />
27-
<PackageReference Include="FSharp.Core" Version="4.5.2" />
27+
<PackageReference Include="FSharp.Core" Version="4.6.2" />
2828
<Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
2929
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Framework.dll</HintPath>
3030
<Private>false</Private>

‎fcs/FSharp.Compiler.Service.Tests/CSharp_Analysis/CSharp_Analysis.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\netfx.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
<NoWarn>$(NoWarn);0067;1591</NoWarn>
77
</PropertyGroup>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Import Project="..\fcs.props" />
66
<Import Project="..\netfx.props" />
77
<PropertyGroup>
8-
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
8+
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
99
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1010
<NoWarn>$(NoWarn);44;75;</NoWarn>
1111
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -81,15 +81,15 @@
8181
<None Include="App.config" />
8282
</ItemGroup>
8383
<ItemGroup>
84-
<PackageReference Include="FSharp.Core" Version="4.5.2" />
84+
<PackageReference Include="FSharp.Core" Version="4.6.2" />
8585
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
8686
<PackageReference Include="NUnit" Version="3.9.0" />
8787
<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
8888
<PackageReference Include="NunitXml.TestLogger" Version="2.1.36" />
8989
<PackageReference Include="Dotnet.ProjInfo" Version="0.20.0" />
9090
<ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
9191
</ItemGroup>
92-
<ItemGroup Condition="'$(TargetFramework)' == 'net46'">
92+
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
9393
<Reference Include="mscorlib" />
9494
<Reference Include="System.Runtime" />
9595
<Reference Include="System.IO" />

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Import Project="..\netfx.props" />
77
<Import Project="..\..\src\buildtools\buildtools.targets" />
88
<PropertyGroup>
9-
<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
9+
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
1010
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1111
<DefineConstants>$(DefineConstants);COMPILER_SERVICE_AS_DLL</DefineConstants>
1212
<DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
@@ -635,7 +635,7 @@
635635
</Compile>
636636
</ItemGroup>
637637
<ItemGroup>
638-
<PackageReference Include="FSharp.Core" Version="4.5.2" />
638+
<PackageReference Include="FSharp.Core" Version="4.6.2" />
639639
<PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
640640
<PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
641641
</ItemGroup>
@@ -647,7 +647,7 @@
647647
<PackageReference Include="System.Runtime.Loader" Version="4.0.0" />
648648
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.0" />
649649
</ItemGroup>
650-
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
650+
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
651651
<Reference Include="System.Runtime" />
652652
<Reference Include="System.IO" />
653653
<Reference Include="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

‎fcs/README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,16 @@ Basically we are packaging up the compiler as a DLL and publishing it as a NuGet
1212
There are subtle differences between FSharp.Compiler.Service and FSharp.Compiler.Private (shipped with the Visual F# Tools)
1313

1414
- FCS has a public API
15-
- FCS is built against **.NET 4.5** and **FSharp.Core 4.0.0.0** to give broader reach
15+
16+
- FCS is built against **.NET 4.6.1** and **FSharp.Core NuGet 4.6.2** to give broader reach
17+
1618
- FCS has a NuGet package
17-
- FCS has a .NET Standard 1.6 version in the nuget package
19+
20+
- FCS has a .NET Standard 2.0 version in the nuget package
21+
1822
- FCS testing also tests the "Project Cracker" (see below)
19-
- FCS doesn't add the System.ValueTuple.dll reference by default, see ``#if COMPILER_SERVICE_AS_DLL`` in compiler codebase
2023

24+
- FCS doesn't add the System.ValueTuple.dll reference by default, see ``#if COMPILER_SERVICE_AS_DLL`` in compiler codebase
2125

2226
## Version Numbers
2327

‎fcs/RELEASE_NOTES.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#### 27.1.1-beta.001
2+
* FSharp.Compiler.Service nuget now uses net461, netstandard2.0 and FSharp.Core 4.6.2
23
* Integrate visualfsharp master from efb57cf56 to af97b92e6
34
* Notable improvements include:
45
* XmlDoc fixes for overloads
@@ -40,7 +41,7 @@
4041

4142
#### 21.0.1
4243
* Use new .NET SDK project files
43-
* FSharp.Compiler.Service nuget now uses net45 and netstandard2.0
44+
* FSharp.Compiler.Service nuget now uses net461 and netstandard2.0
4445
* FSharp.Compiler.Service netstandard2.0 now supports type providers
4546

4647
#### 20.0.1

‎fcs/build.fsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ let dotnetExePath =
2828
if File.Exists(pathToCli) then
2929
pathToCli
3030
else
31-
DotNetCli.InstallDotNetSDK "2.1.504"
31+
DotNetCli.InstallDotNetSDK "2.2.105"
3232

3333
let runDotnet workingDir args =
3434
let result =

0 commit comments

Comments
 (0)