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.3xx #40872

Conversation

vseanreesermsft
Copy link
Contributor

No description provided.

dotnet-bot and others added 11 commits April 18, 2024 20:40
…3 repositories

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.2 to 8.0.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:1adb2556-0120-43d1-c468-08dc11e32ec2)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: 1adb2556-0120-43d1-c468-08dc11e32ec2
- **Build**: 20240417.5
- **Date Produced**: April 17, 2024 10:17:39 PM UTC
- **Commit**: dda23bbe00c4a4bfdd3732783f0cce37c11a4f40
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 8.0.2 to 8.0.5][1]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.2 to 8.0.5][1]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: [from 8.0.2-servicing.24068.6 to 8.0.5-servicing.24217.5][1]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: [from 8.0.2-servicing.24068.6 to 8.0.5-servicing.24217.5][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 8.0.2-servicing.24068.6 to 8.0.5-servicing.24217.2][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC593444ad8328a5a933c006c6564469666f45ad2e&targetVersion=GCdda23bbe00c4a4bfdd3732783f0cce37c11a4f40&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC472140dd926227876848e48f41cfc9acb9275492&targetVersion=GCb5af29a8f41f880f38fd015c6bcb7aeb816fcef6&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:1adb2556-0120-43d1-c468-08dc11e32ec2)

[marker]: <> (Begin:911684f3-0faa-4fc9-de45-08dc11e85c3a)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: 911684f3-0faa-4fc9-de45-08dc11e85c3a
- **Build**: 20240417.6
- **Date Produced**: April 17, 2024 10:32:21 PM UTC
- **Commit**: 1681d9acf750c1f1ba8f89d54796c99fbfbfb8b2
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-dev-certs**: [from 8.0.2-servicing.24068.4 to 8.0.5-servicing.24217.6][3]
  - **dotnet-user-jwts**: [from 8.0.2-servicing.24068.4 to 8.0.5-servicing.24217.6][3]
  - **dotnet-user-secrets**: [from 8.0.2-servicing.24068.4 to 8.0.5-servicing.24217.6][3]
  - **Microsoft.AspNetCore.Analyzers**: [from 8.0.2-servicing.24068.4 to 8.0.5-servicing.24217.6][3]
  - **Microsoft.AspNetCore.App.Ref**: [from 8.0.2 to 8.0.5][3]
  - **...
update runtime build dependencies to march release
update runtime build dependencies to april release
…3 repositories

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.4 to 8.0.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:1adb2556-0120-43d1-c468-08dc11e32ec2)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: 1adb2556-0120-43d1-c468-08dc11e32ec2
- **Build**: 20240417.5
- **Date Produced**: April 17, 2024 10:17:39 PM UTC
- **Commit**: dda23bbe00c4a4bfdd3732783f0cce37c11a4f40
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 8.0.4 to 8.0.5][1]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.4 to 8.0.5][1]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: [from 8.0.4-servicing.24169.24 to 8.0.5-servicing.24217.5][1]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: [from 8.0.4-servicing.24169.24 to 8.0.5-servicing.24217.5][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 8.0.4-servicing.24169.10 to 8.0.5-servicing.24217.2][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC04094d116496e0bd1d376fd346397ec7900141f8&targetVersion=GCdda23bbe00c4a4bfdd3732783f0cce37c11a4f40&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCebbf01f54996755566db36e2e962ba6364da2ecc&targetVersion=GCb5af29a8f41f880f38fd015c6bcb7aeb816fcef6&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:1adb2556-0120-43d1-c468-08dc11e32ec2)

[marker]: <> (Begin:911684f3-0faa-4fc9-de45-08dc11e85c3a)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: 911684f3-0faa-4fc9-de45-08dc11e85c3a
- **Build**: 20240417.6
- **Date Produced**: April 17, 2024 10:32:21 PM UTC
- **Commit**: 1681d9acf750c1f1ba8f89d54796c99fbfbfb8b2
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-dev-certs**: [from 8.0.4-servicing.24170.14 to 8.0.5-servicing.24217.6][3]
  - **dotnet-user-jwts**: [from 8.0.4-servicing.24170.14 to 8.0.5-servicing.24217.6][3]
  - **dotnet-user-secrets**: [from 8.0.4-servicing.24170.14 to 8.0.5-servicing.24217.6][3]
  - **Microsoft.AspNetCore.Analyzers**: [from 8.0.4-servicing.24170.14 to 8.0.5-servicing.24217.6][3]
  - **Microsoft.AspNetCore.App.Ref**: [from 8.0.4 to 8.0.5][3]
...
Merge from public release/8.0.3xx to internal/release/8.0.3xx and resolve conflicts if necessary
… prior to merge from publ...

Updated NuGet.config - revert format feeds to values prior to merge from public dd26694
…dnceng/internal/dotnet-aspnetcore

This pull request updates the following dependencies

[marker]: <> (Begin:911684f3-0faa-4fc9-de45-08dc11e85c3a)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: 911684f3-0faa-4fc9-de45-08dc11e85c3a
- **Build**: 20240424.4
- **Date Produced**: April 24, 2024 8:13:40 PM UTC
- **Commit**: c9e3996173cec136bc2e9f3b4ec45f2a323b1d63
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

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

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:911684f3-0faa-4fc9-de45-08dc11e85c3a)
@marcpopMSFT
Copy link
Member

Somethign is off with the wasm install. It's picking up an 8.0.1 emscripten somewhere even though the version.details.xml has 8.0.5:
Workload manifest dependency 'Microsoft.NET.Workload.Emscripten.Current' version '8.0.1' is lower than version '8.0.5' required by manifest 'microsoft.net.workload.mono.toolchain.current' [/private/tmp/helix/working/9A9408C5/p/d/sdk-m

@marcpopMSFT marcpopMSFT merged commit 5635fbc into dotnet:release/8.0.3xx May 14, 2024
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.

3 participants