-
Notifications
You must be signed in to change notification settings - Fork 824
Include FSharp pre-release packages in the SDK transport package #18701
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
Conversation
- Enable the SDK to publish the stable-preview packages - Add a pre-release iteration so that previews can be differentiated. - Remove the version substitution in the shims project. There was no replacement happening.
|
Co-authored-by: Tomas Grosup <[email protected]>
Co-authored-by: Tomas Grosup <[email protected]>
Co-authored-by: Tomas Grosup <[email protected]>
@baronfel : Can I ask for your feedback/review here, too? Can this affect any direct package consumers (and if positively, should we publish that info?) |
@baronfel let me know what you think. |
I'm not up-to-speed on what the goal is here, so I don't know what kind of feedback I can offer. Is this just getting F# on the same .NET 10-preview-branded package version as many of the other SDK-delivered packages? |
@baronfel Aligning the pre-release labels of the FSharp packages, and aligning with .NET: https://www.nuget.org/packages/FSharp.Core/#versions-body-tab - Used "beta" without pre-release iteration Both would align on 'previewN' now. |
Oh that's perfect. |
/backport to main |
Started backporting to main: https://github.com/dotnet/fsharp/actions/runs/16071850440 |
(Some of these changes were not taken when I merged from dev18 to main, I will investigate why not) |
@T-Gro backporting to "main" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Include FSharp pre-release packages in the SDK transport package - Enable the SDK to publish the stable-preview packages - Add a pre-release iteration so that previews can be differentiated. - Remove the version substitution in the shims project. There was no replacement happening.
.git/rebase-apply/patch:55: trailing whitespace.
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M eng/Versions.props
M src/FSharp.Build/FSharp.Build.fsproj
M src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj
M src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec
M vsintegration/shims/shims.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec
CONFLICT (content): Merge conflict in src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec
Auto-merging src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj
Auto-merging src/FSharp.Build/FSharp.Build.fsproj
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Include FSharp pre-release packages in the SDK transport package - Enable the SDK to publish the stable-preview packages - Add a pre-release iteration so that previews can be differentiated. - Remove the version substitution in the shims project. There was no replacement happening.
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
Uh oh!
There was an error while loading. Please reload this page.