Skip to content

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

Merged
merged 9 commits into from
Jun 24, 2025

Conversation

mmitche
Copy link
Member

@mmitche mmitche commented Jun 19, 2025

  • 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.

- 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.
Copy link
Contributor

github-actions bot commented Jun 19, 2025

⚠️ Release notes required, but author opted out

Warning

Author opted out of release notes, check is disabled for this pull request.
cc @dotnet/fsharp-team-msft

@T-Gro T-Gro added the NO_RELEASE_NOTES Label for pull requests which signals, that user opted-out of providing release notes label Jun 20, 2025
@github-project-automation github-project-automation bot moved this from New to In Progress in F# Compiler and Tooling Jun 20, 2025
@T-Gro T-Gro requested a review from baronfel June 20, 2025 09:05
@T-Gro
Copy link
Member

T-Gro commented Jun 20, 2025

@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?)

@mmitche
Copy link
Member Author

mmitche commented Jun 23, 2025

@baronfel let me know what you think.

@baronfel
Copy link
Member

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?

@mmitche
Copy link
Member Author

mmitche commented Jun 24, 2025

@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
https://www.nuget.org/packages/FSharp.Compiler.Service/43.10.100-preview.25277.114 - Used 'preview' without pre-release iteration.

Both would align on 'previewN' now.

@baronfel
Copy link
Member

Oh that's perfect.

@T-Gro T-Gro enabled auto-merge (squash) June 24, 2025 08:34
@T-Gro T-Gro merged commit fc212af into dotnet:release/dev18.0 Jun 24, 2025
39 checks passed
@github-project-automation github-project-automation bot moved this from In Progress to Done in F# Compiler and Tooling Jun 24, 2025
@T-Gro
Copy link
Member

T-Gro commented Jul 4, 2025

/backport to main

Copy link
Contributor

github-actions bot commented Jul 4, 2025

@T-Gro
Copy link
Member

T-Gro commented Jul 4, 2025

(Some of these changes were not taken when I merged from dev18 to main, I will investigate why not)

Copy link
Contributor

github-actions bot commented Jul 4, 2025

@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!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
NO_RELEASE_NOTES Label for pull requests which signals, that user opted-out of providing release notes
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants