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

Update fslex/yacc/srgen #1673

Merged
merged 5 commits into from
Oct 28, 2016
Merged

Update fslex/yacc/srgen #1673

merged 5 commits into from
Oct 28, 2016

Conversation

dsyme
Copy link
Contributor

@dsyme dsyme commented Oct 27, 2016

This updates fslex/fsyacc/fssrgen to the latest nuget packages, rather than the ancient LKG tools.

The reason for this is to align with the packages used by FSharp.Compiler.Service, which builds both Mono and .NET Core versions on Linux

That gets us closer to allowing .NET Core and cross-platform builds with these tools.

@dsyme dsyme changed the title [WIP] update fslex/yacc/srgen Update fslex/yacc/srgen Oct 28, 2016
@dsyme
Copy link
Contributor Author

dsyme commented Oct 28, 2016

Well, I believe this is ready for merging. It eliminates the LKG tools in favour of the current nuget packages for these various tools. That gets us closer to allowing .NET Core and cross-platform builds with these tools.

@@ -181,6 +181,9 @@
<DefineConstants>$(DefineConstants);TODO_REWORK_SERVER</DefineConstants>
<DefineConstants>$(DefineConstants);NO_LOADER_OPTIMIZATION</DefineConstants>
<DefineConstants>$(DefineConstants);SILVERLIGHT_COMPILER_FSHARP_CORE</DefineConstants>
<DefineConstants>$(DefineConstants);NETSTANDARD1_5</DefineConstants>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dsyme , we weren't going to add features based on platform except for the existing ones net40 net45 etc, are you sure you want to bake this into the compiler source?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We just need one of these defines since the code generated by FsSrGen for .NET Core uses #if NETSTANDARD1_5 || NETSTANDARD1_6 || ...

@KevinRansom
Copy link
Member

Sounds good ... although a bit weird ....

@KevinRansom KevinRansom merged commit f1504d9 into dotnet:master Oct 28, 2016
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.

3 participants