-
Notifications
You must be signed in to change notification settings - Fork 1.8k
[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
rmarinho
merged 5 commits into
main
from
darc-main-fbbbe4d1-a3b9-40fc-aace-b22e7d2f69da
Jul 14, 2021
Merged
[main] Update dependencies from xamarin/xamarin-macios #1578
rmarinho
merged 5 commits into
main
from
darc-main-fbbbe4d1-a3b9-40fc-aace-b22e7d2f69da
Jul 14, 2021
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…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`.
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.
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
approved these changes
Jul 13, 2021
There was a problem hiding this 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
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!
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request updates the following dependencies
From https://github.com/xamarin/xamarin-macios