Skip to content

Commit d37f00a

Browse files
dsymedsyme
committed
integrate visualfsharp master
2 parents 3ec7485 + 15d9391 commit d37f00a

File tree

66 files changed

+981
-424
lines changed

Some content is hidden

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

66 files changed

+981
-424
lines changed

‎.vsts-pr.yaml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
phases:
2+
- phase: Linux
3+
queue:
4+
name: Hosted Linux Preview
5+
timeoutInMinutes: 90
6+
parallel: 2
7+
matrix:
8+
release_default:
9+
_command: ./mono/cibuild.sh
10+
_args: release
11+
release_fcs:
12+
_command: ./fcs/build.sh
13+
_args: Build
14+
steps:
15+
- script: $(_command) $(_args)
16+
- task: PublishBuildArtifacts@1
17+
inputs:
18+
PathtoPublish: '$(Build.SourcesDirectory)/tests/TestResults'
19+
ArtifactName: 'Linux $(_command) $(_args)'
20+
publishLocation: Container
21+
continueOnError: true
22+
condition: failed()
23+
24+
- phase: Windows
25+
queue:
26+
name: Hosted VS2017
27+
timeoutInMinutes: 90
28+
parallel: 7
29+
matrix:
30+
ci_part1:
31+
_command: build.cmd
32+
_args: release ci_part1
33+
ci_part2:
34+
_command: build.cmd
35+
_args: release ci_part2
36+
ci_part3:
37+
_command: build.cmd
38+
_args: release ci_part3
39+
ci_part4:
40+
_command: build.cmd
41+
_args: release ci_part4
42+
debug_default:
43+
_command: build.cmd
44+
_args: debug
45+
net40_no_vs:
46+
_command: build.cmd
47+
_args: release net40
48+
release_fcs:
49+
_command: fcs\build.cmd
50+
_args: TestAndNuget
51+
steps:
52+
- script: $(_command) $(_args)
53+
- task: PublishBuildArtifacts@1
54+
inputs:
55+
PathtoPublish: '$(Build.SourcesDirectory)\tests\TestResults'
56+
ArtifactName: 'Windows $(_command) $(_args)'
57+
publishLocation: Container
58+
continueOnError: true
59+
condition: failed()

‎README.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ This project is subject to the MIT License. A copy of this license can be found
5656
Maintainers
5757
-----------
5858

59-
The maintainers of this repository from the F# Core Engineering Group are:
59+
The maintainers of this repository are:
6060

61-
- [Don Syme](http://github.com/dsyme), [Tomas Petricek](http://github.com/tpetricek), [Enrico Sada](http://github.com/enricosada)
62-
- with help and guidance from [Robin Neatherway](https://github.com/rneatherway), [Dave Thomas](http://github.com/7sharp9), [Lincoln Atkinson](http://github.com/latkin), [Kevin Ransom](http://github.com/KevinRansom), [Vladimir Matveev](http://github.com/vladima) and others
61+
- [Don Syme](http://github.com/dsyme)
62+
- [Tomas Petricek](http://github.com/tpetricek)
63+
- [Enrico Sada](http://github.com/enricosada)
64+
- Many people have helped including [Robin Neatherway](https://github.com/rneatherway), [Dave Thomas](http://github.com/7sharp9), [Lincoln Atkinson](http://github.com/latkin), [Kevin Ransom](http://github.com/KevinRansom), [Vladimir Matveev](http://github.com/vladima) and others

‎fcs/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
FSharp.Compiler.Service.Tests/TestResults/*
12
FSharp.Compiler.Service.netstandard/illex.fs
23
FSharp.Compiler.Service.netstandard/ilpars.fs
34
FSharp.Compiler.Service.netstandard/ilpars.fsi

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<Import Project="..\netfx.props" />
77
<PropertyGroup>
88
<TargetFrameworks>net45</TargetFrameworks>
9+
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
910
<OutputPath>..\..\$(Configuration.ToLower())\fcs</OutputPath>
1011
<DefineConstants>$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
1112
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
@@ -28,7 +29,7 @@
2829
<ItemGroup>
2930
<Reference Include="System.Runtime" />
3031
<Reference Include="System.IO" />
31-
<PackageReference Include="FSharp.Core" Version="4.1.*" />
32+
<PackageReference Include="FSharp.Core" Version="4.1.18" />
3233
<ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
3334
<Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
3435
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Framework.dll</HintPath>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<Import Project="..\netfx.props" />
77
<PropertyGroup>
88
<TargetFrameworks>net45</TargetFrameworks>
9+
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
910
<OutputPath>..\..\$(Configuration.ToLower())\fcs</OutputPath>
1011
</PropertyGroup>
1112
<PropertyGroup>
@@ -30,7 +31,7 @@
3031
<ItemGroup>
3132
<Reference Include="System.Runtime" />
3233
<Reference Include="System.IO" />
33-
<PackageReference Include="FSharp.Core" Version="4.1.*" />
34+
<PackageReference Include="FSharp.Core" Version="4.1.18" />
3435
<ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
3536
</ItemGroup>
3637
</Project>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<PropertyGroup>
99
<OutputType>Exe</OutputType>
1010
<TargetFrameworks>net45</TargetFrameworks>
11+
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1112
<DefineConstants>$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
1213
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
1314
<OtherFlags>$(OtherFlags) --staticlink:FSharp.Core</OtherFlags>
@@ -28,7 +29,7 @@
2829
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
2930
<Private>false</Private>
3031
</Reference>
31-
<PackageReference Include="FSharp.Core" Version="4.1.*" />
32+
<PackageReference Include="FSharp.Core" Version="4.1.18" />
3233
<Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
3334
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Framework.dll</HintPath>
3435
<Private>false</Private>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<Import Project="..\netfx.props" />
77
<PropertyGroup>
88
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
9+
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
910
<NoWarn>$(NoWarn);44;75;</NoWarn>
1011
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1112
<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -74,7 +75,7 @@
7475
<None Include="App.config" />
7576
</ItemGroup>
7677
<ItemGroup>
77-
<PackageReference Include="FSharp.Core" Version="4.2.*" />
78+
<PackageReference Include="FSharp.Core" Version="4.2.3" />
7879
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
7980
<PackageReference Include="NUnit" Version="3.9.0" />
8081
<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<Import Project="..\netfx.props" />
77
<PropertyGroup>
88
<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
9+
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
910
<DefineConstants>$(DefineConstants);COMPILER_SERVICE_AS_DLL</DefineConstants>
1011
<DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
1112
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
@@ -634,9 +635,9 @@
634635
</Compile>
635636
</ItemGroup>
636637
<ItemGroup>
637-
<PackageReference Include="FSharp.Core" Version="4.1.*" />
638-
<PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
639-
<PackageReference Include="System.Reflection.Metadata" Version="1.4.2" />
638+
<PackageReference Include="FSharp.Core" Version="4.1.18" />
639+
<PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
640+
<PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
640641
</ItemGroup>
641642
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
642643
<PackageReference Include="System.Diagnostics.Process" Version="4.1.0" />

‎fcs/build.fsx‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,13 @@ Target "Restore" (fun _ ->
7474
// We assume a paket restore has already been run
7575
runDotnet __SOURCE_DIRECTORY__ "restore FSharp.Compiler.Service.sln -v n"
7676
for p in [ "../packages.config" ] do
77-
ExecProcess (fun info ->
78-
info.FileName <- FullName @"./../.nuget/NuGet.exe"
79-
info.WorkingDirectory <- FullName @"./.."
80-
info.Arguments <- sprintf "restore %s -PackagesDirectory \"%s\" -ConfigFile \"%s\"" (FullName p) (FullName "./../packages") (FullName "./../NuGet.Config")) TimeSpan.MaxValue
81-
|> assertExitCodeZero
77+
let rec executeProcess count =
78+
let result = ExecProcess (fun info ->
79+
info.FileName <- FullName @"./../.nuget/NuGet.exe"
80+
info.WorkingDirectory <- FullName @"./.."
81+
info.Arguments <- sprintf "restore %s -PackagesDirectory \"%s\" -ConfigFile \"%s\"" (FullName p) (FullName "./../packages") (FullName "./../NuGet.Config")) TimeSpan.MaxValue
82+
if result <> 0 && count > 1 then executeProcess (count - 1) else result
83+
(executeProcess 5) |> assertExitCodeZero
8284
)
8385

8486
Target "BuildVersion" (fun _ ->

‎fcs/samples/EditorService/EditorService.fsproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<Import Project="..\..\netfx.props" />
44
<PropertyGroup>
55
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
6+
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
67
<OutputType>Exe</OutputType>
78
<IsPackable>false</IsPackable>
89
</PropertyGroup>
@@ -13,7 +14,7 @@
1314
<ItemGroup>
1415
<PackageReference Include="FSharp.Core" Version="4.1.*" />
1516
<ProjectReference Include="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
16-
<PackageReference Include="System.Reflection.Metadata" Version="1.4.2" />
17+
<PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
1718
</ItemGroup>
1819
<ItemGroup Condition="'$(TargetFramework)' == 'net46'">
1920
<Reference Include="System.Runtime" />

0 commit comments

Comments
 (0)