Skip to content

Commit e3a3266

Browse files
dsymedsyme
committed
Merge pull request #557 from dsyme/integrate-8
Integrate Microsoft/visualfsharp and fsharp/fsharp master --> master
2 parents 0cae295 + f88a219 commit e3a3266

Some content is hidden

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

88 files changed

+4698
-2327
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ src/fsharp/FSharp.LanguageService.Compiler/ilpars.*
9999
src/fsharp/FSharp.LanguageService.Compiler/lex.*
100100
src/fsharp/FSharp.LanguageService.Compiler/pars.*
101101
vsintegration/src/unittests/Unittests.fsi
102+
vsintegration/src/FSharp.ProjectSystem.FSharp/ctofiles/MenusAndCommands.cto
102103
tests/*FSharp_Failures.env
103104
tests/*FSharp_Failures.lst
104105
tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.dll
@@ -134,3 +135,4 @@ src/fsharp/FSharp.Compiler.Service/pppars.fsi
134135
.fake
135136
*.cto
136137
tests/**/FSharp.Core.dll
138+
project.lock.json

‎.paket/paket.targets‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<!-- Enable the restore command to run before builds -->
5+
<RestorePackages Condition=" '$(RestorePackages)' == '' ">true</RestorePackages>
6+
<!-- Download Paket.exe if it does not already exist -->
7+
<DownloadPaket Condition=" '$(DownloadPaket)' == '' ">true</DownloadPaket>
8+
<PaketToolsPath>$(MSBuildThisFileDirectory)</PaketToolsPath>
9+
<PaketRootPath>$(MSBuildThisFileDirectory)..\</PaketRootPath>
10+
</PropertyGroup>
11+
<PropertyGroup>
12+
<!-- Paket command -->
13+
<PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
14+
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
15+
<PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
16+
<PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(PaketExePath)</PaketCommand>
17+
<PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
18+
<PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(PaketBootStrapperExePath)</PaketBootStrapperCommand>
19+
<!-- Commands -->
20+
<PaketReferences Condition="!Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectDirectory)\paket.references</PaketReferences>
21+
<PaketReferences Condition="Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectFullPath).paket.references</PaketReferences>
22+
<RestoreCommand>$(PaketCommand) restore --references-files "$(PaketReferences)"</RestoreCommand>
23+
<DownloadPaketCommand>$(PaketBootStrapperCommand)</DownloadPaketCommand>
24+
<!-- We need to ensure packages are restored prior to assembly resolve -->
25+
<BuildDependsOn Condition="$(RestorePackages) == 'true'">RestorePackages; $(BuildDependsOn);</BuildDependsOn>
26+
</PropertyGroup>
27+
<Target Name="CheckPrerequisites">
28+
<!-- Raise an error if we're unable to locate paket.exe -->
29+
<Error Condition="'$(DownloadPaket)' != 'true' AND !Exists('$(PaketExePath)')" Text="Unable to locate '$(PaketExePath)'" />
30+
<MsBuild Targets="DownloadPaket" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadPaket=$(DownloadPaket)" />
31+
</Target>
32+
<Target Name="DownloadPaket">
33+
<Exec Command="$(DownloadPaketCommand)" Condition=" '$(DownloadPaket)' == 'true' AND !Exists('$(PaketExePath)')" />
34+
</Target>
35+
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
36+
<Exec Command="$(RestoreCommand)" WorkingDirectory="$(PaketRootPath)" Condition="Exists('$(PaketReferences)')" />
37+
</Target>
38+
</Project>

‎RELEASE_NOTES.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#### 4.0.1
2+
* Integrate Microsoft\visualfsharp and fsharp\fsharp to master (including portable PDB)
3+
* Remove .NET Framework 4.0 support (now needs .NET Framework 4.5)
4+
15
#### 4.0.0
26
* Integrate Microsoft\visualfsharp and fsharp\fsharp to master
37

‎build.fsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ let gitHome = "https://github.com/" + gitOwner
2727
let gitName = "FSharp.Compiler.Service"
2828
let gitRaw = environVarOrDefault "gitRaw" "https://raw.githubusercontent.com/fsharp"
2929

30-
let netFrameworks = ["v4.0"; "v4.5"]
30+
let netFrameworks = [(* "v4.0"; *) "v4.5"]
3131

3232
// --------------------------------------------------------------------------------------
3333
// The rest of the code is standard F# build script

‎netci.groovy‎

Lines changed: 0 additions & 65 deletions
This file was deleted.

‎nuget/paket.template‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ iconurl https://raw.github.com/fsharp/FSharp.Compiler.Service/master/misc/logo.p
1515
tags
1616
F#, fsharp, interactive, compiler, editor
1717
files
18-
../bin/v4.0/FSharp.Compiler.Service.dll ==> lib/net40
19-
../bin/v4.0/FSharp.Compiler.Service.xml ==> lib/net40
20-
../bin/v4.0/FSharp.Compiler.Service.?db ==> lib/net40
21-
../bin/v4.0/FSharp.Compiler.Service.dll.?db ==> lib/net40
2218
../bin/v4.5/FSharp.Compiler.Service.dll ==> lib/net45
2319
../bin/v4.5/FSharp.Compiler.Service.xml ==> lib/net45
2420
../bin/v4.5/FSharp.Compiler.Service.?db ==> lib/net45

‎paket.dependencies‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
source https://www.myget.org/F/dotnet-core/api/v3/index.json
12
source https://www.nuget.org/api/v2/
23

34
nuget NUnit 2.6.3
@@ -12,4 +13,9 @@ nuget SourceLink.Fake
1213
nuget fssrgen
1314
nuget FSharp.SRGen.Build.Tasks
1415

16+
nuget System.Collections.Immutable 1.2.0-rc3-23805
17+
nuget System.Reflection.Metadata 1.3.0-beta-23816
18+
nuget Microsoft.DiaSymReader.PortablePdb 1.0.0-rc-60301
19+
nuget Microsoft.DiaSymReader 1.0.7
20+
1521
github fsharp/FAKE modules/Octokit/Octokit.fsx

‎paket.lock‎

Lines changed: 137 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,151 @@
11
NUGET
22
remote: https://www.nuget.org/api/v2
33
specs:
4-
FAKE (4.1.0)
5-
FSharp.Compiler.Service (1.4.0.1)
6-
FSharp.Formatting (2.10.0)
7-
FSharp.Compiler.Service (>= 0.0.87)
8-
FSharpVSPowerTools.Core (1.8.0)
9-
FSharpVSPowerTools.Core (1.8.0)
10-
FSharp.Compiler.Service (>= 0.0.87)
11-
Microsoft.Bcl (1.1.10)
4+
FAKE (4.25.4)
5+
FSharp.Compiler.Service (2.0.0.6)
6+
FSharp.Core (4.0.0.1) - framework: >= net46
7+
FSharp.Formatting (2.14.2)
8+
FSharp.Compiler.Service (2.0.0.6)
9+
FSharpVSPowerTools.Core (>= 2.3 < 2.4)
10+
FSharp.SRGen.Build.Tasks (3.0)
11+
FSharp.Core (>= 4.0.0.1) - framework: >= net46
12+
FSharpVSPowerTools.Core (2.3)
13+
FSharp.Compiler.Service (>= 2.0.0.3)
14+
FsSrGen (3.0)
15+
FSharp.Core (>= 4.0.0.1) - framework: >= net46
16+
Microsoft.Bcl (1.1.10) - framework: net10, net11, net20, net30, net35, net40, net40-full
1217
Microsoft.Bcl.Build (>= 1.0.14)
13-
Microsoft.Bcl.Build (1.0.21)
14-
Microsoft.Net.Http (2.2.29)
18+
Microsoft.Bcl.Build (1.0.21) - import_targets: false, framework: net10, net11, net20, net30, net35, net40, net40-full
19+
Microsoft.DiaSymReader (1.0.7)
20+
Microsoft.DiaSymReader.PortablePdb (1.0.0-rc-60301)
21+
Microsoft.DiaSymReader (>= 1.0.7)
22+
System.Collections.Immutable (>= 1.1.37)
23+
System.Reflection.Metadata (>= 1.2.0-rc2-23826)
24+
Microsoft.Net.Http (2.2.29) - framework: net10, net11, net20, net30, net35, net40, net40-full
1525
Microsoft.Bcl (>= 1.1.10)
1626
Microsoft.Bcl.Build (>= 1.0.14)
1727
NUnit (2.6.3)
1828
NUnit.Runners (2.6.3)
19-
Octokit (0.14.0) - framework: wpv8.0
20-
Microsoft.Net.Http
21-
SourceLink.Fake (1.1.0)
22-
sqlite-net-wp8 (3.8.5) - framework: wpv8.0
23-
SQLite.Net-PCL (3.0.5)
24-
sqlite-net-wp8 (>= 3.8.5) - framework: wpv8.0
29+
Octokit (0.19)
30+
Microsoft.Net.Http - framework: net10, net11, net20, net30, net35, net40, net40-full
31+
SourceLink.Fake (1.1)
2532
SQLite.Net.Platform.Generic (2.4.1)
2633
SQLite.Net-PCL
34+
SQLite.Net-PCL (3.0.5)
35+
sqlite-net-wp8 (>= 3.8.5) - framework: wpv8.0
36+
sqlite-net-wp8 (3.8.5) - framework: wpv8.0
37+
remote: https://www.myget.org/F/dotnet-core
38+
specs:
39+
System.Collections (4.0.10) - framework: dnxcore50
40+
System.Diagnostics.Debug (>= 4.0) - framework: dnxcore50
41+
System.Resources.ResourceManager (>= 4.0) - framework: dnxcore50
42+
System.Runtime (>= 4.0) - framework: dnxcore50
43+
System.Runtime (>= 4.0.20) - framework: dnxcore50
44+
System.Runtime.Extensions (>= 4.0) - framework: dnxcore50
45+
System.Threading (>= 4.0) - framework: dnxcore50
46+
System.Collections.Immutable (1.2.0-rc3-23805)
47+
System.Collections (>= 4.0) - framework: dnxcore50
48+
System.Diagnostics.Debug (>= 4.0) - framework: dnxcore50
49+
System.Globalization (>= 4.0) - framework: dnxcore50
50+
System.Linq (>= 4.0) - framework: dnxcore50
51+
System.Resources.ResourceManager (>= 4.0) - framework: dnxcore50
52+
System.Runtime (>= 4.0) - framework: dnxcore50
53+
System.Runtime.Extensions (>= 4.0) - framework: dnxcore50
54+
System.Threading (>= 4.0) - framework: dnxcore50
55+
System.Diagnostics.Contracts (4.0.0) - framework: dnxcore50
56+
System.Runtime (>= 4.0) - framework: dnxcore50
57+
System.Diagnostics.Debug (4.0.10) - framework: dnxcore50
58+
System.Runtime (>= 4.0) - framework: dnxcore50
59+
System.Globalization (4.0.10) - framework: dnxcore50
60+
System.Runtime (>= 4.0) - framework: dnxcore50
61+
System.IO (4.0.10) - framework: dnxcore50
62+
System.Globalization (>= 4.0) - framework: dnxcore50
63+
System.Runtime (>= 4.0.20) - framework: dnxcore50
64+
System.Text.Encoding (>= 4.0) - framework: dnxcore50
65+
System.Text.Encoding (>= 4.0.10) - framework: dnxcore50
66+
System.Text.Encoding.Extensions (>= 4.0) - framework: dnxcore50
67+
System.Threading (>= 4.0) - framework: dnxcore50
68+
System.Threading.Tasks (>= 4.0) - framework: dnxcore50
69+
System.Linq (4.0.0) - framework: dnxcore50
70+
System.Collections (>= 4.0.10) - framework: dnxcore50
71+
System.Diagnostics.Debug (>= 4.0.10) - framework: dnxcore50
72+
System.Resources.ResourceManager (>= 4.0) - framework: dnxcore50
73+
System.Runtime (>= 4.0.20) - framework: dnxcore50
74+
System.Runtime.Extensions (>= 4.0.10) - framework: dnxcore50
75+
System.Private.Uri (4.0.0) - framework: dnxcore50
76+
System.Reflection (4.0.10) - framework: dnxcore50
77+
System.IO (>= 4.0) - framework: dnxcore50
78+
System.Reflection.Primitives (>= 4.0) - framework: dnxcore50
79+
System.Runtime (>= 4.0.20) - framework: dnxcore50
80+
System.Reflection.Extensions (4.0.0) - framework: dnxcore50
81+
System.Diagnostics.Debug (>= 4.0.10) - framework: dnxcore50
82+
System.Reflection (>= 4.0) - framework: dnxcore50
83+
System.Reflection (>= 4.0.10) - framework: dnxcore50
84+
System.Reflection.Primitives (>= 4.0) - framework: dnxcore50
85+
System.Reflection.TypeExtensions (>= 4.0) - framework: dnxcore50
86+
System.Resources.ResourceManager (>= 4.0) - framework: dnxcore50
87+
System.Runtime (>= 4.0) - framework: dnxcore50
88+
System.Runtime (>= 4.0.20) - framework: dnxcore50
89+
System.Runtime.Extensions (>= 4.0.10) - framework: dnxcore50
90+
System.Reflection.Metadata (1.3.0-beta-23816)
91+
System.Collections (>= 4.0) - framework: dnxcore50
92+
System.Collections.Immutable (>= 1.1.37) - framework: >= net45, dnxcore50, monoandroid, monotouch, portable-profile7, xamarinios, xamarinmac, winv4.5, wpav8.1
93+
System.Diagnostics.Debug (>= 4.0) - framework: dnxcore50
94+
System.IO (>= 4.0) - framework: dnxcore50
95+
System.Linq (>= 4.0) - framework: dnxcore50
96+
System.Reflection (>= 4.0) - framework: dnxcore50
97+
System.Reflection.Extensions (>= 4.0) - framework: dnxcore50
98+
System.Reflection.Primitives (>= 4.0) - framework: dnxcore50
99+
System.Resources.ResourceManager (>= 4.0) - framework: dnxcore50
100+
System.Runtime (>= 4.0) - framework: dnxcore50
101+
System.Runtime.Extensions (>= 4.0) - framework: dnxcore50
102+
System.Runtime.InteropServices (>= 4.0) - framework: dnxcore50
103+
System.Text.Encoding (>= 4.0) - framework: dnxcore50
104+
System.Text.Encoding.Extensions (>= 4.0) - framework: dnxcore50
105+
System.Threading (>= 4.0) - framework: dnxcore50
106+
System.Reflection.Primitives (4.0.0) - framework: dnxcore50
107+
System.Runtime (>= 4.0) - framework: dnxcore50
108+
System.Threading (>= 4.0) - framework: dnxcore50
109+
System.Reflection.TypeExtensions (4.0.0) - framework: dnxcore50
110+
System.Diagnostics.Contracts (>= 4.0) - framework: dnxcore50
111+
System.Diagnostics.Debug (>= 4.0.10) - framework: dnxcore50
112+
System.Linq (>= 4.0) - framework: dnxcore50
113+
System.Reflection (>= 4.0) - framework: dnxcore50
114+
System.Reflection (>= 4.0.10) - framework: dnxcore50
115+
System.Reflection.Primitives (>= 4.0) - framework: dnxcore50
116+
System.Resources.ResourceManager (>= 4.0) - framework: dnxcore50
117+
System.Runtime (>= 4.0) - framework: dnxcore50
118+
System.Runtime (>= 4.0.20) - framework: dnxcore50
119+
System.Runtime.Extensions (>= 4.0.10) - framework: dnxcore50
120+
System.Resources.ResourceManager (4.0.0) - framework: dnxcore50
121+
System.Globalization (>= 4.0) - framework: dnxcore50
122+
System.Reflection (>= 4.0) - framework: dnxcore50
123+
System.Reflection (>= 4.0.10) - framework: dnxcore50
124+
System.Runtime (>= 4.0) - framework: dnxcore50
125+
System.Runtime (>= 4.0.20) - framework: dnxcore50
126+
System.Runtime (4.0.20) - framework: dnxcore50
127+
System.Private.Uri (>= 4.0) - framework: dnxcore50
128+
System.Runtime.Extensions (4.0.10) - framework: dnxcore50
129+
System.Runtime (>= 4.0.20) - framework: dnxcore50
130+
System.Runtime.Handles (4.0.0) - framework: dnxcore50
131+
System.Runtime (>= 4.0) - framework: dnxcore50
132+
System.Runtime.InteropServices (4.0.20) - framework: dnxcore50
133+
System.Reflection (>= 4.0) - framework: dnxcore50
134+
System.Reflection.Primitives (>= 4.0) - framework: dnxcore50
135+
System.Runtime (>= 4.0) - framework: dnxcore50
136+
System.Runtime.Handles (>= 4.0) - framework: dnxcore50
137+
System.Text.Encoding (4.0.10) - framework: dnxcore50
138+
System.Runtime (>= 4.0) - framework: dnxcore50
139+
System.Text.Encoding.Extensions (4.0.10) - framework: dnxcore50
140+
System.Runtime (>= 4.0) - framework: dnxcore50
141+
System.Text.Encoding (>= 4.0.10) - framework: dnxcore50
142+
System.Threading (4.0.10) - framework: dnxcore50
143+
System.Runtime (>= 4.0) - framework: dnxcore50
144+
System.Threading.Tasks (>= 4.0) - framework: dnxcore50
145+
System.Threading.Tasks (4.0.10) - framework: dnxcore50
146+
System.Runtime (>= 4.0) - framework: dnxcore50
27147
GITHUB
28148
remote: fsharp/FAKE
29149
specs:
30-
modules/Octokit/Octokit.fsx (16296d960f02a6192baa9e3f9facb32aca7184bb)
150+
modules/Octokit/Octokit.fsx (3bf706bd6058733a1a034755741076b3953aaf09)
31151
Octokit

‎samples/FscExe/FscExe.fsproj‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
<NoWarn>$(NoWarn);62;44</NoWarn>
1111
<AssemblyName>FscExe</AssemblyName>
1212
<Name>FscExe</Name>
13-
<DefineConstants>EXTENSIONTYPING;COMPILER;$(DefineConstants)</DefineConstants>
13+
<DefineConstants>EXTENSIONTYPING;$(DefineConstants)</DefineConstants>
14+
<DefineConstants>COMPILER;$(DefineConstants)</DefineConstants>
15+
<DefineConstants>FX_RESIDENT_COMPILER;$(DefineConstants)</DefineConstants>
1416
<AllowCrossTargeting>true</AllowCrossTargeting>
1517
<OtherFlags>$(OtherFlags) --warnon:1182</OtherFlags>
1618
<TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
@@ -23,7 +25,7 @@
2325
<Optimize>false</Optimize>
2426
<Tailcalls>false</Tailcalls>
2527
<OutputPath>bin\Debug\</OutputPath>
26-
<DefineConstants>TRACE;DEBUG</DefineConstants>
28+
<DefineConstants>TRACE;DEBUG;$(DefineConstants)</DefineConstants>
2729
<WarningLevel>3</WarningLevel>
2830
<PlatformTarget>AnyCPU</PlatformTarget>
2931
<DocumentationFile>bin\Debug\FsiExe.xml</DocumentationFile>
@@ -36,7 +38,7 @@
3638
<Optimize>true</Optimize>
3739
<Tailcalls>true</Tailcalls>
3840
<OutputPath>bin\Release\</OutputPath>
39-
<DefineConstants>TRACE</DefineConstants>
41+
<DefineConstants>TRACE;$(DefineConstants)</DefineConstants>
4042
<WarningLevel>3</WarningLevel>
4143
<PlatformTarget>AnyCPU</PlatformTarget>
4244
<DocumentationFile>bin\Release\FsiExe.xml</DocumentationFile>

0 commit comments

Comments
 (0)