Skip to content

Conversation

@dotnet-maestro
Copy link
Contributor

Note

This is a codeflow update. It may contain both source code changes from
the VMR
as well as dependency updates. Learn more here.

This pull request brings the following source code changes

From https://github.com/dotnet/dotnet

Updated Dependencies

  • From 11.0.0-beta.25578.104 to 11.0.0-beta.26064.107
    • Microsoft.DotNet.Arcade.Sdk
    • Microsoft.DotNet.Build.Tasks.Templating
    • Microsoft.DotNet.Helix.Sdk
  • From 10.0.0-rc.3.25578.104 to 11.0.0-alpha.1.26064.107
    • Microsoft.Extensions.Caching.Memory
    • Microsoft.Extensions.Configuration
    • Microsoft.Extensions.Configuration.Abstractions
    • Microsoft.Extensions.Configuration.EnvironmentVariables
    • Microsoft.Extensions.Configuration.Json
    • Microsoft.Extensions.DependencyInjection
    • Microsoft.Extensions.DependencyModel
    • Microsoft.Extensions.HostFactoryResolver.Sources
    • Microsoft.Extensions.Logging
    • Microsoft.NETCore.App.Ref
    • Microsoft.NETCore.Platforms
    • System.Formats.Asn1
    • System.Runtime.Caching
    • System.Text.Encodings.Web
    • System.Text.Json

Associated changes in source repos

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/dotnet:887f3d5a26e1001ee2777afde10cadcacb8cc735..https://github.com/dotnet/efcore:darc-main-18513a89-5131-40f8-b8f6-d2f121f63cbc

@AndriySvyryd
Copy link
Member

@roji This is still failing, PTAL

@dotnet-maestro
Copy link
Contributor Author

Important

While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged).
To avoid complex conflicts, the codeflow cannot continue until this PR is closed or merged.

You can continue with one of the following options:

  • Ignore this and merge this PR as usual without waiting for the new changes.
    Once merged, Maestro will create a new codeflow PR with the new changes.
  • Close this PR and wait for Maestro to open a new one with old and new changes included.
    You will lose any manual changes made in this PR.
    You can also manually trigger the new codeflow right away by running:
    darc trigger-subscriptions --id 79b347cc-8133-48c7-b2e4-a229e6bc3db5
    
  • Force a codeflow into this PR at your own risk if you want the new changes.
    User commits made to this PR might be reverted.
    darc trigger-subscriptions --id 79b347cc-8133-48c7-b2e4-a229e6bc3db5 --force
    

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants