Update CoreClr, CoreSetup, ProjectNTfs, ProjectNTfsTestILC, Standard to preview1-25720-03, preview1-25719-04, beta-25721-01, beta-25721-01, preview1-25721-01, respectively (master)

[dotnet-maestro-bot]

No description provided.

[danmoseley]

/mnt/j/workspace/dotnet_corefx/master/linux-TGroup_netcoreapp+CGroup_Release+AGroup_x64+TestOuter_false_prtest/Tools/ApiCompat.targets(54,5): error : CannotAddAbstractMembers : Member 'System.Buffers.OwnedMemory<T>.Span' is abstract in the implementation but is missing in the contract. [/mnt/j/workspace/dotnet_corefx/master/linux-TGroup_netcoreapp+CGroup_Release+AGroup_x64+TestOuter_false_prtest/src/System.Runtime/src/System.Runtime.csproj]
/mnt/j/workspace/dotnet_corefx/master/linux-TGroup_netcoreapp+CGroup_Release+AGroup_x64+TestOuter_false_prtest/Tools/ApiCompat.targets(54,5): error : MembersMustExist : Member 'System.Buffers.OwnedMemory<T>.AsMemory.get()' does not exist in the implementation but it does exist in the contract. [/mnt/j/workspace/dotnet_corefx/master/linux-TGroup_netcoreapp+CGroup_Release+AGroup_x64+TestOuter_false_prtest/src/System.Runtime/src/System.Runtime.csproj]
/mnt/j/workspace/dotnet_corefx/master/linux-TGroup_netcoreapp+CGroup_Release+AGroup_x64+TestOuter_false_prtest/Tools/ApiCompat.targets(54,5): error : MembersMustExist : Member 'System.Buffers.OwnedMemory<T>.AsSpan()' does not exist in the implementation but it does exist in the contract. [/mnt/j/workspace/dotnet_corefx/master/linux-TGroup_netcoreapp+CGroup_Release+AGroup_x64+TestOuter_false_prtest/src/System.Runtime/src/System.Runtime.csproj]
/mnt/j/workspace/dotnet_corefx/master/linux-TGroup_netcoreapp+CGroup_Release+AGroup_x64+TestOuter_false_prtest/Tools/ApiCompat.targets(54,5): error : CannotAddAbstractMembers : Member 'System.Buffers.OwnedMemory<T>.Span.get()' is abstract in the implementation but is missing in the contract. [/mnt/j/workspace/dotnet_corefx/master/linux-TGroup_netcoreapp+CGroup_Release+AGroup_x64+TestOuter_false_prtest/src/System.Runtime/src/System.Runtime.csproj]
/mnt/j/workspace/dotnet_corefx/master/linux-TGroup_netcoreapp+CGroup_Release+AGroup_x64+TestOuter_false_prtest/Tools/ApiCompat.targets(68,5): error : ApiCompat failed for '/mnt/j/workspace/dotnet_corefx/master/linux-TGroup_netcoreapp+CGroup_Release+AGroup_x64+TestOuter_false_prtest/bin/Unix.AnyCPU.Release/System.Runtime/netcoreapp/System.Runtime.dll' [/mnt/j/workspace/dotnet_corefx/master/linux-TGroup_netcoreapp+CGroup_Release+AGroup_x64+TestOuter_false_prtest/src/System.Runtime/src/System.Runtime.csproj]

@ahsonkhan

[ahsonkhan]

@stephentoub, do we need to cherry-pick the changes from #24134 into this PR similar to what you did here: #24154?

[stephentoub]

do we need to cherry-pick the changes

Yes

[ahsonkhan]

Yes

Ty for doing it!

Can you please explain to me the steps to cherry-pick?

I added a remote to dotnet-maestro-bot fork and checked out the master-UpdateDependencies branch to my local branch. I tried to do git cherry-pick <commit hash> but I get:
nothing to commit, working tree clean

What should I be doing instead?

[danmoseley]

@ahsonkhan is that because @stephentoub already did it? Maybe if you check out head~ ie 04dd499 it would work.

[stephentoub]

Can you please explain to me the steps to cherry-pick?

I generally do something like:

git remote add dotnet-maestro-bot https://github.com/dotnet-maestro-bot/corefx.git
git fetch dotnet-maestro-bot
git checkout master-UpdateDependencies
git cherry-pick 786195a51ca0b751f5aec127faf655fe358c6993
git push dotnet-maestro-bot master-UpdateDependencies
git remote remove dotnet-maestro-bot

is that because @stephentoub already did it?

Before it said "nothing to commit, working tree clean", did it also say something like "The previous cherry-pick is now empty, possibly due to conflict resolution."? If so, Dan's theory is likely right.

[ahsonkhan]

Before it said "nothing to commit, working tree clean", did it also say something like "The previous cherry-pick is now empty, possibly due to conflict resolution."? If so, Dan's theory is likely right.

Yes it did. Tyvm.

Regarding the commit hash (78619...), where did you get that hash and how would you deal with multiple commits that need to be cherry-picked? Do you first rebase them into one commit or do you cherry-pick <commit 1>..<commit n>?

[stephentoub]

where did you get that hash

From the previous PR/commit on GitHub:

78619

Of course, once it was cherry-picked, the new commit has a different hash, as it now has a different parent.

how would you deal with multiple commits that need to be cherry-picked? Do you first rebase them into one commit or do you cherry-pick <commit 1>..?

Generally I just cherry-pick them individually, as it's usually the case when I'm cherry-picking that I want to maintain the individuality of the commits. Every now and then I'll squash them, though, which I usually do after cherry-picking them individually, unless I know there are going to be conflicts that will be more easily handled by squashing first and then dealing with the conflicts only for the single commit.