[automated] Merge branch 'release/9.0.2xx' => 'main'

[github-actions]

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

This PR merges commits made on release/9.0.2xx by the following committers:

• tmat
• v-wuzhai
• dotnet-maestro[bot]
• MiYanni
• marcpopMSFT
• Evangelink
• baronfel
• github-actions[bot]
• invalid-email-address
• dotnet-bot
• javiercn
• rainersigwald
• mthalman
• MichaelSimons
• Sergio0694
• manodasanW

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.

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.2xx
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/9.0.2xx

# 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/sdk HEAD:merge/release/9.0.2xx-to-main

or if you are using SSH

git push [email protected]:dotnet/sdk HEAD:merge/release/9.0.2xx-to-main

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.2xx-to-main'. 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.2xx-to-main main
git pull https://github.com/dotnet/sdk merge/release/9.0.2xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/9.0.2xx-to-main

or if you are using SSH

git checkout -b merge/release/9.0.2xx-to-main main
git pull [email protected]:dotnet/sdk merge/release/9.0.2xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/sdk HEAD:merge/release/9.0.2xx-to-main

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.

[v-wuzhai]

@dotnet/source-build-internal Could you take a look at the sdk-source-build failures?

[ellahathaway]

Build error is

##[error]/vmr/src/sdk/src/BuiltInTools/AspireService/Helpers/CertGenerator.cs(38,24): error CS0433: (NETCORE_ENGINEERING_TELEMETRY=Build) The type 'X509CertificateLoader' exists in both 'Microsoft.Bcl.Cryptography, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51' and 'System.Security.Cryptography, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'

I'm investigating/

[ellahathaway]

Build error is

##[error]/vmr/src/sdk/src/BuiltInTools/AspireService/Helpers/CertGenerator.cs(38,24): error CS0433: (NETCORE_ENGINEERING_TELEMETRY=Build) The type 'X509CertificateLoader' exists in both 'Microsoft.Bcl.Cryptography, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51' and 'System.Security.Cryptography, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'

I'm investigating/

@bartonjs - I think you're familiar with this code. Would the correct fix here be to remove the reference to System.Security.Cryptography.X509Certificates.4.3.0 and remove the using System.Security.Cryptography line from https://github.com/dotnet/sdk/blob/main/src/BuiltInTools/AspireService/Helpers/CertGenerator.cs?

I've determined that the type X509CertificateLoader moved to Microsoft.Bcl.Cryptography, but the using directive for System.Security.Cryptography is pulling in the 9.0 version which also contains X509CertificateLoader. I'm unsure if bumping System.Security.Cryptography from 9.0 to 10.0 would fix this issue, or if that's even doable. If so, maybe we should try that?

[bartonjs]

Would the correct fix here be to remove the reference to System.Security.Cryptography.X509Certificates.4.3.0

You should definitely remove the reference to that, unless you're building for .NET Core 1.0.

and remove the using System.Security.Cryptography line

Definitely not. The type is in the namespace regardless of what assembly it's in.

I've determined that the type X509CertificateLoader moved to Microsoft.Bcl.Cryptography,

No. It's exposed in Microsoft.Bcl.Cryptography for downlevel targets. You should only reference that library if you are building against .NET Standard, .NET Framework, or want to use the new loader on .NET 8.

The library has a .NET 9 target that says the type in Microsoft.Bcl.Cryptography has moved to System.Security.Cryptography.dll (part of the default reference set for .NET 9, so you shouldn't need any package references for it). Getting a duplicate type reference is... unexpected, that suggests either a) we messed up package authoring, or b) you've done something other than normal nuget package references.

exists in both 'Microsoft.Bcl.Cryptography, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'

Why do you have a reference to Microsoft.Bcl.Cryptography v10? That doesn't exist yet...

[ellahathaway]

Thanks for the response.

Why do you have a reference to Microsoft.Bcl.Cryptography v10? That doesn't exist yet...

We're currently building 10.0 in source-build, so the 10.0 version is expected; Source-build builds the latest versions of packages, with downstream repos consuming the versions of the packages built by upstream repos (so long as the package version is not pinned in the downstream repo and the package is defined in Versions.Details.xml with an associated version prop in Versions.props). You can see the 10.0 version of the package produced here in the build.

Based on @bartonjs response, I think that fixing this issue is beyond the scope of source-build. @tmat - I see that you added the use of the certificate loader in src/BuiltInTools/AspireService/Helpers/CertGenerator.cs. Can you please TAL? Thanks!

[mthalman]

Getting this same X509CertificateLoader error in #44685.

[v-wuzhai]

@marcpopMSFT Could you take a look at the failures here?

[marcpopMSFT]

@tmat the watch tests appear to be hanging in every leg they are running in:
dotnet-watch.Tests: [Long Running Test] 'Microsoft.DotNet.Watcher.Tests.ApplyDeltaTests.Aspire', Elapsed: 00:43:35

[marcpopMSFT]

@dotnet/product-construction VMR failing to sync because of an outdated patch.

[ViktorHofer]

Should this change get reverted?

[ViktorHofer]

#44972 fixes that. The problem is that the nuget-client -> sdk (main) subscription was stale. I just updated it to the VS 17.13 channel. So, release/9.0.2xx was using newer dependencies than main.

[v-wuzhai]

@tmat Looks like the dotnet watch tests have failed. Can you take a look?