Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
158 commits
Select commit Hold shift + click to select a range
b3f424f
Merge pull request #4527 from Microsoft/merges/master-to-dev15.8
brettfo Mar 15, 2018
484d2b5
Merge pull request #4525 from Microsoft/merges/dev15.7-to-dev15.8
brettfo Mar 15, 2018
ae9e48f
always emit the local scope's start offset (#4531)
dotnet-bot Mar 15, 2018
dbdd73a
Merge dev15.7 to dev15.8 (#4529)
dotnet-bot Mar 15, 2018
8b52c97
Code Lens and Line Lens (#3608)
realvictorprm Mar 15, 2018
62d4cf0
remove comment (#4538)
KevinRansom Mar 15, 2018
48076b1
Tweaks
Mar 15, 2018
b4174d8
Merge pull request #4542 from Microsoft/merges/dev15.7-to-dev15.8
brettfo Mar 15, 2018
16dfc2b
Merge remote-tracking branch 'upstream/master' into merges/master-to-…
brettfo Mar 15, 2018
22cc586
Merge pull request #4544 from Microsoft/merges/master-to-dev15.8
brettfo Mar 16, 2018
67ee3f0
Merge pull request #4553 from Microsoft/merges/dev15.7-to-dev15.8
brettfo Mar 16, 2018
f296ff4
Merge pull request #4557 from Microsoft/merges/dev15.7-to-dev15.8
KevinRansom Mar 16, 2018
afc1c6c
Merge pull request #4559 from Microsoft/merges/master-to-dev15.8
brettfo Mar 16, 2018
872812e
Merge pull request #4566 from Microsoft/merges/master-to-dev15.8
brettfo Mar 16, 2018
c06ea5f
Merge pull request #4564 from Microsoft/merges/dev15.7-to-dev15.8
brettfo Mar 16, 2018
79db650
Merge pull request #4567 from Microsoft/merges/dev15.7-to-dev15.8
KevinRansom Mar 17, 2018
4c58616
Merge pull request #4573 from Microsoft/merges/master-to-dev15.8
KevinRansom Mar 19, 2018
b20875f
Merge pull request #4584 from Microsoft/merges/master-to-dev15.8
KevinRansom Mar 20, 2018
401ec08
Merge pull request #4582 from Microsoft/merges/dev15.7-to-dev15.8
KevinRansom Mar 20, 2018
29e8ab9
Merge pull request #4587 from Microsoft/merges/dev15.7-to-dev15.8
KevinRansom Mar 20, 2018
1214430
Merge pull request #4598 from Microsoft/merges/dev15.7-to-dev15.8
KevinRansom Mar 22, 2018
a933b46
Merge remote-tracking branch 'upstream/master' into merges/master-to-…
brettfo Mar 23, 2018
09648d4
Merge pull request #4616 from Microsoft/merges/master-to-dev15.8
brettfo Mar 23, 2018
7b3ab8e
Merge pull request #4614 from Microsoft/merges/dev15.7-to-dev15.8
brettfo Mar 23, 2018
a3b824f
Merge pull request #4619 from Microsoft/merges/dev15.7-to-dev15.8
KevinRansom Mar 24, 2018
fda2031
Merge pull request #4623 from Microsoft/merges/master-to-dev15.8
KevinRansom Mar 26, 2018
02c1b7f
Merge pull request #4636 from Microsoft/merges/master-to-dev15.8
KevinRansom Mar 28, 2018
54d0c92
Merge pull request #4635 from Microsoft/merges/dev15.7-to-dev15.8
KevinRansom Mar 28, 2018
2d27b24
Merge pull request #4641 from Microsoft/merges/master-to-dev15.8
KevinRansom Mar 29, 2018
2436c68
Merge pull request #4648 from Microsoft/merges/master-to-dev15.8
KevinRansom Mar 30, 2018
453df4d
Update AssemblyVersions.props (#4647)
genlu Mar 30, 2018
4537cbe
Merge branch 'dev15.8' into merges/master-to-dev15.8
TIHan Apr 2, 2018
5096e69
Merge pull request #4652 from Microsoft/merges/master-to-dev15.8
brettfo Apr 3, 2018
e78a193
Merge branch 'dev15.8' into merges/dev15.7-to-dev15.8
brettfo Apr 3, 2018
c49b076
Merge pull request #4668 from Microsoft/merges/dev15.7-to-dev15.8
brettfo Apr 3, 2018
224435b
Merge pull request #4669 from Microsoft/merges/master-to-dev15.8
brettfo Apr 3, 2018
230ec51
Merge branch 'dev15.8' into merges/master-to-dev15.8
KevinRansom Apr 4, 2018
e545636
Merge pull request #4676 from Microsoft/merges/master-to-dev15.8
brettfo Apr 4, 2018
203d4b3
Merge branch 'dev15.8' into merges/master-to-dev15.8
KevinRansom Apr 5, 2018
42c06b8
Merge pull request #4686 from Microsoft/merges/dev15.7-to-dev15.8
brettfo Apr 5, 2018
a3e5bb5
Merge pull request #4687 from Microsoft/merges/master-to-dev15.8
brettfo Apr 5, 2018
6107ba5
Merge pull request #4692 from Microsoft/merges/master-to-dev15.8
brettfo Apr 6, 2018
c000d1c
Merge pull request #4703 from Microsoft/merges/master-to-dev15.8
brettfo Apr 9, 2018
b2a4c3d
Merge pull request #4709 from Microsoft/merges/master-to-dev15.8
brettfo Apr 10, 2018
5028724
Merge pull request #4711 from Microsoft/merges/master-to-dev15.8
brettfo Apr 11, 2018
9e5e058
Reduced allocation by reading from a stream into an array for ILResou…
dotnet-bot Apr 14, 2018
da5a6ec
Merge pull request #4728 from Microsoft/merges/master-to-dev15.8
brettfo Apr 16, 2018
81c4144
Merge pull request #4730 from Microsoft/merges/master-to-dev15.8
brettfo Apr 17, 2018
3d37608
Merge pull request #4738 from Microsoft/merges/master-to-dev15.8
brettfo Apr 18, 2018
e3ac1d1
Merge pull request #4737 from Microsoft/merges/dev15.7-to-dev15.8
brettfo Apr 18, 2018
5c2e85e
Sign nupkgs (#4748)
dotnet-bot Apr 19, 2018
2544d91
Merge master to dev15.8 (#4749)
dotnet-bot Apr 20, 2018
74710b9
Merge branch 'dev15.8' into merges/master-to-dev15.8
brettfo Apr 20, 2018
506c338
Merge pull request #4767 from Microsoft/merges/master-to-dev15.8
KevinRansom Apr 22, 2018
f29e04a
Merge pull request #4766 from Microsoft/merges/dev15.7-to-dev15.8
KevinRansom Apr 22, 2018
facec98
Merge pull request #4773 from Microsoft/merges/master-to-dev15.8
KevinRansom Apr 23, 2018
3ebae03
Merge pull request #4779 from Microsoft/merges/master-to-dev15.8
KevinRansom Apr 24, 2018
5f1aa02
Merge pull request #4778 from Microsoft/merges/dev15.7-to-dev15.8
KevinRansom Apr 24, 2018
4c270d8
Merge pull request #4781 from Microsoft/merges/dev15.7-to-dev15.8
KevinRansom Apr 24, 2018
c02602a
Merge pull request #4786 from Microsoft/merges/master-to-dev15.8
brettfo Apr 25, 2018
33db3a6
Merge pull request #4785 from Microsoft/merges/dev15.7-to-dev15.8
brettfo Apr 25, 2018
566875c
Merge pull request #4803 from Microsoft/merges/master-to-dev15.8
brettfo Apr 30, 2018
3adf79c
Merge pull request #4805 from Microsoft/merges/master-to-dev15.8
KevinRansom May 1, 2018
e518b1f
Merge pull request #4814 from Microsoft/merges/master-to-dev15.8
KevinRansom May 2, 2018
c5d5871
Merge pull request #4823 from Microsoft/merges/master-to-dev15.8
KevinRansom May 4, 2018
494da13
Merge pull request #4824 from Microsoft/merges/master-to-dev15.8
brettfo May 4, 2018
1fd3deb
Merge pull request #4833 from Microsoft/merges/master-to-dev15.8
KevinRansom May 5, 2018
9aaacca
Merge branch 'dev15.8' into merges/master-to-dev15.8
brettfo May 7, 2018
e758b84
Merge pull request #4844 from Microsoft/merges/master-to-dev15.8
brettfo May 7, 2018
92f6ea0
Merge pull request #4852 from Microsoft/merges/master-to-dev15.8
KevinRansom May 8, 2018
2bd48e8
Fix #3737 - allow inheriting from FSharpFunc (#4804) (#4853)
dotnet-bot May 8, 2018
a885744
Merge pull request #4863 from Microsoft/merges/master-to-dev15.8
brettfo May 9, 2018
ef509f6
Merge pull request #4871 from Microsoft/merges/master-to-dev15.8
KevinRansom May 10, 2018
da95fad
Merge branch 'dev15.8' into merges/dev15.7-to-dev15.8
KevinRansom May 10, 2018
1a4f321
Merge pull request #4870 from Microsoft/merges/dev15.7-to-dev15.8
brettfo May 11, 2018
01ed8fb
Merge branch 'dev15.8' into merges/master-to-dev15.8
brettfo May 11, 2018
d7abe5a
Merge pull request #4879 from Microsoft/merges/master-to-dev15.8
brettfo May 11, 2018
02ebcfb
Merge pull request #4886 from Microsoft/merges/master-to-dev15.8
brettfo May 12, 2018
aaa7dab
Merge pull request #4901 from Microsoft/merges/master-to-dev15.8
brettfo May 14, 2018
521e0a6
ensure primitive types are defined before auto-generated resources th…
brettfo May 14, 2018
d3f0242
Merge pull request #4902 from brettfo/compile-before
brettfo May 14, 2018
c30b3f5
Removed updating project info on document open and document changed
TIHan May 14, 2018
8d5b703
Merge pull request #4909 from Microsoft/merges/dev15.7-to-dev15.8
KevinRansom May 15, 2018
1373911
Merge pull request #4910 from Microsoft/merges/master-to-dev15.8
KevinRansom May 15, 2018
fc52b39
Merge pull request #4916 from Microsoft/merges/master-to-dev15.8
KevinRansom May 16, 2018
2527e68
Merge pull request #4905 from TIHan/perf-fixes1-dev15.7
brettfo May 16, 2018
a4d7236
Merge pull request #4921 from Microsoft/merges/master-to-dev15.8
KevinRansom May 16, 2018
c22ae78
Merge branch 'dev15.8' into merges/dev15.7-to-dev15.8
KevinRansom May 16, 2018
8c1d0cf
Merge pull request #4925 from Microsoft/merges/master-to-dev15.8
KevinRansom May 16, 2018
8fa80e5
Merge branch 'dev15.8' into merges/master-to-dev15.8
KevinRansom May 17, 2018
03e17d2
Merge pull request #4923 from Microsoft/merges/dev15.7-to-dev15.8
KevinRansom May 17, 2018
45fca99
Merge pull request #4926 from Microsoft/merges/master-to-dev15.8
KevinRansom May 17, 2018
153e7d7
Merge pull request #4931 from Microsoft/merges/master-to-dev15.8
brettfo May 17, 2018
eee5395
Merge pull request #4935 from Microsoft/merges/master-to-dev15.8
brettfo May 17, 2018
bd69791
re-add attribute that got lost in a merge somewhere
brettfo May 17, 2018
2abca84
Merge pull request #4941 from brettfo/advanced-property-page
brettfo May 18, 2018
091f440
Merge pull request #4942 from Microsoft/merges/master-to-dev15.8
KevinRansom May 18, 2018
fbcac60
Merge pull request #4945 from Microsoft/merges/master-to-dev15.8
KevinRansom May 18, 2018
fd6105d
Merge pull request #4951 from Microsoft/merges/master-to-dev15.8
KevinRansom May 19, 2018
fa1cd8a
[15.8] Enable the codelens settings (#4950)
cartermp May 21, 2018
03724f9
Removing what looks like code to help debugging, but caused out of in…
TIHan May 21, 2018
845d093
Merge pull request #4963 from Microsoft/merges/master-to-dev15.8
KevinRansom May 21, 2018
a0e4d15
Merge pull request #4962 from Microsoft/merges/dev15.7-to-dev15.8
KevinRansom May 21, 2018
582df28
Merge pull request #4964 from Microsoft/merges/master-to-dev15.8
KevinRansom May 22, 2018
19d5e37
Merge pull request #4976 from Microsoft/merges/master-to-dev15.8
KevinRansom May 23, 2018
a2c979c
Merge pull request #4979 from Microsoft/merges/master-to-dev15.8
KevinRansom May 23, 2018
c9c10e1
No need to setify fully (#4975) (#4987)
dotnet-bot May 23, 2018
16c39aa
Merge pull request #4989 from Microsoft/merges/master-to-dev15.8
KevinRansom May 24, 2018
e41bd4c
Merge pull request #4994 from Microsoft/merges/master-to-dev15.8
brettfo May 24, 2018
a1f4569
Rev Dev15.8 to build F# 4.5, FSharp.Core 4.5.0.0 (#4988)
KevinRansom May 24, 2018
28e0bf5
Switch legacy project System Templates to use nuget. (#4977)
KevinRansom May 24, 2018
bbe06d5
[RFCs FS-1037, FS-1055] allow flexible inference (subsumption) at uni…
dsyme May 24, 2018
c574e8f
[RFC FS-1050] TryGetValue on map (#4827)
dsyme May 24, 2018
78d48f6
Merge master to dev15.8 (#4997)
dotnet-bot May 24, 2018
b3aa270
add resource for option page name
brettfo May 24, 2018
6aa459f
Merge pull request #4999 from brettfo/code-lens-option-page
brettfo May 24, 2018
fce9e68
Merge pull request #4998 from Microsoft/merges/master-to-dev15.8
KevinRansom May 25, 2018
6a73326
[FS-1045] Add FuncConvert.FromFunc, FuncConvert.FromAction APIs (#4815)
dsyme May 25, 2018
613b810
Merge pull request #5000 from Microsoft/merges/master-to-dev15.8
KevinRansom May 25, 2018
0e175fa
exclude NuGet package from VSIX signing requirements
brettfo May 25, 2018
472acee
Merge pull request #5004 from Microsoft/merges/master-to-dev15.8
KevinRansom May 25, 2018
54cbfd5
Merge remote-tracking branch 'upstream/master' into merges/master-to-…
brettfo May 25, 2018
1d06b53
Merge pull request #5008 from brettfo/package-signing
brettfo May 25, 2018
4c4073a
Merge pull request #5011 from Microsoft/merges/master-to-dev15.8
brettfo May 25, 2018
da9aa07
Merge pull request #5012 from Microsoft/merges/master-to-dev15.8
KevinRansom May 26, 2018
cbb350f
Merge pull request #5013 from Microsoft/merges/master-to-dev15.8
KevinRansom May 26, 2018
d4647f9
Fix 4790 - exception message on dynamic invocation (#4806)
dsyme May 29, 2018
03a0f3c
Fix annotation view (#4938)
cartermp May 18, 2018
6a9a072
Merge pull request #5029 from Microsoft/merges/master-to-dev15.8
KevinRansom May 29, 2018
af95593
Merge pull request #5035 from Microsoft/merges/master-to-dev15.8
KevinRansom May 30, 2018
5cac4f6
[RFCs FS-1037] allow flexible inference (subsumption) at union constr…
dsyme May 30, 2018
93332df
Merge pull request #5042 from Microsoft/merges/master-to-dev15.8
KevinRansom May 30, 2018
44b710a
Merge pull request #5045 from Microsoft/merges/master-to-dev15.8
KevinRansom May 30, 2018
ba69f75
Merge pull request #5046 from Microsoft/merges/master-to-dev15.8
KevinRansom May 31, 2018
14bd56b
Merge pull request #5055 from Microsoft/merges/master-to-dev15.8
brettfo May 31, 2018
636f305
Merge pull request #5056 from Microsoft/merges/master-to-dev15.8
brettfo May 31, 2018
9d2beb7
Merge pull request #5059 from Microsoft/merges/master-to-dev15.8
KevinRansom Jun 1, 2018
f82caaa
Merge pull request #5063 from Microsoft/merges/master-to-dev15.8
KevinRansom Jun 1, 2018
953c3c6
Merge pull request #5064 from Microsoft/merges/master-to-dev15.8
KevinRansom Jun 1, 2018
9ecbccc
Merge pull request #5070 from Microsoft/merges/master-to-dev15.8
KevinRansom Jun 2, 2018
b54527d
Merge branch 'dev15.8' into merges/master-to-dev15.8
KevinRansom Jun 2, 2018
db91d1a
Merge pull request #5071 from Microsoft/merges/master-to-dev15.8
KevinRansom Jun 2, 2018
db233f1
Merge commit 'eb17f65606a1997634835c061a6314bb7bb99a3d' into merges/m…
brettfo Jun 4, 2018
fb7f380
Merge pull request #5078 from Microsoft/merges/master-to-dev15.8
brettfo Jun 4, 2018
1c56fef
Merge pull request #5031 from brettfo/fix-annotation
brettfo Jun 4, 2018
f1c9a98
Merge master to dev15.8 (#5087)
dotnet-bot Jun 5, 2018
39fce71
Fix TypeProviders with managed resources (#5036)
KevinRansom May 31, 2018
b481145
Unsafe LoadFrom (#5038)
KevinRansom May 30, 2018
071ff0a
Merge branch 'dev15.8' into merges/master-to-dev15.8
dsyme Jun 5, 2018
6fb952b
Fix annotation view (#4938) (#5088)
dotnet-bot Jun 5, 2018
173513e
Merge pull request #5098 from brettfo/type-provider-15.7
brettfo Jun 5, 2018
3f37b4a
Merge pull request #5095 from Microsoft/merges/master-to-dev15.8
brettfo Jun 5, 2018
2f362bd
Merge pull request #5100 from Microsoft/merges/dev15.7-to-dev15.8
brettfo Jun 5, 2018
82b526f
Merge branch 'dev15.8' into merges/master-to-dev15.8
dsyme Jun 5, 2018
cd20870
Merge pull request #5101 from Microsoft/merges/master-to-dev15.8
brettfo Jun 5, 2018
8e9b551
Merge pull request #5104 from Microsoft/merges/master-to-dev15.8
brettfo Jun 5, 2018
d7cd5ab
Merge pull request #5105 from Microsoft/merges/master-to-dev15.8
brettfo Jun 6, 2018
ac667ab
Merge pull request #5108 from Microsoft/merges/master-to-dev15.8
KevinRansom Jun 6, 2018
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
Merge pull request #5105 from Microsoft/merges/master-to-dev15.8
Merge master to dev15.8
  • Loading branch information
brettfo authored Jun 6, 2018
commit d7cd5abf3b468868b36eb0419e4a190e2a7f2495

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.