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

[automated] Merge branch 'release/9.0-rc2' => 'release/9.0' #107928

Merged
merged 3 commits into from
Sep 19, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Sep 17, 2024

MERGE COMMIT

I detected changes in the release/9.0-rc2 branch which have not been merged yet to release/9.0. I'm a robot and am configured to help you automatically keep release/9.0 up to date, so I've opened this PR.

This PR merges commits made on release/9.0-rc2 by the following committers:

  • github-actions[bot]

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/9.0-rc2
git pull --ff-only
git checkout release/9.0
git pull --ff-only
git merge --no-ff release/9.0-rc2

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/runtime HEAD:merge/release/9.0-rc2-to-release/9.0
or if you are using SSH
git push git@github.com:dotnet/runtime HEAD:merge/release/9.0-rc2-to-release/9.0

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/9.0-rc2-to-release/9.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/9.0-rc2-to-release/9.0 release/9.0
git pull https://github.com/dotnet/runtime merge/release/9.0-rc2-to-release/9.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/runtime HEAD:merge/release/9.0-rc2-to-release/9.0
or if you are using SSH
git checkout -b merge/release/9.0-rc2-to-release/9.0 release/9.0
git pull git@github.com:dotnet/runtime merge/release/9.0-rc2-to-release/9.0
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/runtime HEAD:merge/release/9.0-rc2-to-release/9.0

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

github-actions bot and others added 2 commits September 17, 2024 11:05
…107903)

* Remove package references from library tests (#106737)

* Remove package references from library tests

These tests should be referencing the product assemblies so that they
test latest and not old bits.

* Reference the OOB version of SRSF and make sure it's copied

* BinaryFormatter tests should be skipped only on AOT, WASM and Mobile (#106858)

* respect AppContext switch (which is currently enabled for all projects in the root Directory.Build.props file)

* add project reference to all test projects that need working BF (and were being skipped for a while)

* adjust to changes from #104202: EqualityComparer<string>.Default is mapped to StringEqualityComparer, but serialized as GenericEqualityComparer<string>

* Don't use WeakReferences in the round trip test, as the target may get freed in the meantime, fixes #104905 (#106967)

* Enable more BinaryFormatter tests (#107408)

* enable the BinaryFormatter tests in System.Runtime.Serialization.Formatters.Tests

* add new test project, where the flag is disabled and it runs only 3 tests in total that ensure that

* The SerializationGuard is no longer activated since BF was moved to the OOB package, the tests need to reflect that.

* Disable binary formatter tests when DotNetBuildSourceOnly. (#107549)

* [mono][tvos] Do not treat assembly.pdb/xml files as native files to bundle when AOTing on Helix (#107079)

* Do not treat assembly.pdb/xml files as native files to bundle

* Bundle satellite assemblies as well

* [mono][ci] Include PDBs from runtime pack when building on Helix if required (#107348)

---------

Co-authored-by: Eric StJohn <ericstj@microsoft.com>
Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com>
Co-authored-by: Tom Deseyn <tom.deseyn@gmail.com>
Co-authored-by: Ivan Povazan <55002338+ivanpovazan@users.noreply.github.com>
…e-build-reference-packages (#107902)

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240815.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 9.0.0-alpha.1.24374.1 -> To Version 8.0.0-alpha.1.24415.1

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240906.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.24415.1 -> To Version 9.0.0-alpha.1.24456.1

* Bump intellisense to 9.0.0-preview-20240830.1

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240909.3

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 9.0.0-alpha.1.24456.1 -> To Version 9.0.0-alpha.1.24459.3

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240916.2

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 9.0.0-alpha.1.24459.3 -> To Version 9.0.0-alpha.1.24466.2

* Add System.Composition*/8.* to SourceBuildPrebuiltBaseline

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
@carlossanlop carlossanlop added area-codeflow for labeling automated codeflow Servicing-approved Approved for servicing release and removed area-Infrastructure-libraries labels Sep 17, 2024
@dotnet-policy-service dotnet-policy-service bot added the linkable-framework Issues associated with delivering a linker friendly framework label Sep 17, 2024
@carlossanlop carlossanlop merged commit ad82124 into release/9.0 Sep 19, 2024
14 checks passed
@carlossanlop carlossanlop deleted the merge/release/9.0-rc2-to-release/9.0 branch September 19, 2024 01:53
@github-actions github-actions bot locked and limited conversation to collaborators Oct 19, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-codeflow for labeling automated codeflow linkable-framework Issues associated with delivering a linker friendly framework Servicing-approved Approved for servicing release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant