Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release/fsharp47 to release/dev16.3 #7223

Merged
merged 269 commits into from
Jul 14, 2019
Merged
Changes from 1 commit
Commits
Show all changes
269 commits
Select commit Hold shift + click to select a range
b29fe57
Merge remote-tracking branch 'origin/master' into nameof-operator
vasily-kirichenko Feb 4, 2017
b7763a6
Revert "remove nameof function form FSharp.Core"
vasily-kirichenko Feb 4, 2017
906a934
Try to resolve the `nameof` operator argument to prevent passing anyt…
vasily-kirichenko Feb 4, 2017
a770e3c
nameof works on generic types
vasily-kirichenko Feb 4, 2017
067955a
fix error range in case of wrong `nameof`operator argument
vasily-kirichenko Feb 4, 2017
bfcc390
notify name resolution sink about nameof operator argument Item in or…
vasily-kirichenko Feb 5, 2017
6a92a80
fully type check `nameof` argument
vasily-kirichenko Feb 5, 2017
bcec600
try to type check arg again
vasily-kirichenko Feb 5, 2017
f64b3c5
Merge remote-tracking branch 'origin/master' into nameof-operator
Feb 6, 2017
0c1cad2
type check `nameof` argument more carefully
vasily-kirichenko Feb 6, 2017
15bf862
Merge remote-tracking branch 'vasily-kirichenko/nameof-operator' into…
vasily-kirichenko Feb 6, 2017
5b72f32
Merge remote-tracking branch 'origin/master' into nameof-operator
vasily-kirichenko Feb 15, 2017
ceb7731
Merge branch 'master' into nameof-operator
vasily-kirichenko Mar 1, 2017
588de2e
factor tcExpr to top level function
vasily-kirichenko Mar 1, 2017
f2ae00f
Merge remote-tracking branch 'origin/master' into nameof-operator
vasily-kirichenko Mar 8, 2017
d1b1389
add diagnostics
dsyme Mar 10, 2019
0f89711
add diagnostics
dsyme Mar 10, 2019
7da6aff
diagnostics
dsyme Mar 11, 2019
871489b
diagnostics
dsyme Mar 11, 2019
27d00a0
diagnostics
dsyme Mar 11, 2019
7d98d16
add diagnostics and possible fix for tp smoke tests
dsyme Mar 11, 2019
cc6e992
fix build
dsyme Mar 11, 2019
e13b385
fix build
dsyme Mar 11, 2019
ce0961e
more diagnostics
dsyme Mar 11, 2019
2bb15ce
integrate master
dsyme Mar 11, 2019
8b0d33b
merge with master
dsyme Mar 12, 2019
b1bf49d
update xlf
dsyme Mar 12, 2019
ad61659
fix build
dsyme Mar 12, 2019
90b46fb
revamp implementation for types and modules
dsyme Mar 12, 2019
21b4705
update tests
dsyme Mar 12, 2019
51e2012
try to fix flaky test
dsyme Mar 12, 2019
d482527
fix error numbers
dsyme Mar 12, 2019
26e05dd
fix build
dsyme Mar 12, 2019
8a7f046
update build from source
dsyme Mar 12, 2019
20bf0c5
Merge branch 'diag4' into nameof
dsyme Mar 12, 2019
93ccbbe
update error codes, FSComp.fs and XLF
dsyme Mar 13, 2019
4b91598
fix test
dsyme Mar 13, 2019
1f8f90c
integrate master
dsyme Mar 20, 2019
d115717
Merge remote-tracking branch 'upstream/master' into merges/master-to-…
brettfo Mar 20, 2019
4010bb9
Merge pull request #6331 from Microsoft/merges/master-to-fsharp5
brettfo Mar 20, 2019
957a5ad
Merge pull request #6351 from Microsoft/merges/dev16.0-to-fsharp5
Mar 21, 2019
bf4b336
Merge branch 'master' of https://github.com/Microsoft/visualfsharp in…
dsyme Mar 21, 2019
8303215
Merge branch 'master' of http://github.com/Microsoft/visualfsharp int…
dsyme Mar 22, 2019
23d7a64
merge master
dsyme Mar 22, 2019
98a29ff
merge master
dsyme Mar 26, 2019
6e7e3c4
us proto build on mac and linux
dsyme Mar 27, 2019
21b46ca
us proto build on mac and linux
dsyme Mar 27, 2019
39ec26a
build right proto on unix
dsyme Mar 27, 2019
4b51197
build right proto on unix
dsyme Mar 27, 2019
8a91110
Merge branch 'proto' into nameof
dsyme Mar 28, 2019
7cc99ca
fix build to really use proto
dsyme Mar 28, 2019
48f30d3
Merge branch 'proto' into nameof
dsyme Mar 28, 2019
c15c030
fix build
dsyme Mar 28, 2019
2715844
Merge branch 'proto' into nameof
dsyme Mar 28, 2019
9d61ee7
update tfms for type providers
dsyme Mar 28, 2019
55c0c2f
Merge branch 'proto' into nameof
dsyme Mar 28, 2019
08d89c7
verbose build
dsyme Mar 28, 2019
dac0ac4
Merge branch 'proto' into nameof
dsyme Mar 28, 2019
a7a132c
Merge branch 'master' of http://github.com/Microsoft/visualfsharp int…
dsyme Mar 28, 2019
088951b
try to fix build
dsyme Mar 28, 2019
9c93ac1
don't rebuild proto
dsyme Mar 28, 2019
ddd0ac7
trim list
dsyme Mar 28, 2019
67717f8
disable proto compiler for fslex/fsyacc
dsyme Mar 28, 2019
2eb1528
fix build
dsyme Mar 28, 2019
713b40f
add buildtools props file instead
dsyme Mar 29, 2019
feebc99
add missing file
dsyme Mar 29, 2019
385c4d9
proto
dsyme Mar 29, 2019
9b4ff93
proto
dsyme Mar 29, 2019
40bb2de
simplify
dsyme Mar 29, 2019
2f96a63
more
dsyme Mar 29, 2019
266d695
more
dsyme Mar 29, 2019
0f3ddeb
more
dsyme Mar 29, 2019
7e7fbf0
proto
dsyme Mar 29, 2019
6b20514
try revert
dsyme Mar 29, 2019
8026ae4
Merge branch 'proto2' into nameof
dsyme Mar 29, 2019
bc129ba
Merge branch 'nameof' of https://github.com/dsyme/visualfsharp into n…
dsyme Mar 29, 2019
28cdc00
proto
dsyme Mar 29, 2019
4447207
try again
dsyme Mar 29, 2019
6563fa3
try again
dsyme Mar 29, 2019
f1056d7
disable node reuse
dsyme Mar 29, 2019
7f37ec8
Merge branch 'proto' into nameof
dsyme Mar 29, 2019
ea11aae
fix tests
dsyme Mar 29, 2019
00b9852
Merge branch 'proto' into nameof
dsyme Mar 29, 2019
3456f48
revert diagnostic
dsyme Mar 29, 2019
a74d30b
Merge branch 'proto' into nameof
dsyme Mar 29, 2019
b3209da
revert some changes
dsyme Mar 29, 2019
57292eb
Merge branch 'proto' of https://github.com/dsyme/visualfsharp into proto
dsyme Mar 29, 2019
4ea4705
revert some changes
dsyme Mar 29, 2019
a2df739
Merge branch 'proto' into nameof
dsyme Mar 29, 2019
023a773
Merge branch 'nameof' of https://github.com/dsyme/visualfsharp into n…
dsyme Mar 29, 2019
4f522a2
try again
dsyme Mar 29, 2019
a26b387
Merge branch 'proto' into nameof
dsyme Mar 29, 2019
233105b
merge proto
dsyme Mar 30, 2019
47179ce
fix merge
dsyme Mar 31, 2019
2ff75be
Merge branch 'master' of http://github.com/Microsoft/visualfsharp int…
dsyme Apr 1, 2019
9ff53eb
Merge remote-tracking branch 'upstream/master' into merges/master-to-…
brettfo Apr 5, 2019
2a6b91e
Merge pull request #6432 from Microsoft/merges/master-to-fsharp5
brettfo Apr 5, 2019
ae385fa
Merge pull request #6435 from Microsoft/merges/dev16.1-to-fsharp5
Apr 5, 2019
d7c0a3b
Merge pull request #6441 from Microsoft/merges/master-to-fsharp5
Apr 6, 2019
6c0507f
Merge pull request #6442 from Microsoft/merges/dev16.1-to-fsharp5
Apr 6, 2019
8f4fdd6
Merge remote-tracking branch 'upstream/master' into merges/master-to-…
brettfo Apr 6, 2019
e056291
Merge pull request #6447 from Microsoft/merges/master-to-fsharp5
Apr 7, 2019
e8d1c41
Merge pull request #6448 from Microsoft/merges/dev16.1-to-fsharp5
Apr 7, 2019
94fd1f2
Merge pull request #6457 from Microsoft/merges/master-to-fsharp5
Apr 8, 2019
52d6ad7
Merge pull request #6462 from Microsoft/merges/master-to-fsharp5
Apr 9, 2019
39a6983
Merge pull request #6461 from Microsoft/merges/dev16.1-to-fsharp5
Apr 9, 2019
760d4a7
Merge pull request #6465 from Microsoft/merges/dev16.1-to-fsharp5
Apr 9, 2019
f1088f9
Merge pull request #6471 from Microsoft/merges/master-to-fsharp5
Apr 10, 2019
4720f33
Merge pull request #6481 from Microsoft/merges/master-to-fsharp5
Apr 10, 2019
e54a28e
Merge pull request #6474 from Microsoft/merges/dev16.1-to-fsharp5
KevinRansom Apr 10, 2019
0a45017
Merge pull request #6490 from Microsoft/merges/master-to-fsharp5
Apr 11, 2019
cba1bdd
Merge pull request #6489 from Microsoft/merges/dev16.1-to-fsharp5
Apr 11, 2019
865b0a5
Merge pull request #6495 from Microsoft/merges/dev16.1-to-fsharp5
KevinRansom Apr 11, 2019
a99cd1c
Merge branch 'fsharp5' into merges/master-to-fsharp5
KevinRansom Apr 12, 2019
b470f58
Merge pull request #6501 from Microsoft/merges/master-to-fsharp5
Apr 12, 2019
25c628e
Merge pull request #6508 from Microsoft/merges/dev16.1-to-fsharp5
Apr 12, 2019
2ce5f48
Merge pull request #6519 from Microsoft/merges/master-to-fsharp5
Apr 13, 2019
36e7e97
Merge pull request #6523 from Microsoft/merges/master-to-fsharp5
Apr 13, 2019
5951c4c
Merge pull request #6522 from Microsoft/merges/dev16.1-to-fsharp5
Apr 13, 2019
8f30102
Merge pull request #6525 from Microsoft/merges/dev16.1-to-fsharp5
Apr 13, 2019
1a26b23
Merge pull request #6530 from Microsoft/merges/master-to-fsharp5
Apr 14, 2019
5464067
Merge pull request #6531 from Microsoft/merges/dev16.1-to-fsharp5
Apr 14, 2019
574b1dc
Merge pull request #6541 from Microsoft/merges/master-to-fsharp5
Apr 15, 2019
96c8ca8
Merge pull request #6545 from Microsoft/merges/dev16.1-to-fsharp5
Apr 15, 2019
06168fd
merge master
dsyme Apr 16, 2019
2b045f5
Merge branch 'proto' into nameof
dsyme Apr 16, 2019
40643c3
Merge branch 'fsharp5' into merges/master-to-fsharp5
KevinRansom Apr 16, 2019
e2c2c25
Merge pull request #6555 from Microsoft/merges/master-to-fsharp5
Apr 16, 2019
59e002e
Merge pull request #6562 from Microsoft/merges/master-to-fsharp5
Apr 17, 2019
2667b77
Merge pull request #6561 from Microsoft/merges/dev16.1-to-fsharp5
Apr 17, 2019
272fd22
Merge pull request #6563 from Microsoft/merges/dev16.1-to-fsharp5
Apr 17, 2019
ce2223c
Merge pull request #6569 from Microsoft/merges/master-to-fsharp5
Apr 18, 2019
d5b413c
Merge pull request #6570 from Microsoft/merges/dev16.1-to-fsharp5
Apr 18, 2019
43e0459
Merge pull request #6575 from Microsoft/merges/master-to-fsharp5
Apr 19, 2019
50552a6
Merge pull request #6579 from Microsoft/merges/dev16.1-to-fsharp5
Apr 19, 2019
efd92ee
Merge pull request #6591 from Microsoft/merges/master-to-fsharp5
Apr 20, 2019
448d48f
Merge pull request #6590 from Microsoft/merges/dev16.1-to-fsharp5
Apr 20, 2019
fa7291e
Merge pull request #6614 from Microsoft/merges/master-to-fsharp5
Apr 23, 2019
d33aa9f
Merge branch 'fsharp5' into merges/master-to-fsharp5
KevinRansom Apr 23, 2019
abb5102
Merge pull request #6616 from Microsoft/merges/master-to-fsharp5
Apr 23, 2019
66bf0eb
Merge pull request #6613 from Microsoft/merges/dev16.1-to-fsharp5
Apr 23, 2019
c4692c4
Merge pull request #6618 from Microsoft/merges/master-to-fsharp5
Apr 23, 2019
529ea44
Merge pull request #6623 from Microsoft/merges/dev16.1-to-fsharp5
Apr 24, 2019
091ce58
Merge pull request #6627 from Microsoft/merges/master-to-fsharp5
Apr 24, 2019
c8e1016
Merge pull request #6633 from Microsoft/merges/master-to-fsharp5
Apr 24, 2019
827ad0d
Merge pull request #6635 from Microsoft/merges/master-to-fsharp5
Apr 26, 2019
f11d353
Merge pull request #6640 from Microsoft/merges/master-to-fsharp5
Apr 26, 2019
888b1e9
Merge pull request #6644 from Microsoft/merges/dev16.2-to-fsharp5
Apr 27, 2019
af8ebb5
Merge branch 'fsharp5' into merges/dev16.2-to-fsharp5
KevinRansom Apr 30, 2019
ef9e6a0
Merge pull request #6653 from Microsoft/merges/dev16.2-to-fsharp5
Apr 30, 2019
1337750
Merge pull request #6655 from Microsoft/merges/dev16.2-to-fsharp5
KevinRansom Apr 30, 2019
db9182f
Merge pull request #6664 from Microsoft/merges/dev16.2-to-fsharp5
May 2, 2019
f8411b2
Merge pull request #6671 from Microsoft/merges/dev16.2-to-fsharp5
May 2, 2019
59c961a
Merge pull request #6674 from Microsoft/merges/dev16.2-to-fsharp5
May 3, 2019
a704aca
Merge pull request #6684 from Microsoft/merges/dev16.2-to-fsharp5
May 4, 2019
dd442dc
Merge pull request #6685 from Microsoft/merges/dev16.2-to-fsharp5
May 4, 2019
42d29ec
Merge pull request #6697 from microsoft/merges/dev16.2-to-fsharp5
May 7, 2019
7543b88
Merge pull request #6698 from microsoft/merges/dev16.2-to-fsharp5
May 7, 2019
482e2f2
Merge pull request #6705 from microsoft/merges/dev16.2-to-fsharp5
May 10, 2019
c35db09
Merge pull request #6709 from microsoft/merges/dev16.2-to-fsharp5
May 13, 2019
86a2ee7
Merge pull request #6716 from microsoft/merges/dev16.2-to-fsharp5
May 13, 2019
42e6c11
Merge pull request #6721 from microsoft/merges/dev16.2-to-fsharp5
May 13, 2019
ed2c0f9
Merge pull request #6724 from microsoft/merges/dev16.2-to-fsharp5
May 14, 2019
071fb02
Merge pull request #6731 from microsoft/merges/dev16.2-to-fsharp5
May 14, 2019
12d9422
Merge pull request #6737 from microsoft/merges/release/dev16.2-to-fsh…
May 15, 2019
c940e66
Merge pull request #6744 from dotnet/merges/release/dev16.2-to-fsharp47
May 16, 2019
829797b
Update VisualFSharp for VS2019.3 (#6735)
KevinRansom May 16, 2019
4ea8b12
Merge pull request #6746 from dotnet/merges/release/dev16.2-to-fsharp47
May 16, 2019
39106a3
Merge pull request #6763 from dotnet/merges/release/dev16.2-to-fsharp47
May 17, 2019
2a950c8
Merge pull request #6766 from dotnet/merges/release/dev16.2-to-fsharp47
May 18, 2019
498ba03
Merge pull request #6775 from dotnet/merges/release/dev16.2-to-fsharp47
May 19, 2019
4ec7e30
merge
KevinRansom May 20, 2019
03ee4ba
Merge branch 'fsharp47' into merges/release/dev16.2-to-fsharp47
brettfo May 21, 2019
da0d7c1
Merge pull request #6793 from dotnet/merges/release/dev16.2-to-fsharp47
brettfo May 21, 2019
6e026da
Merge pull request #6800 from dotnet/merges/release/dev16.2-to-releas…
May 22, 2019
05d9b0f
merge master
dsyme May 22, 2019
ed2f4d6
Merge pull request #6812 from dotnet/merges/release/dev16.2-to-releas…
May 22, 2019
ed457e4
Merge pull request #6827 from dotnet/merges/master-to-feature/nameof
May 23, 2019
c82afaa
Merge pull request #6840 from dotnet/merges/master-to-feature/nameof
May 24, 2019
220d468
Merge pull request #6842 from dotnet/merges/release/dev16.2-to-releas…
May 24, 2019
599b250
Merge pull request #6860 from dotnet/merges/release/dev16.2-to-releas…
May 25, 2019
9d5ad12
Netstandard2 (#6814)
KevinRansom May 25, 2019
c6234d1
Merge pull request #6858 from dotnet/merges/master-to-feature/nameof
May 25, 2019
fedf126
Merge pull request #6868 from dotnet/merges/release/dev16.2-to-releas…
May 26, 2019
363383a
Add --langversion:?|version|latest|preview (#6790)
KevinRansom May 27, 2019
53c2828
[RFC FS-1046] Wildcard self identifier. Allow single underscore in me…
gusty May 27, 2019
d627c64
merge
KevinRansom May 31, 2019
8cceeae
Merge pull request #6887 from dotnet/merges/release/dev16.2-to-releas…
May 31, 2019
cc10438
Merge pull request #6919 from dotnet/merges/release/dev16.2-to-releas…
Jun 2, 2019
22cebb9
Merge branch 'release/fsharp47' into merges/release/dev16.2-to-releas…
brettfo Jun 2, 2019
7784db6
Add missing case for underscore in 'for _ =' (#6867)
gusty Jun 2, 2019
374c788
Merge pull request #6925 from dotnet/merges/release/dev16.2-to-releas…
Jun 2, 2019
dbd55ae
[RFC FS-1070] relax indentations for static members and constructors …
dsyme Jun 3, 2019
896a6e3
code review
dsyme Jun 3, 2019
ebd6350
Merge branch 'feature/nameof' of http://github.com/Microsoft/visualfs…
dsyme Jun 3, 2019
666fc50
Add maxDegreeOfParallelism to Async.Parallel (#6357)
Frassle Jun 3, 2019
1464694
Update surface area
KevinRansom Jun 3, 2019
522fc42
Ensure that Language Version support flows to Parser (#6891)
KevinRansom Jun 3, 2019
4a8685e
Enable LangVersion on 'Add missing case for underscore in for _ featu…
KevinRansom Jun 3, 2019
feeeaf4
Merge remote-tracking branch 'upstream/release/fsharp47' into feature…
KevinRansom Jun 3, 2019
b99db08
fix test
KevinRansom Jun 3, 2019
af9145b
dd langversion support for whitespace indent feature (#6933)
KevinRansom Jun 4, 2019
6e23fd5
update surface area tests
KevinRansom Jun 4, 2019
d6e8fab
revert build
KevinRansom Jun 4, 2019
37b638e
Build proto compiler
KevinRansom Jun 4, 2019
664d124
Merge branch 'release/fsharp47' of http://github.com/Microsoft/visual…
dsyme Jun 4, 2019
40c60ec
Merge pull request #6953 from dotnet/merges/release/dev16.2-to-releas…
Jun 10, 2019
15a5f73
Merge branch 'release/fsharp47' of http://github.com/Microsoft/visual…
dsyme Jun 15, 2019
c5b7cb2
fix merge
dsyme Jun 15, 2019
338267c
fix build
dsyme Jun 15, 2019
a3287ce
merge
KevinRansom Jun 18, 2019
31bbe42
merge
KevinRansom Jun 18, 2019
5200435
tweaks
KevinRansom Jun 18, 2019
fcc9f6e
merge
KevinRansom Jun 18, 2019
13f9eaf
Merge pull request #6985 from dotnet/merges/release/dev16.2-to-releas…
KevinRansom Jun 18, 2019
7c9bfe5
Merge branch 'release/fsharp47' into feature/nameof
KevinRansom Jun 18, 2019
e95cf67
restore
KevinRansom Jun 18, 2019
06cde97
issues
KevinRansom Jun 18, 2019
3d31651
Merge branch 'release/fsharp47' into mergemastertofsharp47
KevinRansom Jun 18, 2019
8c5a58c
Merge pull request #7012 from KevinRansom/mergemastertofsharp47
KevinRansom Jun 18, 2019
50e3d35
Merge pull request #7038 from dotnet/merges/release/dev16.2-to-releas…
Jun 21, 2019
77121fd
Merge branch 'release/fsharp47' into feature/nameof
dsyme Jul 1, 2019
6bdbe9d
Fix fsharp47 (#7091)
KevinRansom Jul 2, 2019
8b66074
Improve diagnostics and disable flakey test (#7113)
KevinRansom Jul 3, 2019
7891cbd
Merge branch 'release/fsharp47' into merges/release/dev16.3-to-releas…
KevinRansom Jul 3, 2019
92e4a52
Merge pull request #6809 from dotnet/feature/nameof
KevinRansom Jul 3, 2019
1b6cf9f
Apparently the unit test dll's don't use fsharptest.directory.props (…
KevinRansom Jul 3, 2019
383d316
versioning tests
KevinRansom Jul 3, 2019
b26941b
Merge pull request #7105 from dotnet/merges/release/dev16.3-to-releas…
Jul 4, 2019
98e4893
Add langversion support for nameof
KevinRansom Jul 4, 2019
267a971
fsi, correct error messages
KevinRansom Jul 4, 2019
681d9d5
Use --langversion:preview for conformance tests
KevinRansom Jul 4, 2019
2d8eb0e
fix matching mistake
dsyme Jul 4, 2019
26342bc
Update NameResolution.fs
dsyme Jul 4, 2019
a7a66e3
Merge pull request #7125 from KevinRansom/langversion-nameof
KevinRansom Jul 4, 2019
cfb414f
[RFC FS-1069] Implicit yields (allow dropping yield in list, array, s…
dsyme Jul 4, 2019
1524916
Merge branch 'release/fsharp47' into merges/release/dev16.3-to-releas…
KevinRansom Jul 5, 2019
dc19afe
Merge pull request #7137 from dotnet/merges/release/dev16.3-to-releas…
Jul 5, 2019
2c95ddd
Merge pull request #7148 from dotnet/merges/release/dev16.3-to-releas…
KevinRansom Jul 6, 2019
5a91e91
Merge pull request #7154 from dotnet/merges/release/dev16.3-to-releas…
Jul 9, 2019
274c9a0
[RFC FS-1068] open static classes (#6807)
dsyme Jul 9, 2019
017d5cf
Merge pull request #7173 from dotnet/merges/release/dev16.3-to-releas…
KevinRansom Jul 10, 2019
bc4edc6
Merge branch 'release/fsharp47' into merges/release/dev16.3-to-releas…
TIHan Jul 10, 2019
658caa2
Merge pull request #7183 from dotnet/merges/release/dev16.3-to-releas…
brettfo Jul 10, 2019
1bc2896
Implement Langversion switch for implicit yields (#7166)
KevinRansom Jul 11, 2019
928d050
Merge branch 'release/fsharp47' into merges/release/dev16.3-to-releas…
KevinRansom Jul 11, 2019
b6f0be9
Merge pull request #7192 from dotnet/merges/release/dev16.3-to-releas…
Jul 11, 2019
742449a
Implement langversion switch for openstaticclasses (#7195)
KevinRansom Jul 12, 2019
f5f7f0f
Enable 4.7 by default (#7204)
KevinRansom Jul 12, 2019
b7d5efd
Merge branch 'release/dev16.3' into merges/release/fsharp47-to-releas…
KevinRansom Jul 13, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
…to nameof
  • Loading branch information
dsyme committed Mar 21, 2019
commit bf4b33638b72ea049267b79863066b520a551f5c
2 changes: 2 additions & 0 deletions tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj
Original file line number Diff line number Diff line change
@@ -96,6 +96,8 @@

<ItemGroup Condition="'$(BUILD_IN_FSHARP_REPOSITORY)' != 'true'">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" PrivateAssets="All" />
<PackageReference Include="FSharp.Core" Version="4.6.0" />
<PackageReference Include="FsCheck" Version="3.0.0-alpha4" />
</ItemGroup>

<ItemGroup Condition="'$(UnitTestType)' == 'xunit'">
You are viewing a condensed version of this merge commit. You can view the full changes here.