Skip to content

Integrate Microsoft/visualfsharp and fsharp/fsharp master --> master #557

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

Jump to bottom
Merged
dsyme merged 411 commits into from
Apr 19, 2016
Merged

Integrate Microsoft/visualfsharp and fsharp/fsharp master --> master #557

dsyme merged 411 commits into from
Apr 19, 2016

Conversation

@dsyme
Copy link
Contributor

@dsyme dsyme commented Apr 19, 2016

No description provided.

KevinRansom and others added 30 commits December 22, 2015 11:04
@KevinRansom
Remove the requirement to specify the win32 mainifest on the command …
948727f 
…line.

fixes fsharp#825
@KevinRansom
Remove requirement for extension to match target specification.
4a5cb7e
@KevinRansom
Fix failing test : fsharp\core\load-script
96fb2af
@KevinRansom
Fix failing test : fsharp\core\load-script
5280e42
@KevinRansom
feedback
0addb56
@KevinRansom
Merge pull request fsharp#829 from KevinRansom/coreclr
0b36c6d 
Fix some coreclr FSC bugs and fsharp\core\load-script test case
@iainnicol
Fix duplicate key in a project.json
0a20f2a 
The duplicate key was preventing the "dotnet restore" command
succeeding.
@KevinRansom
Rework how compiler finds fsharp core --- Fixes: error FS0193: intern…
903d2b7 
…al error: Exception of type 'System.Collections.Generic.KeyNotFoundException' was thrown.
@KevinRansom
Enable offline build, by not restoring packages when restorepackages=…
2b15cfb 
…false
@KevinRansom
Merge branch 'coreclr' of https://github.com/KevinRansom/visualfsharp …
de4d4f1 
…into coreclr
@KevinRansom
Merge branch 'coreclr' of https://github.com/KevinRansom/visualfsharp …
c59987f 
…into coreclr
@KevinRansom
Merge pull request fsharp#849 from KevinRansom/coreclr
63fd419 
Rework how compiler finds fsharp core --- Fixes: error FS0193: intern…
@KevinRansom
Merge branch 'coreclr' of https://github.com/Microsoft/visualfsharp i…
49a11bc 
…nto coreclr
@KevinRansom
Build proto-compiler using coreclr based LKG
61f4c12
@KevinRansom
Merge pull request fsharp#850 from KevinRansom/coreclr
4e596ae 
Build proto-compiler using coreclr based LKG
@KevinRansom
Add rebuild targets to netcore. They just do the same as build
ae595be
@KevinRansom
Code signing
03b369a
@KevinRansom
Update nuget.exe
de21cad 
Conflicts:
	.nuget/NuGet.exe
@KevinRansom
Merge branch 'coreclr' of https://github.com/Microsoft/visualfsharp i…
96d314f 
…nto coreclr
@KevinRansom
Update nuget
fc6a31c
@KevinRansom
Fix build to cope with the loss of the myget/netcorefx feed
f8854b1
@KevinRansom
Initial signing
f647eb9
@KevinRansom
full signing for coreclr
b455c6e
@KevinRansom
Tests work for full/delay signed for 128/256/512/1024 bit keys comman…
d2693ef 
…d line options and attributes
@KevinRansom
Localise signing strings
4eb275b
@KevinRansom
implement public sign, update signing tests
35f9ab6
@KevinRansom
Implement public sign and update tests
c7e9727
@KevinRansom
Merge --
f25febd
@KevinRansom
Forgot the publicsign baseline
0b52cc7
@KevinRansom
Merge pull request fsharp#880 from KevinRansom/coreclr
ad7edd8 
Implement Strong Name signing and public sign on coreclr build of FSC.
KevinRansom and others added 27 commits April 13, 2016 11:52
@KevinRansom
Merge pull request fsharp#705 from dsyme/fix-640
fb04f30 
Fix 640, 642 - parameter intellisense for static parameters to methods
@KevinRansom
Merge branch 'remove-tps' of https://github.com/dsyme/visualfsharp in…
4edb0f5 
…to dsyme-remove-tps
@KevinRansom
Merge branch 'dsyme-remove-tps'
8088283
@KevinRansom
Revert "Merge branch 'remove-tps' of https://github.com/dsyme/visualf…
5e859fa 
…sharp into dsyme-remove-tps"

This reverts commit 4edb0f5, reversing
changes made to fb04f30.
@dsyme
Update il.fsi
af1b740
@dsyme
Reapply remove-tps
d4c0019
@dsyme
(no change) Nudge master branch build
1b80f4e
@dsyme
fix build
8bec8c5
@dsyme
update DEVGUID
05b273a
@dsyme
build proto on ci (happens anyway but makes it happen again on local …
9a10f8b 
…runs)
@dsyme
fix build
80945bf
@dsyme
fail build properly
d5b971d
@dsyme
fix build
d6b738f
@dsyme
Merge pull request #1073 from dsyme/revert-revert
ee6ce3f 
Reapply removal of type provider
@dsyme
integrate visualfsharp\master
1435171
@dsyme
integrate visualfsharp\master (missing file)
8442f88
@dsyme
simplify fsharp.sln
e66d461
@dsyme
fix references
8673890
@dsyme
fix references (2)
65496d9
@dsyme
fix references
61e785c
@dsyme
fix references
90e5e33
@dsyme
Merge pull request fsharp#567 from dsyme/integrate-7
25890f7 
Integrate visualfsharp/master --> fsharp/master
@dsyme
integrate Microsoft\visualfsharp master
8da322e
@dsyme
integrate Microsoft\visualfsharp master (2)
92c0e27
@dsyme
remove 4.0 due to dependencies
8dd4700
@dsyme
update release notes
89f5d1c
@dsyme
remove #if SIVLERLIGHT
f88a219
@dsyme dsyme merged commit e3a3266 into fsharp:master Apr 19, 2016
@dsyme dsyme mentioned this pull request Apr 19, 2016
Merged
dsyme pushed a commit to dsyme/FSharp.Compiler.Service that referenced this pull request Feb 9, 2017
@kurtschelfthout @KevinRansom
Fix fsharp#557 - public type implements an internal interface that us…
cd501e1 
…es an internal type (#1920)

* Try to fix fsharp#557.

* Expand test and move to better place.

* Small tweak so test name shows up.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@dsyme @KevinRansom @iainnicol @radekm @enricosada @AviAvni @rexcfnghk