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.

Sign up for GitHub

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

Jump to bottom

[MacCatalyst] Add app icons for mac. #82

Merged
merged 1 commit into from
Mar 9, 2021
Merged

[MacCatalyst] Add app icons for mac. #82

merged 1 commit into from
Mar 9, 2021

Conversation

rolfbjarne
Copy link
Member

And remove app icons for other platforms.

@rolfbjarne
[MacCatalyst] Add app icons for mac.
a963f3c 
And remove app icons for other platforms.
@jonathanpeppers
Copy link
Member

Is the Catalyst template wrong, too?

https://github.com/xamarin/xamarin-macios/tree/main/dotnet/Microsoft.MacCatalyst.Templates/maccatalyst/Assets.xcassets/AppIcon.appiconset

@jonathanpeppers jonathanpeppers merged commit 3a6b516 into dotnet:develop Mar 9, 2021
@rolfbjarne
Copy link
Member Author

Is the Catalyst template wrong, too?

Yes, it's being fixed: xamarin/xamarin-macios#10815

Redth added a commit that referenced this pull request Mar 11, 2021
@Redth @jonathanpeppers
@emaf @rolfbjarne @dellis1972 @hartez @mattleibow @davidortinau
Develop (#86)
4792712 
* [azdo] add PR triggers for develop branch

Update README.md

* Adds instructions for building iOS from Windows (#60)

* Requires Xcode 12.4 now

Co-authored-by: Jonathan Peppers <[email protected]>

* Bump iOS to a version that can build for and run on device. (#63)

* Revert "[android] temporarily disable fast deployment (#64)"

This reverts commit 7711787.

* [android] use .NET 6 AndroidX packages (#68)

* Bump to Microsoft.Android.Sdk 11.0.200.118, which includes fixes for
  Fast Deployment & NuGet packages.
* Minor cleanup in `README.md`

* Added VSCode Support (#72)

This includes a sample `.vscode` folder and instructions on how to use it.

* Update README.md

Mostly formatting & markdown warnings

* Fix the ordering of the VSCode prompts. (#73)

The `Build` command was prompting for `Project->Build Target->Configuration`.
However the `Run` command was prompting for
`Project->TargetFramework->AttachDebugger->Configuration`.

It makes more sense to prompt for the debugger last. That way the order
of the prompts are similar.

* Bump .NET 6 P2, Android, iOS (#70)

* Bump to .NET 6.0.100-preview.2.21114.3
* Bump to Android 11.0.200.136
* Bump to iOS 14.4.100-ci.main.1167

Co-authored-by: Jonathan Peppers <[email protected]>

* GoodbyeForms

* Add a Mac Catalyst sample. (#71)

* Copy HelloIOS to HelloMacCatalyst & make it run on Catalyst.
* Update README with Mac Catalyst instructions
* Adds the Catalyst project to vs/net6-samples-ios.sln

Co-authored-by: Jonathan Peppers <[email protected]>

* Initial maui template

* Update storyboard bg color

* Remove old .xib

* Remove eager semicolon

* Fix Readme

* Make Font icon more noticeable

* Move app icon for now

* Add launcher title

* Typo

* Fix shared manifest name

* Update Catalyst build url

* Bump iOS and Mac Catalyst. (#74)

* [catalyst] make label visible in dark mode (#75)

In dark mode, the app was completely white.

It seems we can just use no background color, and I get the system default background color.

I used `Blue` text like the iOS sample.

* Add RID's

* Add Catalyst resources

* Bump MAUI version

* Update README.md

* Try make the sample a bit nicer

* no more

* More tweaks

* Update Info.plist

* Update HelloMaui.csproj

* Fix whitespace

* Only target catalyst on macos, not windows

* Goodbye Forms, hello .NET MAUI

* Update README.md

Co-authored-by: Matthew Leibowitz <[email protected]>

* Update HelloMaui/HelloMaui.csproj

Co-authored-by: Matthew Leibowitz <[email protected]>

* Bump to .NET 6.0.100-preview.2.21155.3 (#79)

* Android 11.0.200.148
* iOS 14.4.100.1180
* MacCatalyst 14.3.100.325
* README, fix .sln for HelloMaui
* Fix Release builds for HelloMaui

* Fix iOS .sln files

The iOS .sln files didn't have the Deploy setting applied that is needed for VS Windows.

* click counter and additional controls (#80)

* Bump to latest iOS & MacCatalyst packages (#81)

This includes a signed MacCatalyst package now.

* [MacCatalyst] Add app icons for mac. (#82)

And remove app icons for other platforms.

* Add things to the HelloMaui sample (#83)

* click counter and additional controls
* Add compat and images

Co-authored-by: David Ortinau <[email protected]>

* Update iOS & Mac Catalyst Builds (#84)

Changes: xamarin/xamarin-macios@cc1918e...98c8649

This fixes the 'dotnet new' templates.

* Update to .NET MAUI p2 package version

* Update HelloMaui.csproj

* [maui] wildcard parts of version numbers

Co-authored-by: Jonathan Peppers <[email protected]>
Co-authored-by: Emanuel Fernandez Dell'Oca <[email protected]>
Co-authored-by: Rolf Bjarne Kvinge <[email protected]>
Co-authored-by: Dean Ellis <[email protected]>
Co-authored-by: E.Z. Hart <[email protected]>
Co-authored-by: Matthew Leibowitz <[email protected]>
Co-authored-by: David Ortinau <[email protected]>
Redth added a commit that referenced this pull request Apr 8, 2021
@Redth @jonathanpeppers
@emaf @rolfbjarne @dellis1972 @hartez @mattleibow @davidortinau @pjcollins @rachelkang @PureWeen
.NET 6 Preview 3 (#127)
c6eb90d 
* [azdo] add PR triggers for develop branch

Update README.md

* Adds instructions for building iOS from Windows (#60)

* Requires Xcode 12.4 now

Co-authored-by: Jonathan Peppers <[email protected]>

* Bump iOS to a version that can build for and run on device. (#63)

* Revert "[android] temporarily disable fast deployment (#64)"

This reverts commit 7711787.

* [android] use .NET 6 AndroidX packages (#68)

* Bump to Microsoft.Android.Sdk 11.0.200.118, which includes fixes for
  Fast Deployment & NuGet packages.
* Minor cleanup in `README.md`

* Added VSCode Support (#72)

This includes a sample `.vscode` folder and instructions on how to use it.

* Update README.md

Mostly formatting & markdown warnings

* Fix the ordering of the VSCode prompts. (#73)

The `Build` command was prompting for `Project->Build Target->Configuration`.
However the `Run` command was prompting for
`Project->TargetFramework->AttachDebugger->Configuration`.

It makes more sense to prompt for the debugger last. That way the order
of the prompts are similar.

* Bump .NET 6 P2, Android, iOS (#70)

* Bump to .NET 6.0.100-preview.2.21114.3
* Bump to Android 11.0.200.136
* Bump to iOS 14.4.100-ci.main.1167

Co-authored-by: Jonathan Peppers <[email protected]>

* GoodbyeForms

* Add a Mac Catalyst sample. (#71)

* Copy HelloIOS to HelloMacCatalyst & make it run on Catalyst.
* Update README with Mac Catalyst instructions
* Adds the Catalyst project to vs/net6-samples-ios.sln

Co-authored-by: Jonathan Peppers <[email protected]>

* Initial maui template

* Update storyboard bg color

* Remove old .xib

* Remove eager semicolon

* Fix Readme

* Make Font icon more noticeable

* Move app icon for now

* Add launcher title

* Typo

* Fix shared manifest name

* Update Catalyst build url

* Bump iOS and Mac Catalyst. (#74)

* [catalyst] make label visible in dark mode (#75)

In dark mode, the app was completely white.

It seems we can just use no background color, and I get the system default background color.

I used `Blue` text like the iOS sample.

* Add RID's

* Add Catalyst resources

* Bump MAUI version

* Update README.md

* Try make the sample a bit nicer

* no more

* More tweaks

* Update Info.plist

* Update HelloMaui.csproj

* Fix whitespace

* Only target catalyst on macos, not windows

* Goodbye Forms, hello .NET MAUI

* Update README.md

Co-authored-by: Matthew Leibowitz <[email protected]>

* Update HelloMaui/HelloMaui.csproj

Co-authored-by: Matthew Leibowitz <[email protected]>

* Bump to .NET 6.0.100-preview.2.21155.3 (#79)

* Android 11.0.200.148
* iOS 14.4.100.1180
* MacCatalyst 14.3.100.325
* README, fix .sln for HelloMaui
* Fix Release builds for HelloMaui

* Fix iOS .sln files

The iOS .sln files didn't have the Deploy setting applied that is needed for VS Windows.

* click counter and additional controls (#80)

* Bump to latest iOS & MacCatalyst packages (#81)

This includes a signed MacCatalyst package now.

* [MacCatalyst] Add app icons for mac. (#82)

And remove app icons for other platforms.

* Add things to the HelloMaui sample (#83)

* click counter and additional controls
* Add compat and images

Co-authored-by: David Ortinau <[email protected]>

* Update iOS & Mac Catalyst Builds (#84)

Changes: xamarin/xamarin-macios@cc1918e...98c8649

This fixes the 'dotnet new' templates.

* Update to .NET MAUI p2 package version

* Update HelloMaui.csproj

* [maui] wildcard parts of version numbers

* [ios] ran 'dotnet format'

Fixed a namespace that was named weird, too.

* [macOS] add download link & sample (#89)

Fixes: #51

I brought this sample over from:

https://github.com/xamarin/xamarin-macios/tree/0e79b58fa8b07b0195ca611c7f1227036e44127b/tests/dotnet/MyCocoaApp

* Created a new `net6-samples-mac.sln` that we build only on Mac.

* Update net6-samples-mac.sln

Add HelloMacCatalystFSharp.csproj

* Update HelloMaui.csproj

* Bump to .NET 6.0.100-preview.3.21201.23 (#111)

* Android 11.0.200.195
* iOS 14.4.100.1320
* macOS 11.1.100.1373
* MacCatalyst 14.3.100.465
* Bump min iOS versions.

Co-authored-by: Rolf Bjarne Kvinge <[email protected]>

* Bump to .NET 6.0.100-preview.3.21202.5 (#119)

  * Android 11.0.200.196
  * iOS 14.4.100.1326
  * macOS 11.1.100.1379
  * MacCatalyst 14.3.100.471

* Update to latest MAUI

* Register font for HelloMaui

* Use resource styling

* Add comet debug config

* Add lifecycle event example

* [Maui] Target maccatalyst only if SDK exists (#120)

* Update README.md

* Add catalyst condition for mac/omnisharp

* Update HelloMaui.csproj

* Update HelloMaui.csproj

* Add new SemanticProperties to controls in sample for P3 (#123)

* Add SemanticProperties to sample controls

* Try to fix diffs

* Add missing word "tool" for installing maui check (#122)

* Update HelloMaui.csproj

* Winui3 (#118)

* WinUI3 sample project

* - resources

* - fix font

* - set root folder for windows images

* - nuget update

* - build samples with CI

* - readme updates

* - restore

* - update readme

* - fix tabs

* Update README.md

let's take the positive approach to the VS req for WinUI3 rather than describing what doesn't work.

* Update README.md

* - link hack

Co-authored-by: David Ortinau <[email protected]>

* Add mono env var to work around debugger issue (#124)

* Add mono env var to work around debugger issue

* Update HelloMaui.csproj

Co-authored-by: Jonathan Peppers <[email protected]>
Co-authored-by: Emanuel Fernandez Dell'Oca <[email protected]>
Co-authored-by: Rolf Bjarne Kvinge <[email protected]>
Co-authored-by: Dean Ellis <[email protected]>
Co-authored-by: E.Z. Hart <[email protected]>
Co-authored-by: Matthew Leibowitz <[email protected]>
Co-authored-by: David Ortinau <[email protected]>
Co-authored-by: Peter Collins <[email protected]>
Co-authored-by: Rachel Kang <[email protected]>
Co-authored-by: Shane Neuville <[email protected]>
@rolfbjarne rolfbjarne deleted the xamarin-macios-issue-10804 branch September 10, 2021 19:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonathanpeppers jonathanpeppers jonathanpeppers approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@rolfbjarne @jonathanpeppers