Skip to content

Commit e55c53f

Browse files
TIHanbaronfel
authored andcommitted
Merge remote-tracking branch 'upstream/master' into bug/linear-match-overflow-fix
2 parents b5a9996 + a373a5c commit e55c53f

File tree

7,087 files changed

+128991
-862810
lines changed

Some content is hidden

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

7,087 files changed

+128991
-862810
lines changed

.gitattributes

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@
2121
*.rtf diff=astextplain
2222
*.RTF diff=astextplain
2323

24-
mono/launcher text eol=lf
25-
mono/config.make text eol=lf
24+
*.sh text eol=lf
2625
targets.make text eol=lf
2726

2827
*.bsl linguist-vendored=true
28+
29+
*.png binary

.github/issue_template.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# FSharp.Compiler.Service Issue Template
2+
3+
> Thanks for your intention to help out!
4+
5+
We appreciate your enthusiasm, but this repository is a *read-only* fork of the official F# compiler. Please raise your issue at the [upstream repository](https://github.com/dotnet/fsharp/issues/new).

.github/pull_request_template.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# FSharp.Compiler.Service Pull Request Template
2+
3+
> Thanks for your intention to help out!
4+
5+
We appreciate your enthusiasm, but this repository is a *read-only* fork of the official F# compiler. Please raise your Pull Request at the [upstream repository](https://github.com/dotnet/fsharp/compare).

.gitignore

Lines changed: 110 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,32 +83,136 @@ lib/bootstrap/4.1/policy*
8383
obj/
8484
bin/
8585
aclocal.m4
86+
src/*.userprefs
87+
src/fsharp/FSStrings.resources
88+
packages
89+
src/fsharp/FSharp.Build/*.resx
90+
src/fsharp/FSharp.Build-proto/*.resx
91+
src/fsharp/FSharp.Build-proto/*.resources
92+
src/fsharp/FSharp.Compiler-proto/*.resx
93+
src/fsharp/FSharp.Compiler-proto/*.resources
94+
src/fsharp/FSharp.Compiler-proto/*.sln
95+
src/fsharp/FSharp.Compiler-proto/*.userprefs
96+
src/fsharp/fsi/*.resx
97+
src/fsharp/FSharp.Compiler.Interactive.Settings/*.resx
98+
src/fsharp/FSharp.Compiler.Server.Shared/*.resx
99+
src/fsharp/fsi/Fsi.sln
100+
src/fsharp/FSharp.Build/*.resources
101+
src/fsharp/FSharp.Compiler/*.resx
102+
src/fsharp/FSharp.Compiler/*.resources
103+
src/fsharp/FSharp.Compiler/*.sln
104+
src/fsharp/FSharp.Compiler/*.userprefs
105+
Debug
106+
Release
107+
Proto
86108
sign_temp
87109
.libs
88110
configure
89111
config.log
90112
config.status
113+
src/fsharp/FSharp.Compiler/illex.fs
114+
src/fsharp/FSharp.Compiler/ilpars.fs
115+
src/fsharp/FSharp.Compiler/ilpars.fsi
116+
src/fsharp/FSharp.Compiler/lex.fs
117+
src/fsharp/FSharp.Compiler/pars.fs
118+
src/fsharp/FSharp.Compiler/pars.fsi
119+
src/fsharp/FSharp.Compiler/pplex.fs
120+
src/fsharp/FSharp.Compiler/pppars.fs
121+
src/fsharp/FSharp.Compiler/pppars.fsi
122+
src/fsharp/FSharp.Compiler-proto/illex.fs
123+
src/fsharp/FSharp.Compiler-proto/ilpars.fs
124+
src/fsharp/FSharp.Compiler-proto/ilpars.fsi
125+
src/fsharp/FSharp.Compiler-proto/lex.fs
126+
src/fsharp/FSharp.Compiler-proto/pars.fs
127+
src/fsharp/FSharp.Compiler-proto/pars.fsi
128+
src/fsharp/FSharp.Compiler.Silverlight/lex.fs
129+
src/fsharp/FSharp.Compiler.Silverlight/pars.fs
130+
src/fsharp/FSharp.Compiler.Silverlight/pars.fsi
131+
src/fsharp/FSharp.Compiler-proto/pplex.fs
132+
src/fsharp/FSharp.Compiler-proto/pppars.fs
133+
src/fsharp/FSharp.Compiler-proto/pppars.fsi
134+
91135
*~
92136
*.suo
93137
obj
138+
src/fsharp/FSharp.Data.TypeProviders/FSData.resx
139+
src/fsharp/fsiAnyCpu/FSIstrings.resx
140+
141+
*.nupkg
142+
143+
bin
144+
packages
145+
*.bak
146+
temp/
147+
src/fsharp/fsi/FSIStrings.fs
148+
149+
src/fsharp/FSharp.Compiler.Service/FSComp.resx
150+
src/fsharp/FSharp.Compiler.Service/FSIstrings.resx
151+
src/fsharp/FSharp.Compiler.Service/illex.fs
152+
src/fsharp/FSharp.Compiler.Service/ilpars.fs
153+
src/fsharp/FSharp.Compiler.Service/ilpars.fsi
154+
src/fsharp/FSharp.Compiler.Service/lex.fs
155+
src/fsharp/FSharp.Compiler.Service/pars.fs
156+
src/fsharp/FSharp.Compiler.Service/pars.fsi
157+
TestResults.xml
158+
*.userprefs
94159
extras
95160
ossreadme*.txt
161+
*.XML
162+
src/assemblyinfo/assemblyinfo.shared.fs
163+
*.csproj.user
164+
src/fsharp/FSharp.LanguageService.Compiler/illex.*
165+
src/fsharp/FSharp.LanguageService.Compiler/ilpars.*
166+
src/fsharp/FSharp.LanguageService.Compiler/lex.*
167+
src/fsharp/FSharp.LanguageService.Compiler/pars.*
168+
vsintegration/src/unittests/Unittests.fsi
169+
vsintegration/src/FSharp.ProjectSystem.FSharp/ctofiles/MenusAndCommands.cto
170+
tests/*FSharp_Failures.env
171+
tests/*FSharp_Failures.lst
172+
tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.dll
173+
tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.pdb
174+
tests/XFSharpQA_Failures.log.*
175+
vsintegration/src/vs/FsPkgs/FSharp.Project/FS/FSharp.ProjectSystem.FSharp.fsi
176+
vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ctofiles/
177+
tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Utils.dll
178+
tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExprLibrary.dll
179+
packages
180+
FSharp.Compiler.Tools.Nuget/*.nupkg
181+
FSharp.Core.Nuget/*.nupkg
182+
tests/fsharpqa/Source/*FSharpQA_Failures.env
183+
tests/fsharpqa/Source/*FSharpQA_Failures.lst
96184
*.csproj.user
97185
*.fsproj.user
98186
*.vbproj.user
99187
*.sln.DotSettings.user
100188
*.log
101189
*.jrs
102190
*.chk
191+
*.bak
192+
FSharp.Compiler.Tools.Nuget/*.nupkg
193+
FSharp.Core.Nuget/*.nupkg
194+
artifacts/*.nupkg
103195
*.bak
104196
*.vserr
105197
*.err
106198
*.orig
107199
*.mdf
108200
*.ldf
201+
.paket/paket.exe
202+
paket-files
203+
docsrc/tools/FSharp.Formatting.svclog
204+
src/fsharp/FSharp.Compiler.Service/pplex.fs
205+
src/fsharp/FSharp.Compiler.Service/pppars.fs
206+
src/fsharp/FSharp.Compiler.Service/pppars.fsi
207+
.fake
109208
*.cto
110209
*.vstman
111210
project.lock.json
211+
src/fsharp/FSharp.Compiler.Service/FSComp.fs
212+
src/fsharp/FSharp.Compiler.Service/FSComp.resx
213+
src/fsharp/FSharp.Compiler.Service/FSIstrings.fs
214+
src/fsharp/FSharp.Compiler.Service/FSIstrings.resx
215+
Tools/
112216
Backup/
113217
tests/fsharp/core/array/dont.run.peverify
114218
tests/fsharp/core/innerpoly/dont.run.peverify
@@ -120,7 +224,8 @@ source_link.json
120224
System.ValueTuple.dll
121225
tests/fsharpqa/testenv/bin/System.ValueTuple.dll
122226
**/.fake
123-
.ionide
227+
lib/netcore/fsc/bin/
228+
!lib/bootstrap/signed/**/*
124229
/fcs/packages/
125230
*/paket-files/
126231
/fcs/TestResult.xml
@@ -129,4 +234,7 @@ tests/fsharpqa/testenv/bin/System.ValueTuple.dll
129234
msbuild.binlog
130235
/fcs/FSharp.Compiler.Service.netstandard/*.fs
131236
/fcs/FSharp.Compiler.Service.netstandard/*.fsi
132-
/.ionide/
237+
238+
.ionide
239+
.vscode
240+
**/.DS_Store

.travis.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
language: csharp
2+
3+
os:
4+
- linux
5+
- osx
6+
7+
osx_image: xcode9
8+
9+
mono:
10+
- weekly
11+
- latest
12+
- 5.8.0
13+
14+
dotnet: 2.1.4
15+
16+
sudo: false
17+
18+
install:
19+
20+
script:
21+
- ./fcs/build.sh Build
22+
23+
# Woes with doing more build/test on linux
24+
#
25+
# This fails because NUnit gives an exception (!!!!)
26+
# - ./fcs/build.sh Test.NetFx
27+
#
28+
# System.IO.FileNotFoundException: Could not load file or assembly 'nunit.engine.api, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb' or one of its dependencies.
29+
#
30+
# This fails because Nuget packaging doesn't like backslashes in the package file, but Windows does
31+
# - ./fcs/build.sh NuGet
32+
33+
# Fails on Travis OSX too often because there are network outages on that configuration getting the Mono MDK
34+
# Fails on Travis Linux with Mono latest do to a trust issue with certs on package restore?
35+
matrix:
36+
exclude:
37+
- os: osx
38+
mono: 4.4.2
39+
- os: osx
40+
mono: 4.8.0
41+
- os: linux
42+
mono: latest
43+

.vscode/launch.json

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

.vscode/tasks.json

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

0 commit comments

Comments
 (0)