Merge main to release/dev17.5 #14098
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Add SynType.Or for generic constrains in the form (^A or ^B):...
Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com> Co-authored-by: Don Syme <dsyme@users.noreply.github.com>
dotnet-bot
force-pushed
the
merges/main-to-release/dev17.5
branch
from
40cbdc9
to
889709d
Compare
T-Gro
approved these changes
Oct 13, 2022
vzarytovskii
added a commit
that referenced
this pull request
Jan 11, 2023
* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 1997730 (#13925) (#14041) Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com> * Merge main to release/dev17.5 (#14043) Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com> Co-authored-by: Don Syme <dsyme@users.noreply.github.com> Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com> Co-authored-by: Edgar Gonzalez <edgar.gonzalez@fundourselves.com> Co-authored-by: Eugene Auduchinok <eugene.auduchinok@jetbrains.com> Co-authored-by: Chet Husk <baronfel@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Florian Verdonck <florian.verdonck@outlook.com> Co-authored-by: Petr <psfinaki@users.noreply.github.com> Co-authored-by: Petr Pokorny <petrpokorny@microsoft.com> Co-authored-by: Theodore Tsirpanis <teo@tsirpanis.gr> * Update FSharp.Editor.fsproj I believe a bad merge happened, this line is not in main. And the file does not exist in either branch. * Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2014480 (#14049) * Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2016907 * Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2016985 * XLF * Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2017073 * Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2017391 * Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2017391 * Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2018131 (#14089) * Bugfix: Ref assemblies contained .property definitions at the wrong type in generated IL (#14093) * Bugfix: Ref assemblies contained property definitions at the wrong type * Better comment * Update versions for dev17.4 (#14102) * Update versions for dev17.5 (#14100) * Merge main to release/dev17.5 (#14098) * Add SynType.Or. (#14058) * Add SynType.Or for generic constrains in the form (^A or ^B):... * Change ty1.Equals(ty2) to call static op_Equality (#13028) Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com> Co-authored-by: Don Syme <dsyme@users.noreply.github.com> Co-authored-by: Florian Verdonck <florian.verdonck@outlook.com> Co-authored-by: Rustam <rstm.sf@gmail.com> Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com> Co-authored-by: Don Syme <dsyme@users.noreply.github.com> * Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2023680 (#14133) * Disable ref assemblies in e2e tests (#14135) Disable reference assemblies for e2e test of type providers Co-authored-by: Adam Boniecki <adboniec@microsoft.com> Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com> * Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2024009 (#14139) * Downgrade SDK, rc2 is failing signing (#14146) * Generate SBOM for Fsharp (#14029) (#14169) * Generate Sbom * pass ci flag * update * Sbom generation * Fix for trimming tests: Added nuget.org source + explicit source mapping for FSharp.Core * Update Build.ps1 Tweaks to handle useGlobalNugetCache Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com> Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com> Co-authored-by: Kevin Ransom (msft) <codecutter.fsharp@hotmail.com> Co-authored-by: Epsitha Ananth <47157394+epananth@users.noreply.github.com> Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com> Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com> Co-authored-by: Kevin Ransom (msft) <codecutter.fsharp@hotmail.com> * Update Arcade & Put automated pool provider usage functionality into Dev17.4 branch (similar to PR in main now but will not be backported here) (#14177) * [release/dev17.4] fix metadata failure due to double integration of signature (#14190) * fix metadata failure due to double duplication * fix metadata failure due to double duplication Co-authored-by: Don Syme <dsyme@users.noreply.github.com> * Global.json * [release/dev17.4] Don't emit IsReadOnlyAttribute if not available. (#14281) Co-authored-by: nojaf <florian.verdonck@outlook.com> * Fixed package versions to publicly available (#14291) * Fixed package versions to publicly available * Update Versions.props Microsoft.Build.* to 17.4.0 Co-authored-by: Kevin Ransom (msft) <codecutter.fsharp@hotmail.com> * Update Versions.props * Prefer nullable over other conversions, fixes #14302 * Replace ROSpan for DateTimeOffset as op_Implicit target, ROSpan is not defined on all test TFMs * [release/dev17.4] F# 7 fixes (#14322) * WIP: Fix for calling init-only setter via srtp call + allow calling special-named functions via srtp * Fix 14097 Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com> Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com> Co-authored-by: Don Syme <dsyme@users.noreply.github.com> * Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2051937 (#14381) * Deploy System.Diagnostics.DiagnosticSource to Tools folder (#14417) * Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2059214 (#14427) * Revert "IL: optimize attribute cluster reading (#13821)" This reverts commit 179db4e. * Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2067933 (#14472) * Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2067933 * Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2067933 * Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2068561 (#14474) * Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2068115 * Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2068115 Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com> * Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2077478 (#14533) * Revert "Merge branch 'release/dev17.5' of https://github.com/dotnet/fsharp into release/dev17.5" This reverts commit 4d222de, reversing changes made to 2e92791. * Update azure-pipelines.yml * Merge main to release/dev17.5 (#14562) Co-authored-by: Petr <psfinaki@users.noreply.github.com> Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com> Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com> Co-authored-by: Don Syme <dsyme@users.noreply.github.com> Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com> Co-authored-by: Edgar Gonzalez <edgar.gonzalez@fundourselves.com> Co-authored-by: Eugene Auduchinok <eugene.auduchinok@jetbrains.com> Co-authored-by: Chet Husk <baronfel@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Florian Verdonck <florian.verdonck@outlook.com> Co-authored-by: Petr <psfinaki@users.noreply.github.com> Co-authored-by: Petr Pokorny <petrpokorny@microsoft.com> Co-authored-by: Theodore Tsirpanis <teo@tsirpanis.gr> Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com> Co-authored-by: Rustam <rstm.sf@gmail.com> Co-authored-by: Adam Boniecki <20281641+abonie@users.noreply.github.com> Co-authored-by: Adam Boniecki <adboniec@microsoft.com> Co-authored-by: Epsitha Ananth <47157394+epananth@users.noreply.github.com> Co-authored-by: Kevin Ransom (msft) <codecutter.fsharp@hotmail.com> Co-authored-by: Matt Galbraith <MattGal@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Nino Floris <mail@ninofloris.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatically generated pull request from main into release/dev17.5.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
Troubleshooting conflicts
Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file containing conflicts copy its path into the following searches:
Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts.
Resolve merge conflicts using your local repo
Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub.
git fetch --all git checkout -t upstream/merges/main-to-release/dev17.5 git reset --hard upstream/release/dev17.5 git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-release/dev17.5 --force