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

[main] Update dependencies from xamarin/xamarin-android #1798

Merged
merged 4 commits into from
Jul 27, 2021

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jul 24, 2021

This pull request updates the following dependencies

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

  • Coherency Updates:
    • Microsoft.NETCore.App.Ref: from 6.0.0-preview.7.21368.2 to 6.0.0-preview.7.21376.17 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.Dotnet.Sdk.Internal: from 6.0.100-preview.7.21369.5 to 6.0.100-preview.7.21377.3 (parent: Microsoft.Android.Sdk.Windows)
    • Microsoft.Extensions.Primitives: from 6.0.0-preview.7.21368.2 to 6.0.0-preview.7.21376.17 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
    • Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rc.1.21365.18 to 6.0.0-preview.7.21376.6 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.Extensions.Hosting.Abstractions: from 6.0.0-preview.7.21368.2 to 6.0.0-preview.7.21373.17 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
    • Microsoft.Extensions.DependencyInjection.Abstractions: from 6.0.0-preview.7.21368.2 to 6.0.0-preview.7.21373.17 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
    • Microsoft.Extensions.DependencyInjection: from 6.0.0-preview.7.21368.2 to 6.0.0-preview.7.21373.17 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
    • Microsoft.Extensions.Configuration.Abstractions: from 6.0.0-preview.7.21368.2 to 6.0.0-preview.7.21373.17 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
    • Microsoft.Extensions.Configuration: from 6.0.0-preview.7.21368.2 to 6.0.0-preview.7.21373.17 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
    • Microsoft.Extensions.Logging.Abstractions: from 6.0.0-preview.7.21368.2 to 6.0.0-preview.7.21373.17 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
    • Microsoft.Extensions.Logging: from 6.0.0-preview.7.21368.2 to 6.0.0-preview.7.21373.17 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
    • Microsoft.Extensions.Logging.Console: from 6.0.0-preview.7.21368.2 to 6.0.0-preview.7.21373.17 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
    • Microsoft.Extensions.Logging.Debug: from 6.0.0-preview.7.21368.2 to 6.0.0-preview.7.21373.17 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
    • Microsoft.Extensions.FileProviders.Abstractions: from 6.0.0-preview.7.21368.2 to 6.0.0-preview.7.21373.17 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
    • Microsoft.Extensions.FileProviders.Embedded: from 6.0.0-rc.1.21365.18 to 6.0.0-preview.7.21376.6 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.AspNetCore.Authorization: from 6.0.0-rc.1.21365.18 to 6.0.0-preview.7.21376.6 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.AspNetCore.Components.WebView: from 6.0.0-rc.1.21365.18 to 6.0.0-preview.7.21376.6 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.AspNetCore.Components.Web: from 6.0.0-rc.1.21365.18 to 6.0.0-preview.7.21376.6 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.JSInterop: from 6.0.0-rc.1.21365.18 to 6.0.0-preview.7.21376.6 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.7.21368.3 to 6.0.0-preview.7.21374.5 (parent: Microsoft.Dotnet.Sdk.Internal)
    • System.CodeDom: from 6.0.0-preview.7.21368.2 to 6.0.0-preview.7.21373.17 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)

From https://github.com/xamarin/xamarin-android

  • Subscription: db6cac11-36cd-4b5a-4150-08d94728e3da
  • Build: 6.0.1xx-preview7-89732ff8fdb9d1dcff23a76f7acc87a540d6066f-1
  • Date Produced: 7/27/2021 7:54 PM
  • Commit: 89732ff8fdb9d1dcff23a76f7acc87a540d6066f
  • Branch: refs/heads/release/6.0.1xx-preview7

@Redth Redth force-pushed the darc-main-cdabd48d-d1df-41dd-aba3-db6b2b1a34b4 branch from 38a3fc3 to ecf4808 Compare July 24, 2021 14:52
@jonathanpeppers
Copy link
Member

The failure is:

/Users/builder/azdo/_work/1/s/src/Workload/Shared/FrameworkList.targets(26,5): error MSB4018: The "CreateFrameworkListFile" task failed unexpectedly. [/Users/builder/azdo/_work/1/s/src/Workload/Microsoft.Maui.Controls.Ref/Microsoft.Maui.Controls.Ref.csproj]
/Users/builder/azdo/_work/1/s/src/Workload/Shared/FrameworkList.targets(26,5): error MSB4018: System.IO.FileNotFoundException: Could not load file or assembly '/Users/builder/azdo/_work/1/s/src/Compatibility/Android.FormsViewGroup/src/bin/Release/net6.0-android/ref/Microsoft.Maui.Controls.Compatibility.Android.FormsViewGroup.dll'. The system cannot find the file specified.

I heard about some new MSBuild/Roslyn setting that is now required if you need reference assemblies produced in the bin directory. Let me find that...

Copy link
Member

@jonathanpeppers jonathanpeppers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aha, yes this is the break: dotnet/msbuild#6560

So we just need to set $(ProduceReferenceAssemblyInOutDir) in a Directory.Build.props somewhere. Note that the code uses a different property than the PR description.

Let me know if something else is broken after this one.

/cc @rmarinho @Redth

dotnet-maestro bot and others added 2 commits July 27, 2021 12:42
…uild 6.0.1xx-preview7-49aa721f5b320db2a9efabd5707cb0fe1a3a7b4e-1

Microsoft.Android.Sdk.Windows
 From Version 30.0.100-preview.7.95 -> To Version 30.0.100-preview.7.98

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom
 From Version 6.0.0-preview.7.21368.2 -> To Version 6.0.0-preview.7.21371.11 (parent: Microsoft.Dotnet.Sdk.Internal
@Redth Redth force-pushed the darc-main-cdabd48d-d1df-41dd-aba3-db6b2b1a34b4 branch from b558576 to 020e2d0 Compare July 27, 2021 16:42
@Redth Redth added this to the 6.0.100-preview.7 milestone Jul 27, 2021
dotnet-maestro bot and others added 2 commits July 27, 2021 20:42
…uild 6.0.1xx-preview7-89732ff8fdb9d1dcff23a76f7acc87a540d6066f-1

Microsoft.Android.Sdk.Windows
 From Version 30.0.100-preview.7.95 -> To Version 30.0.100-preview.7.100

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom
 From Version 6.0.0-preview.7.21368.2 -> To Version 6.0.0-preview.7.21376.17 (parent: Microsoft.Dotnet.Sdk.Internal
Copy link
Member

@jonathanpeppers jonathanpeppers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$(ProduceReferenceAssemblyInOutDir) seems to have done the trick; it doesn't need to be conditional.

@mattleibow mattleibow merged commit 64aecad into main Jul 27, 2021
@mattleibow mattleibow deleted the darc-main-cdabd48d-d1df-41dd-aba3-db6b2b1a34b4 branch July 27, 2021 22:02
@Eilon Eilon added the area-infrastructure CI, Maestro / Coherency, upstream dependencies/versions label Sep 30, 2021
@github-actions github-actions bot locked and limited conversation to collaborators Dec 22, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-infrastructure CI, Maestro / Coherency, upstream dependencies/versions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants