Skip to content

Fsharp 3.1 changes #7

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

Closed
wants to merge 56 commits into from
Closed

Fsharp 3.1 changes #7

wants to merge 56 commits into from

Conversation

7sharp9
Copy link
Member

@7sharp9 7sharp9 commented Dec 5, 2013

The last commit shown #20f6437 is the full list of changes to be re-applied to F# 3.1

No matter which way Ive tried to do the merge the history is brutalised. Maybe someone else could merge this over, I seem to keep making it a mess.

dsyme and others added 30 commits October 3, 2013 09:34
…harppowerpack.codeplex.com up to change 71609, including changes for VS2012 Update 2 - Portable Async and Query fixes
On linux / unix based systems, control-D inserts an EOF which should be
read as quitting.
…ecked out into a folder whose name contains one or more spaces.
Fixed build.bat so it works correctly under paths containing a space
@7sharp9
Copy link
Member Author

7sharp9 commented Dec 5, 2013

I have a few more changes to add to this...

@ghost
Copy link

ghost commented Dec 5, 2013

This commit history looks right. We expect this PR to be all the commits listed here: https://github.com/fsharp/fsharp/compare/fsharp_31

We expect it to be large - logically speaking it should be all the commits that make up F# 3.1

Are you up-to-date with the repo? It says it can't be automatically merged. But maybe that's because you're pushing a branch.

thanks
don

@7sharp9
Copy link
Member Author

7sharp9 commented Dec 5, 2013

I don't think its because theres a branch(except this is a cross repo merge), just a merge conflict somewhere. Ill check its up to date when I push my final changes in and fix the conflict.

@7sharp9 7sharp9 closed this Dec 17, 2013
@7sharp9 7sharp9 deleted the fsharp_31 branch December 17, 2013 08:25
@7sharp9 7sharp9 restored the fsharp_31 branch December 17, 2013 08:27
dsyme added a commit to dsyme/FSharp.Compiler.Service that referenced this pull request Sep 28, 2016
baronfel pushed a commit to baronfel/FSharp.Compiler.Service that referenced this pull request Jan 16, 2020
…8063)

* # This is a combination of 9 commits.
# This is the 1st commit message:

ref -> mutable in more places in the compiler

# The commit message fsharp#2 will be skipped:

# Update dependencies from https://github.com/dotnet/arcade build 20191229.1
#
# - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19629.1

# The commit message fsharp#3 will be skipped:

# Update dependencies from https://github.com/dotnet/arcade build 20191230.1
#
# - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19630.1

# The commit message fsharp#4 will be skipped:

# Update dependencies from https://github.com/dotnet/arcade build 20191231.1
#
# - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19631.1

# The commit message fsharp#5 will be skipped:

# Update dependencies from https://github.com/dotnet/arcade build 20200101.1
#
# - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20051.1

# The commit message fsharp#6 will be skipped:

# Update dependencies from https://github.com/dotnet/arcade build 20191216.5 (#8079)
#
# - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19616.5

# The commit message fsharp#7 will be skipped:

# dispose fsi at the end of a scripting session (#8084)
#

# The commit message fsharp#8 will be skipped:

# Added static link tests and extended CompilerAssert (#8101)
#
# * Changed CompilerAssert to static class. Added Compile/Execute methods that take a Compilation description. Added static link tests
# 
# * Hiding compilation description internals
# 
# * Added another test to check for sanity
# 
# * Making a few optional parameters
# 
# * Hiding internals of CompilationReference

# The commit message fsharp#9 will be skipped:

# Parameterize product version (#8031)
#
# * Parameterize Product details
# 
# * fcs
# 
# * Repack pkgdef

* no ilread
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants