Skip to content

Merge master to dev16.1 #6262

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.

Sign up for GitHub

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

Merged
14 commits merged into from
Feb 25, 2019
Merged

Merge master to dev16.1 #6262

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ec04e47
Additional comments and testing related to SRTP resolution (#3967)
dsyme Feb 20, 2019
a26d32a
Suggested namespace rename (#6248)
dsyme Feb 20, 2019
2cb27a9
Fixed minor typo in FSComp.txt
ncave Feb 20, 2019
ee70a43
Fix help text test for FSI (#6254)
dsyme Feb 20, 2019
9dfec82
Update Xlf
KevinRansom Feb 20, 2019
138f2b0
Update DEVGUIDE to mention net472 (#6242)
cartermp Feb 20, 2019
cd2b304
Merge pull request #6261 from KevinRansom/ncave-master
KevinRansom Feb 21, 2019
78c7b17
reformat some huge lines (#6249)
dsyme Feb 21, 2019
b0292b8
Anonymous record support for expressions in FCS (#6257)
dsyme Feb 21, 2019
bead034
Tests for coreclr (#6151)
KevinRansom Feb 21, 2019
2b43500
Make vsideunittests work on Dev16.0 (#6270)
KevinRansom Feb 22, 2019
6346800
Avoid multiple dotnet cli downloads (#6272)
KevinRansom Feb 22, 2019
2c8497b
Remove System.Data.SqlClient (#6274)
KevinRansom Feb 22, 2019
8a3cc20
Merge remote-tracking branch 'upstream/master' into merges/master-to-…
brettfo Feb 25, 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
Update DEVGUIDE to mention net472 (#6242) 
As per #6226 this is required
  • Loading branch information
@cartermp @KevinRansom
cartermp authored and KevinRansom committed Feb 20, 2019
commit 138f2b0807d64a543cab6d34fff2f170a7fbf8be
2 changes: 1 addition & 1 deletion DEVGUIDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Follow the instructions below to build and develop the F# Compiler, Core Library

Install

- [.NET 4.6](https://www.microsoft.com/en-gb/download/details.aspx?id=48130)
- [.NET Framework 4.7.2](https://dotnet.microsoft.com/download/dotnet-framework/net472)

**NOTE on Windows:**

Expand Down