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/8.0-rc1' => 'release/8.0' #90668

Conversation

dotnet-maestro-bot
Copy link
Contributor

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

This PR merges commits made on release/8.0-rc1 by the following committers:

  • github-actions[bot]
  • dotnet-maestro[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/8.0-rc1
git pull --ff-only
git checkout release/8.0
git pull --ff-only
git merge --no-ff release/8.0-rc1

# 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-maestro-bot/runtime HEAD:merge/release/8.0-rc1-to-release/8.0
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/8.0-rc1-to-release/8.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/8.0-rc1-to-release/8.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/8.0-rc1-to-release/8.0 release/8.0
git pull https://github.com/dotnet-maestro-bot/runtime merge/release/8.0-rc1-to-release/8.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/runtime HEAD:merge/release/8.0-rc1-to-release/8.0
or if you are using SSH
git checkout -b merge/release/8.0-rc1-to-release/8.0 release/8.0
git pull git@github.com:dotnet-maestro-bot/runtime merge/release/8.0-rc1-to-release/8.0
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/8.0-rc1-to-release/8.0

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

github-actions bot and others added 4 commits August 15, 2023 21:50
… collecting telemetry (dotnet#90606)

* [workloads] Put quotes around GetFileName call when collecting telemetry

There are cases where `%(ReferencePath)` is empty, so prevent exceptions by quoting the value.

Fixes dotnet#90584

* Feedback

---------

Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
Co-authored-by: Steve Pfister <steveisok@users.noreply.github.com>
…15.5 (dotnet#90649)

Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport
 From Version 8.0.0-rc.1.23411.2 -> To Version 8.0.0-rc.1.23415.5

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…ng JsonIncludeAttribute (dotnet#90615)

* Fix support for non-public constructors using JsonIncludeAttribute

* Address feedback.

---------

Co-authored-by: Eirik Tsarpalis <eirik.tsarpalis@gmail.com>
…icCode (dotnet#90616)

* Annotate System.Linq.Expressions with RequiresDynamicCode

All this ended up with an RUC on Expression.Compile due to new arrays.
I could potentially silence this warning with a feature flag, but it is a
real risk, and one that users could maybe work around if alterted to the problem.

* Remove suppression that's no longer needed

* Fix tests for new feature switch behavior

* Update src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Expression.cs

Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>

* Typo in Throws call

* Fix assert for net framework

* Respond to PR comments

* Add suppression

* Typo

* Update src/libraries/System.Linq.Expressions/src/Resources/Strings.resx

Co-authored-by: Stephen Toub <stoub@microsoft.com>

* PR feedback

---------

Co-authored-by: Andy Gocke <andy@commentout.net>
Co-authored-by: Andy Gocke <angocke@microsoft.com>
Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
Co-authored-by: Stephen Toub <stoub@microsoft.com>
@dotnet-issue-labeler
Copy link

Note regarding the new-api-needs-documentation label:

This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.

@ghost
Copy link

ghost commented Aug 16, 2023

Tagging subscribers to this area: @dotnet/area-infrastructure-libraries
See info in area-owners.md if you want to be subscribed.

Issue Details

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

This PR merges commits made on release/8.0-rc1 by the following committers:

  • github-actions[bot]
  • dotnet-maestro[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/8.0-rc1
git pull --ff-only
git checkout release/8.0
git pull --ff-only
git merge --no-ff release/8.0-rc1

# 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-maestro-bot/runtime HEAD:merge/release/8.0-rc1-to-release/8.0
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/8.0-rc1-to-release/8.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/8.0-rc1-to-release/8.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/8.0-rc1-to-release/8.0 release/8.0
git pull https://github.com/dotnet-maestro-bot/runtime merge/release/8.0-rc1-to-release/8.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/runtime HEAD:merge/release/8.0-rc1-to-release/8.0
or if you are using SSH
git checkout -b merge/release/8.0-rc1-to-release/8.0 release/8.0
git pull git@github.com:dotnet-maestro-bot/runtime merge/release/8.0-rc1-to-release/8.0
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/8.0-rc1-to-release/8.0

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

Author: dotnet-maestro-bot
Assignees: -
Labels:

area-Infrastructure-libraries, new-api-needs-documentation

Milestone: -

@carlossanlop carlossanlop added area-codeflow for labeling automated codeflow and removed area-Infrastructure-libraries labels Aug 16, 2023
Copy link
Member

@carlossanlop carlossanlop left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merge commit

@carlossanlop carlossanlop added the Servicing-approved Approved for servicing release label Aug 16, 2023
github-actions bot and others added 3 commits August 16, 2023 11:58
* Unify with logging category matching

* -1 => 0

* Weird overlapping match

---------

Co-authored-by: Chris R <Tratcher@outlook.com>
Do more parameter validation, correct buffer size calculations
for security-enhanced CRT functions, and avoid memcpy
buffer overrun of locale.

Co-authored-by: Bruce Forstall <brucefo@microsoft.com>
When we started building with preview 7 in
5549f72, NullableAttribute in
these testcases started to use the attribute definition from the
framework, instead of generating it into the code. This broke the
`--used-attrs-only` optimization because `skip` assemblies (the
default for the framework in these testcases) are treated as if
all types in them are kept, for the purposes of the
`--used-attrs-only` optimization. (The optimization removes
attribute instances unless the attribute type is preserved for
some other reason).

It's not clear what the intended behavior of `--used-attrs-only`
is for `skip` assemblies, and the discussion in
dotnet/linker#952 indicates that it's
considered experimental, so this fixes the failures by using the
`link` action. This represents a more realistic scenario since
`skip` is mainly used in testing to avoid linking the framework
in every testcase.

Co-authored-by: Sven Boemer <sbomer@gmail.com>
github-actions bot and others added 4 commits August 16, 2023 21:42
* Add missing type forwards

Fixes dotnet#90578

IDispatchImplAttribute, IDispatchImplType and SetWin32ContextInIDispatchAttribute were removed with dotnet@9f1dd1a and dotnet@26a91ad

Those dropped types weren't flagged because APICompat only validates reference assemblies. We have three implementation only shim assemblies: mscorlib, System and System.Data. I verified that no other type forwards were lost between .NET 7 and .NET 8.

* Update mscorlib.cs

---------

Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
…otnet#90679)

* Enable inline array tests

* Run android jobs only

* Add verbose logging

* Revert runtime changes

* Remove android-arm64 job

* Rename common assembly and revert CI changes

* Rename assembly name

---------

Co-authored-by: Milos Kotlar <kotlarmilos@gmail.com>
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
Co-authored-by: Larry Ewing <lewing@microsoft.com>
…ATH. (dotnet#90678)

Can be specified multiple times.

Co-authored-by: Zoltan Varga <vargaz@gmail.com>
github-actions bot and others added 2 commits August 16, 2023 15:39
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
…815.4 (dotnet#90665)

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.23411.1 -> To Version 8.0.0-beta.23415.4

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23408.1 -> To Version 1.0.0-beta.23415.1 (parent: Microsoft.DotNet.Arcade.Sdk

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>
@carlossanlop
Copy link
Member

Wasm failure is known: #90742

@carlossanlop carlossanlop merged commit 60bc4f7 into dotnet:release/8.0 Aug 17, 2023
342 of 386 checks passed
@ghost ghost locked as resolved and limited conversation to collaborators Sep 16, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-codeflow for labeling automated codeflow new-api-needs-documentation Servicing-approved Approved for servicing release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants