Skip to content

[main] Update dependencies from xamarin/xamarin-macios #1578

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

Merged
merged 5 commits into from
Jul 14, 2021

Conversation

dotnet-maestro[bot]
Copy link
Contributor

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

This pull request updates the following dependencies

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

  • Subscription: 5db7deb0-21d8-4d93-995a-08d920866296
  • Build: 20210713.19
  • Date Produced: 7/14/2021 2:25 AM
  • Commit: a202354c711b3d0e09e595c3f257b438bc8b3bec
  • Branch: refs/heads/main

dotnet-maestro bot and others added 2 commits July 8, 2021 11:21
…ild 20210707.26

Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk
 From Version 12.0.100-preview.6.63 -> To Version 12.0.100-ci.main.142
The names are now `maccatalyst`, `macos`, `ios`, and `tvos`.
@jonathanpeppers jonathanpeppers marked this pull request as draft July 8, 2021 19:43
@jonathanpeppers
Copy link
Member

We might bump iOS the same time as Android, and go with: #1577

jonathanpeppers added a commit to jonathanpeppers/xamarin-macios that referenced this pull request Jul 9, 2021
Context: dotnet/maui#1578

In the latest xamarin-macios bump, the dotnent/maui build started
failing because the `$(OutputPath)` of all the projects changed from:

    bin/Debug/net6.0-ios/
    bin/Debug/net6.0-maccatalyst/

To:

    bin/Debug/net6.0-ios/iossimulator-x64/
    bin/Debug/net6.0-maccatalyst/maccatalyst-x64/

Class library projects appear to have `$(RuntimeIdentifier)` set by
default. I don't think this is needed, because class libraries do not
need to be compiled as `--self-contained` apps.

On the Android side, we only set a default `$(RuntimeIdentifiers)` for
application projects:

https://github.com/xamarin/xamarin-android/blob/7c5fab13329ee898fb1562f83576a7ca881f2881/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets#L49-L61

I think the correct change here is to check:

    '$(OutputType)' == 'Exe' Or '$(IsAppExtension)' == 'true'

So Apple platforms only put a default `$(RuntimeIdentifier)` for
applications or extensions.
@jonathanpeppers
Copy link
Member

We can come back to this after this fix lands: dotnet/macios#12093

…ild 20210709.17

Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk
 From Version 12.0.100-preview.6.63 -> To Version 12.0.100-ci.main.150
rolfbjarne added a commit to dotnet/macios that referenced this pull request Jul 13, 2021
Context: dotnet/maui#1578

In the latest xamarin-macios bump, the dotnent/maui build started
failing because the `$(OutputPath)` of all the projects changed from:

    bin/Debug/net6.0-ios/
    bin/Debug/net6.0-maccatalyst/

To:

    bin/Debug/net6.0-ios/iossimulator-x64/
    bin/Debug/net6.0-maccatalyst/maccatalyst-x64/

Class library projects appear to have `$(RuntimeIdentifier)` set by
default. I don't think this is needed, because class libraries do not
need to be compiled as `--self-contained` apps.

On the Android side, we only set a default `$(RuntimeIdentifiers)` for
application projects:

https://github.com/xamarin/xamarin-android/blob/7c5fab13329ee898fb1562f83576a7ca881f2881/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets#L49-L61

I think the correct change here is to check:

    '$(OutputType)' == 'Exe' Or '$(IsAppExtension)' == 'true'

So Apple platforms only put a default `$(RuntimeIdentifier)` for
applications or extensions.

Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
…ild 20210713.6

Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk
 From Version 12.0.100-preview.6.63 -> To Version 12.0.100-ci.main.159
@jonathanpeppers jonathanpeppers marked this pull request as ready for review July 13, 2021 22:09
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.

If this is green, it's good to merge.

…ild 20210713.19

Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk
 From Version 12.0.100-preview.6.63 -> To Version 12.0.100-ci.main.162
@rmarinho rmarinho merged commit c3becf7 into main Jul 14, 2021
@rmarinho rmarinho deleted the darc-main-fbbbe4d1-a3b9-40fc-aace-b22e7d2f69da branch July 14, 2021 18:58
@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 25, 2023
@samhouts samhouts added the fixed-in-6.0.100-preview.7.3 Look for this fix in 6.0.100-preview.7.3! label Aug 2, 2024
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 fixed-in-6.0.100-preview.7.3 Look for this fix in 6.0.100-preview.7.3!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants