-
Notifications
You must be signed in to change notification settings - Fork 230
[release/10.0.2xx] Source code updates from dotnet/fsharp #3039
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
[release/10.0.2xx] Source code updates from dotnet/fsharp #3039
Conversation
Diff: https://github.com/dotnet/fsharp/compare/e0100aca936e20561f359b2c81df5c4f75f385f6..59dae45f521425625174dfcb5a429b23247f7a10 From: dotnet/fsharp@e0100ac To: dotnet/fsharp@59dae45 [[ commit created by automation ]]
…8f9a-61564444cfb3
Diff: https://github.com/dotnet/fsharp/compare/59dae45f521425625174dfcb5a429b23247f7a10..0677d6096c132a5210e694ebaedd180c72ed6d70 From: dotnet/fsharp@59dae45 To: dotnet/fsharp@0677d60 [[ commit created by automation ]]
…8f9a-61564444cfb3
…10.0.2xx-27990d9d-40e6-439b-8f9a-61564444cfb3
|
Note PRs from original repository included in this codeflow update: 💡 You may consult the FAQ for more information or tag @dotnet/product-construction for assistance. |
Diff: https://github.com/dotnet/fsharp/compare/0677d6096c132a5210e694ebaedd180c72ed6d70..12efe3b5121d8a662d1431763796dfd278af9129 From: dotnet/fsharp@0677d60 To: dotnet/fsharp@12efe3b [[ commit created by automation ]]
…8f9a-61564444cfb3
…10.0.2xx-27990d9d-40e6-439b-8f9a-61564444cfb3
|
Note PRs from original repository included in this codeflow update:
💡 You may consult the FAQ for more information or tag @dotnet/product-construction for assistance. |
premun
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@T-Gro so I guess we're blocking this one?
|
Three things:
|
Diff: https://github.com/dotnet/fsharp/compare/12efe3b5121d8a662d1431763796dfd278af9129..9670f600f7aab99d4b4fe95c41ed83e3e008c489 From: dotnet/fsharp@12efe3b To: dotnet/fsharp@9670f60 [[ commit created by automation ]]
…6-439b-8f9a-61564444cfb3
…10.0.2xx-27990d9d-40e6-439b-8f9a-61564444cfb3
|
Note PRs from original repository included in this codeflow update: 💡 You may consult the FAQ for more information or tag @dotnet/product-construction for assistance. |
|
Is it fine if I manually edit the versions.props in the VMR for 10.0.2xx only? Can I just edit the content in this PR, or would that backfire in backflow to main and/or as conflicts in upcoming forward flows? |
|
@T-Gro there's no backflow to Maybe you could just override the variables lower so that it will be a new block of props (with a comment explaining it) so it's more explicit and less conflict-prone? |
Override F# version components specific to the 10.0.2xx branch in the VMR.
|
That's a clever idea, I have appended this block. Hopefully the <!-- F# Version components - override specific to the 10.0.2xx branch. Reason is, the content comes from F#'s main which is already branded as NET11. We override it here in the VMR only -->
<FSMajorVersion>10</FSMajorVersion>
<FSMinorVersion>0</FSMinorVersion>
<FSBuildVersion>200</FSBuildVersion>
<FSRevisionVersion>0</FSRevisionVersion>
<FSharpPreReleaseIteration></FSharpPreReleaseIteration>
<PreReleaseVersionLabel>servicing$(FSharpPreReleaseIteration)</PreReleaseVersionLabel>
<!-- End of the custom override related just to 10.0.2xx branch in the VMR --> |
Note
This is a codeflow update. It may contain both source code changes from the source repo as well as dependency updates. Learn more here.
This pull request brings the following source code changes
From https://github.com/dotnet/fsharp