Merged
Conversation
samhouts
approved these changes
May 12, 2020
PureWeen
pushed a commit
that referenced
this pull request
Feb 4, 2021
Fix DeviceInfo: Returning wrong device name
mattleibow
pushed a commit
that referenced
this pull request
Jun 18, 2022
* Initial commit * Got windows projects compiling * First pass as removing un-used code * Moved portable graphics code into Xamarin.Graphics.Core * More renaming. * More renaming. * More renaming. * Fixed shared project issue. * More renaming. * More renaming. * More cleanup/refactoring. * Removed stroke location. * More naming cleanups * More cleanup. * Switched to structs for Size, Rectangle and Point * Cleanup Android project. * Cleanup mac naming. * Fixed iOS naming. * Scrubbed elevenworks from files. * More scrubbing * More cleanup * Renamed files * Renamed files.
jonathanpeppers
added a commit
that referenced
this pull request
Sep 14, 2022
/Users/builder/azdo/_work/3/s/bin/dotnet/packs/Microsoft.MacCatalyst.Sdk/15.4.1153-rc.2/targets/Xamarin.Shared.Sdk.targets(371,3): error : Unable to merge the file 'Contents/Resources/Assets.car', it's different between the input app bundles. [/Users/builder/azdo/_work/3/s/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj::TargetFramework=net7.0-maccatalyst] /Users/builder/azdo/_work/3/s/bin/dotnet/packs/Microsoft.MacCatalyst.Sdk/15.4.1153-rc.2/targets/Xamarin.Shared.Sdk.targets(371,3): error : App bundle file #1: /Users/builder/azdo/_work/3/s/src/Controls/samples/Controls.Sample.Sandbox/bin/Release/net7.0-maccatalyst/maccatalyst-x64/Maui.Controls.Sample.Sandbox.app/Contents/Resources/Assets.car [/Users/builder/azdo/_work/3/s/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj::TargetFramework=net7.0-maccatalyst] /Users/builder/azdo/_work/3/s/bin/dotnet/packs/Microsoft.MacCatalyst.Sdk/15.4.1153-rc.2/targets/Xamarin.Shared.Sdk.targets(371,3): error : App bundle file #2: /Users/builder/azdo/_work/3/s/src/Controls/samples/Controls.Sample.Sandbox/bin/Release/net7.0-maccatalyst/maccatalyst-arm64/Maui.Controls.Sample.Sandbox.app/Contents/Resources/Assets.car [/Users/builder/azdo/_work/3/s/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj::TargetFramework=net7.0-maccatalyst]
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
No description provided.