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

Merging internal commits for release/8.0.4xx #42701

Conversation

vseanreesermsft
Copy link
Contributor

No description provided.

dotnet-bot and others added 17 commits July 12, 2024 22:04
…otnet-aspnetcore build 20240708.8

dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0
 From Version 8.0.7-servicing.24314.2 -> To Version 8.0.8-servicing.24358.8
…otnet-runtime build 20240702.10

Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.Security.Cryptography.Xml , System.Text.Json , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0
 From Version 8.0.1 -> To Version 8.0.1

Dependency coherency updates

Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100
 From Version 8.0.7 -> To Version 8.0.7 (parent: Microsoft.NETCore.App.Runtime.win-x64
…otnet-windowsdesktop build 20240710.3

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0
 From Version 8.0.7 -> To Version 8.0.8
…otnet-aspnetcore build 20240712.9

dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0
 From Version 8.0.7-servicing.24314.2 -> To Version 8.0.8-servicing.24362.9
…3 repositories

This pull request updates the following dependencies

[marker]: <> (Begin:1ab2aba6-b648-40a9-9fe8-08dca2920c50)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: 1ab2aba6-b648-40a9-9fe8-08dca2920c50
- **Build**: 20240712.9
- **Date Produced**: July 13, 2024 4:33:32 AM UTC
- **Commit**: 3483d65ea57ac7711115b873fa815b05c7a624e1
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-dev-certs**: [from 8.0.7-servicing.24314.2 to 8.0.8-servicing.24362.9][2]
  - **dotnet-user-jwts**: [from 8.0.7-servicing.24314.2 to 8.0.8-servicing.24362.9][2]
  - **dotnet-user-secrets**: [from 8.0.7-servicing.24314.2 to 8.0.8-servicing.24362.9][2]
  - **Microsoft.AspNetCore.Analyzers**: [from 8.0.7-servicing.24314.2 to 8.0.8-servicing.24362.9][2]
  - **Microsoft.AspNetCore.App.Ref**: [from 8.0.7 to 8.0.8][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.7-servicing.24314.2 to 8.0.8-servicing.24362.9][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.7 to 8.0.8][2]
  - **Microsoft.AspNetCore.Authorization**: [from 8.0.7 to 8.0.8][2]
  - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 8.0.7-servicing.24314.2 to 8.0.8-servicing.24362.9][2]
  - **Microsoft.AspNetCore.Components.Web**: [from 8.0.7 to 8.0.8][2]
  - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 8.0.7-servicing.24314.2 to 8.0.8-servicing.24362.9][2]
  - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 8.0.7-servicing.24314.2 to 8.0.8-servicing.24362.9][2]
  - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 8.0.7-servicing.24314.2 to 8.0.8-servicing.24362.9][2]
  - **Microsoft.AspNetCore.TestHost**: [from 8.0.7 to 8.0.8][2]
  - **Microsoft.Extensions.FileProviders.Embedded**: [from 8.0.7 to 8.0.8][2]
  - **Microsoft.Extensions.ObjectPool**: [from 8.0.7 to 8.0.8][2]
  - **Microsoft.JSInterop**: [from 8.0.7 to 8.0.8][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.7-servicing.24314.2 to 8.0.8-servicing.24362.9][2]

[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC2f1db20456007c9515068a35a65afdf99af70bc6&targetVersion=GC3483d65ea57ac7711115b873fa815b05c7a624e1&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:1ab2aba6-b648-40a9-9fe8-08dca2920c50)

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: from 8.0.7 to 8.0.7 (parent: Microsoft.NETCore.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[ma...
…otnet-runtime build 20240716.12

Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0
 From Version 8.0.8-servicing.24352.10 -> To Version 8.0.8-servicing.24366.12

Dependency coherency updates

Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100
 From Version 8.0.7 -> To Version 8.0.8 (parent: Microsoft.NETCore.App.Runtime.win-x64
…dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: from 8.0.7 to 8.0.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:82bc8158-ef88-4a27-3f7b-08dca299e604)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 82bc8158-ef88-4a27-3f7b-08dca299e604
- **Build**: 20240716.12
- **Date Produced**: July 16, 2024 10:31:44 PM UTC
- **Commit**: 08338fcaa5c9b9a8190abb99222fed12aaba956c
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NET.HostModel**: [from 8.0.8-servicing.24352.10 to 8.0.8-servicing.24366.12][1]
  - **Microsoft.NET.ILLink.Tasks**: [from 8.0.8 to 8.0.8][1]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 8.0.8 to 8.0.8][1]
  - **Microsoft.NETCore.App.Ref**: [from 8.0.8 to 8.0.8][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.8 to 8.0.8][1]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 8.0.8 to 8.0.8][1]
  - **Microsoft.NETCore.Platforms**: [from 8.0.8-servicing.24352.10 to 8.0.8-servicing.24366.12][1]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.8-servicing.24352.10 to 8.0.8-servicing.24366.12][1]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: [from 8.0.8-servicing.24352.10 to 8.0.8-servicing.24366.12][1]
  - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: [from 8.0.7 to 8.0.8][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC40a8492d8bfb56a0a31d7d2e8de2b7ebbd60982a&targetVersion=GC08338fcaa5c9b9a8190abb99222fed12aaba956c&_a=files
[2]: dotnet/emsdk@be13dab...e92f92e

[DependencyUpdate]: <> (End)

[marker]: <> (End:82bc8158-ef88-4a27-3f7b-08dca299e604)
…otnet-windowsdesktop build 20240716.8

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0
 From Version 8.0.8 -> To Version 8.0.8

Dependency coherency updates

Microsoft.NET.Sdk.WindowsDesktop
 From Version 8.0.7-servicing.24313.7 -> To Version 8.0.8-servicing.24366.7 (parent: Microsoft.WindowsDesktop.App.Ref
…dnceng/internal/dotnet-windowsdesktop

This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.NET.Sdk.WindowsDesktop**: from 8.0.7-servicing.24313.7 to 8.0.8-servicing.24366.7 (parent: Microsoft.WindowsDesktop.App.Ref)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:11ffd28b-eb51-469a-d3fb-08dca292067e)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: 11ffd28b-eb51-469a-d3fb-08dca292067e
- **Build**: 20240716.8
- **Date Produced**: July 17, 2024 6:54:51 AM UTC
- **Commit**: 1526afd4eae1d862d586402ef8e005151a919d52
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 8.0.8 to 8.0.8][1]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.8 to 8.0.8][1]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: [from 8.0.8-servicing.24360.3 to 8.0.8-servicing.24366.8][1]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: [from 8.0.8-servicing.24360.3 to 8.0.8-servicing.24366.8][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 8.0.7-servicing.24313.7 to 8.0.8-servicing.24366.7][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC1379ef1cadaa3c2463ae82a9c926ae6ea7741c5a&targetVersion=GC1526afd4eae1d862d586402ef8e005151a919d52&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC43bb8cc831c2658e1117415019264bfe6f644f94&targetVersion=GC883fc207bb50622d4458ff09ae6a62548783826a&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:11ffd28b-eb51-469a-d3fb-08dca292067e)
…otnet-aspnetcore build 20240719.8

dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0
 From Version 8.0.8-servicing.24362.9 -> To Version 8.0.8-servicing.24369.8
…dnceng/internal/dotnet-aspnetcore

This pull request updates the following dependencies

[marker]: <> (Begin:1ab2aba6-b648-40a9-9fe8-08dca2920c50)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: 1ab2aba6-b648-40a9-9fe8-08dca2920c50
- **Build**: 20240719.8
- **Date Produced**: July 20, 2024 12:20:35 AM UTC
- **Commit**: 954f61dd38b33caa2b736c73530bd5a294174437
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-dev-certs**: [from 8.0.8-servicing.24362.9 to 8.0.8-servicing.24369.8][1]
  - **dotnet-user-jwts**: [from 8.0.8-servicing.24362.9 to 8.0.8-servicing.24369.8][1]
  - **dotnet-user-secrets**: [from 8.0.8-servicing.24362.9 to 8.0.8-servicing.24369.8][1]
  - **Microsoft.AspNetCore.Analyzers**: [from 8.0.8-servicing.24362.9 to 8.0.8-servicing.24369.8][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 8.0.8 to 8.0.8][1]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.8-servicing.24362.9 to 8.0.8-servicing.24369.8][1]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.8 to 8.0.8][1]
  - **Microsoft.AspNetCore.Authorization**: [from 8.0.8 to 8.0.8][1]
  - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 8.0.8-servicing.24362.9 to 8.0.8-servicing.24369.8][1]
  - **Microsoft.AspNetCore.Components.Web**: [from 8.0.8 to 8.0.8][1]
  - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 8.0.8-servicing.24362.9 to 8.0.8-servicing.24369.8][1]
  - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 8.0.8-servicing.24362.9 to 8.0.8-servicing.24369.8][1]
  - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 8.0.8-servicing.24362.9 to 8.0.8-servicing.24369.8][1]
  - **Microsoft.AspNetCore.TestHost**: [from 8.0.8 to 8.0.8][1]
  - **Microsoft.Extensions.FileProviders.Embedded**: [from 8.0.8 to 8.0.8][1]
  - **Microsoft.Extensions.ObjectPool**: [from 8.0.8 to 8.0.8][1]
  - **Microsoft.JSInterop**: [from 8.0.8 to 8.0.8][1]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.8-servicing.24362.9 to 8.0.8-servicing.24369.8][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC3483d65ea57ac7711115b873fa815b05c7a624e1&targetVersion=GC954f61dd38b33caa2b736c73530bd5a294174437&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:1ab2aba6-b648-40a9-9fe8-08dca2920c50)
Updated Version.Details.xml - fix released package shas

----
#### AI description  (iteration 1)
#### PR Classification
Bug fix to update released package SHA values.

#### PR Summary
This pull request updates the SHA values for several dependencies in the `Version.Details.xml` file to reflect the correct released package SHAs.
- Updated SHA for `Microsoft.Extensions.DependencyModel` in `/eng/Version.Details.xml`
- Updated SHA for `System.Text.Json` in `/eng/Version.Details.xml`
- Updated SHA for `System.Security.Cryptography.Xml` in `/eng/Version.Details.xml`
… separately for pull and...

Added new set of credential env variables to be used separately for pull and push operations. Old set of variables is used for fallback.

----
#### AI description  (iteration 1)
#### PR Classification
New feature: Added support for separate credential environment variables for different registry modes (push, pull, pull from output).

#### PR Summary
This pull request introduces new environment variables for Docker credentials based on registry modes and updates the relevant classes and tests to support this feature.
- `AuthHandshakeMessageHandler.cs`: Added `GetDockerCredentialsFromEnvironment` method to fetch credentials based on registry mode.
- `Registry.cs`: Introduced `RegistryMode` enum and updated constructors to handle different registry modes.
- `DefaultRegistryAPI.cs`: Updated to use registry mode when creating HTTP clients.
- `ContainerHelpers.cs`: Added new constants for push and pull registry credentials.
- Added unit tests in `AuthHandshakeMessageHandlerTests.cs` to verify the new credential fetching logic.
…-merge-8.0.4xx-2024-08-13-1058-2ed46940-639e-4783-a7da-4d419a3f9404
@vseanreesermsft vseanreesermsft requested a review from a team as a code owner August 13, 2024 17:59
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels Aug 13, 2024
@Forgind Forgind enabled auto-merge August 14, 2024 20:46
@baronfel
Copy link
Member

@amcasey I think the changes in dotnet/aspnetcore#57108 may have impacted the test failure we're seeing in the SDK now. We use the dev-certs command to export the dev cert on linux and use that cert to 'secure' a Docker Container registry. We do this in part because that command seemed to generate a cert that was trusted on Linux, so we didn't have to worry about validation errors.

Did this change materially in your PR? Are there reasons why this cert wouldn't be considered valid by standard .NET HttpClient code?

@amcasey
Copy link
Member

amcasey commented Aug 16, 2024

@baronfel Without having dug in, my knee-jerk reaction is that it's probably the change to directory permissions that's affecting you.

Having said that, I'm curious about your comment that "command seemed to generate a cert that was trusted on Linux", since that wasn't true before my change, AFAIK.

@baronfel
Copy link
Member

Sorry, that's unclear wording on my end. What it comes down to on our end is that we would

@amcasey
Copy link
Member

amcasey commented Aug 16, 2024

Wait, are you just hijacking validation to ignore cert errors? If so, my changes should hopefully make that unnecessary (not for free, but better than ignoring trust). After the change, running dotnet dev-certs https --trust ... on the client/receiving machine should make the cert actually trusted (at least by dotnet, openssl (with an extra step), and popular browsers).

Having said that, I would not expect my changes to have affected your ability to suppress that error.

@amcasey
Copy link
Member

amcasey commented Aug 16, 2024

From skimming the code you linked, it appears that you're consuming/validating the cert via HttpClient (or some similar dotnet API), which should pick up trust from either the dotnet cert store or OpenSSL. To have the dev cert added there, you can either use dev-certs --trust or just write it to the X509Store yourself.

My hypothesis is still that whatever is serving the cert is failing to access it after a directory permissions change (requested during security review) and the error is a confusing manifestation of "there is no cert".

@baronfel
Copy link
Member

pushed a commit with the suggestion to --trust the dev cert. It worked for me in some local testing. If this doesn't work then we can skip the test and create an issue to re-enable it.

@amcasey
Copy link
Member

amcasey commented Aug 16, 2024

@baronfel There's also a new requirement that the directory to which the cert is exported must already exist (again, security request). That might be a difference between your local testing and a clean (?) lab machine.

@baronfel
Copy link
Member

I've skipped the test so that we don't block codeflow, and logged an issue to light it up again soon.

@baronfel
Copy link
Member

The test skip cleared that issue, now it's just the C++ issues that we've been chasing across the branches.

@marcpopMSFT marcpopMSFT disabled auto-merge August 19, 2024 17:02
@marcpopMSFT marcpopMSFT merged commit 4a1371a into dotnet:release/8.0.4xx Aug 19, 2024
14 of 17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Infrastructure untriaged Request triage from a team member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants