From fe56e6742c81d2d976266dbcbf91027bf50d4800 Mon Sep 17 00:00:00 2001 From: Kunal22shah Date: Tue, 4 Jun 2024 17:03:46 -0400 Subject: [PATCH 1/6] feat: single proj migration- CommunityToolkitApp - part1 --- .../MauiCommunityToolkitApp/.editorconfig | 167 ++++++++++++ .../MauiCommunityToolkitApp/.gitignore | 4 +- .../.vscode/tasks.json | 1 - .../MauiCommunityToolkitApp/.vsconfig | 25 +- .../Directory.Build.props | 94 ++----- .../Directory.Build.targets | 6 +- .../Directory.Packages.props | 42 +-- .../MauiCommunityToolkitApp.Base/AppHead.xaml | 17 -- .../AppHead.xaml.cs | 28 -- .../MauiCommunityToolkitApp.Base.csproj | 12 - .../MauiCommunityToolkitApp.Base/base.props | 30 -- .../App.xaml | 4 +- .../App.xaml.cs | 8 +- .../AppBuilderExtensions.cs | 19 +- .../AvatarControl.xaml | 24 -- .../AvatarControl.xaml.cs | 10 - .../DrawingViewControl.xaml | 14 - .../DrawingViewControl.xaml.cs | 9 - .../EmbeddedControl.xaml | 40 +++ .../EmbeddedControl.xaml.cs | 20 ++ .../ExpanderControl.xaml | 22 -- .../ExpanderControl.xaml.cs | 9 - ...auiCommunityToolkitApp.MauiControls.csproj | 53 ++-- .../SnackbarControl.xaml | 29 -- .../SnackbarControl.xaml.cs | 87 ------ .../ToastControl.xaml | 10 - .../ToastControl.xaml.cs | 24 -- .../UnoImageConverter.cs | 20 ++ .../Android/Main.Android.cs | 43 --- .../MacCatalyst/Main.maccatalyst.cs | 14 - .../MauiCommunityToolkitApp.Mobile.csproj | 96 ------- .../iOS/Main.iOS.cs | 14 - .../MauiCommunityToolkitApp.Windows.csproj | 85 ------ .../Package.appxmanifest | 43 --- .../Properties/launchsettings.json | 10 - .../Resources.lang-en-us.resw | 123 --------- .../app.manifest | 25 -- .../MauiCommunityToolkitApp.sln | 256 ++++++------------ .../MauiCommunityToolkitApp/App.cs | 86 ------ .../MauiCommunityToolkitApp/App.xaml | 16 ++ .../MauiCommunityToolkitApp/App.xaml.cs | 134 +++++++++ .../MauiCommunityToolkitApp/AppResources.xaml | 12 - .../Assets/Icons/back.svg | 3 - .../Assets/Icons/icon.svg} | 2 +- .../Assets/Icons/icon_foreground.svg} | 2 +- .../Assets/SharedAssets.md | 32 +-- .../Assets}/Splash/splash_screen.svg | 2 +- .../Business/Models/AppConfig.cs | 2 +- .../MauiCommunityToolkitApp/GlobalUsings.cs | 2 +- .../Infrastructure/DebugHandler.cs | 68 ++--- .../MauiCommunityToolkitApp.csproj | 177 ++++++------ .../Package.appxmanifest | 43 +++ .../Platforms}/Android/AndroidManifest.xml | 0 .../Platforms}/Android/Assets/AboutAssets.txt | 0 .../Platforms/Android/Main.Android.cs | 43 +++ .../Android/MainActivity.Android.cs | 12 +- .../Android/Resources/AboutResources.txt | 0 .../Android/Resources/values/Strings.xml | 0 .../Android/Resources/values/Styles.xml | 0 .../Platforms}/Android/environment.conf | 0 .../Platforms}/MacCatalyst/Entitlements.plist | 0 .../Platforms}/MacCatalyst/Info.plist | 2 +- .../Platforms/MacCatalyst/Main.maccatalyst.cs | 14 + .../LaunchImages.launchimage/Contents.json | 0 .../PublishProfiles/win-arm64.pubxml | 8 +- .../Properties/PublishProfiles/win-x64.pubxml | 8 +- .../Properties/PublishProfiles/win-x86.pubxml | 8 +- .../Platforms}/iOS/Entitlements.plist | 0 .../Platforms}/iOS/Info.plist | 2 +- .../Platforms/iOS/Main.iOS.cs | 14 + .../LaunchImages.launchimage/Contents.json | 0 .../Platforms/iOS/PrivacyInfo.xcprivacy | 41 +++ .../Presentation/DrawingViewContent.xaml | 44 +-- .../Presentation/DrawingViewContent.xaml.cs | 10 +- .../Presentation/DrawingViewViewModel.cs | 14 +- .../Presentation/MainPage.xaml | 42 +-- .../Presentation/MainPage.xaml.cs | 10 +- .../Presentation/MainViewModel.cs | 2 + .../Presentation/Shell.xaml | 68 ++--- .../Presentation/Shell.xaml.cs | 12 +- .../Presentation/ShellViewModel.cs | 22 +- .../Properties/launchSettings.json | 21 ++ .../MauiCommunityToolkitApp/ReadMe.md | 7 + .../MauiCommunityToolkitApp/app.manifest | 25 ++ .../appsettings.development.json | 9 - .../MauiCommunityToolkitApp/appsettings.json | 16 -- .../docs}/assets/CommunityToolkit_Android.png | Bin .../docs}/assets/CommunityToolkit_Windows.png | Bin ...arty-sample-dotnetmauicommunitytoolkit.gif | Bin .../MauiCommunityToolkitApp/ReadMe.md | 27 -- .../MauiCommunityToolkitApp/global.json | 6 + .../solution-config.props.sample | 22 -- 92 files changed, 1050 insertions(+), 1577 deletions(-) create mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/.editorconfig delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.Base/AppHead.xaml delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.Base/AppHead.xaml.cs delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.Base/MauiCommunityToolkitApp.Base.csproj delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.Base/base.props delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/AvatarControl.xaml delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/AvatarControl.xaml.cs delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/DrawingViewControl.xaml delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/DrawingViewControl.xaml.cs create mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/EmbeddedControl.xaml create mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/EmbeddedControl.xaml.cs delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/ExpanderControl.xaml delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/ExpanderControl.xaml.cs delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/SnackbarControl.xaml delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/SnackbarControl.xaml.cs delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/ToastControl.xaml delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/ToastControl.xaml.cs create mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/UnoImageConverter.cs delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.Mobile/Android/Main.Android.cs delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.Mobile/MacCatalyst/Main.maccatalyst.cs delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.Mobile/MauiCommunityToolkitApp.Mobile.csproj delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.Mobile/iOS/Main.iOS.cs delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.Windows/MauiCommunityToolkitApp.Windows.csproj delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.Windows/Package.appxmanifest delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.Windows/Properties/launchsettings.json delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.Windows/Resources.lang-en-us.resw delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.Windows/app.manifest delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp/App.cs create mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp/App.xaml create mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp/App.xaml.cs delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp/AppResources.xaml delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp/Assets/Icons/back.svg rename UI/MauiEmbedding/MauiCommunityToolkitApp/{MauiCommunityToolkitApp.Base/Icons/iconapp.svg => MauiCommunityToolkitApp/Assets/Icons/icon.svg} (96%) rename UI/MauiEmbedding/MauiCommunityToolkitApp/{MauiCommunityToolkitApp.Base/Icons/appconfig.svg => MauiCommunityToolkitApp/Assets/Icons/icon_foreground.svg} (99%) rename UI/MauiEmbedding/MauiCommunityToolkitApp/{MauiCommunityToolkitApp.Base => MauiCommunityToolkitApp/Assets}/Splash/splash_screen.svg (99%) create mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp/Package.appxmanifest rename UI/MauiEmbedding/MauiCommunityToolkitApp/{MauiCommunityToolkitApp.Mobile => MauiCommunityToolkitApp/Platforms}/Android/AndroidManifest.xml (100%) rename UI/MauiEmbedding/MauiCommunityToolkitApp/{MauiCommunityToolkitApp.Mobile => MauiCommunityToolkitApp/Platforms}/Android/Assets/AboutAssets.txt (100%) create mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp/Platforms/Android/Main.Android.cs rename UI/MauiEmbedding/MauiCommunityToolkitApp/{MauiCommunityToolkitApp.Mobile => MauiCommunityToolkitApp/Platforms}/Android/MainActivity.Android.cs (56%) rename UI/MauiEmbedding/MauiCommunityToolkitApp/{MauiCommunityToolkitApp.Mobile => MauiCommunityToolkitApp/Platforms}/Android/Resources/AboutResources.txt (100%) rename UI/MauiEmbedding/MauiCommunityToolkitApp/{MauiCommunityToolkitApp.Mobile => MauiCommunityToolkitApp/Platforms}/Android/Resources/values/Strings.xml (100%) rename UI/MauiEmbedding/MauiCommunityToolkitApp/{MauiCommunityToolkitApp.Mobile => MauiCommunityToolkitApp/Platforms}/Android/Resources/values/Styles.xml (100%) rename UI/MauiEmbedding/MauiCommunityToolkitApp/{MauiCommunityToolkitApp.Mobile => MauiCommunityToolkitApp/Platforms}/Android/environment.conf (100%) rename UI/MauiEmbedding/MauiCommunityToolkitApp/{MauiCommunityToolkitApp.Mobile => MauiCommunityToolkitApp/Platforms}/MacCatalyst/Entitlements.plist (100%) rename UI/MauiEmbedding/MauiCommunityToolkitApp/{MauiCommunityToolkitApp.Mobile => MauiCommunityToolkitApp/Platforms}/MacCatalyst/Info.plist (93%) create mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp/Platforms/MacCatalyst/Main.maccatalyst.cs rename UI/MauiEmbedding/MauiCommunityToolkitApp/{MauiCommunityToolkitApp.Mobile => MauiCommunityToolkitApp/Platforms}/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json (100%) rename UI/MauiEmbedding/MauiCommunityToolkitApp/{MauiCommunityToolkitApp.Windows => MauiCommunityToolkitApp/Platforms/Windows}/Properties/PublishProfiles/win-arm64.pubxml (67%) rename UI/MauiEmbedding/MauiCommunityToolkitApp/{MauiCommunityToolkitApp.Windows => MauiCommunityToolkitApp/Platforms/Windows}/Properties/PublishProfiles/win-x64.pubxml (67%) rename UI/MauiEmbedding/MauiCommunityToolkitApp/{MauiCommunityToolkitApp.Windows => MauiCommunityToolkitApp/Platforms/Windows}/Properties/PublishProfiles/win-x86.pubxml (67%) rename UI/MauiEmbedding/MauiCommunityToolkitApp/{MauiCommunityToolkitApp.Mobile => MauiCommunityToolkitApp/Platforms}/iOS/Entitlements.plist (100%) rename UI/MauiEmbedding/MauiCommunityToolkitApp/{MauiCommunityToolkitApp.Mobile => MauiCommunityToolkitApp/Platforms}/iOS/Info.plist (95%) create mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp/Platforms/iOS/Main.iOS.cs rename UI/MauiEmbedding/MauiCommunityToolkitApp/{MauiCommunityToolkitApp.Mobile => MauiCommunityToolkitApp/Platforms}/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json (100%) create mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp/Platforms/iOS/PrivacyInfo.xcprivacy create mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp/Properties/launchSettings.json create mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp/ReadMe.md create mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp/app.manifest delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp/appsettings.development.json delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp/appsettings.json rename UI/MauiEmbedding/MauiCommunityToolkitApp/{doc => MauiCommunityToolkitApp/docs}/assets/CommunityToolkit_Android.png (100%) rename UI/MauiEmbedding/MauiCommunityToolkitApp/{doc => MauiCommunityToolkitApp/docs}/assets/CommunityToolkit_Windows.png (100%) rename UI/MauiEmbedding/MauiCommunityToolkitApp/{doc => MauiCommunityToolkitApp/docs}/assets/third-party-sample-dotnetmauicommunitytoolkit.gif (100%) delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/ReadMe.md create mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/global.json delete mode 100644 UI/MauiEmbedding/MauiCommunityToolkitApp/solution-config.props.sample diff --git a/UI/MauiEmbedding/MauiCommunityToolkitApp/.editorconfig b/UI/MauiEmbedding/MauiCommunityToolkitApp/.editorconfig new file mode 100644 index 000000000..b947be645 --- /dev/null +++ b/UI/MauiEmbedding/MauiCommunityToolkitApp/.editorconfig @@ -0,0 +1,167 @@ +; This file is for unifying the coding style for different editors and IDEs. +; More information at http://editorconfig.org + +# This file is the top-most EditorConfig file +root = true + +########################################## +# Common Settings +########################################## + +[*] +indent_style = space +end_of_line = crlf +trim_trailing_whitespace = true +insert_final_newline = true +charset = utf-8 + +########################################## +# File Extension Settings +########################################## + +[*.{yml,yaml}] +indent_size = 2 + +[.vsconfig] +indent_size = 2 +end_of_line = lf + +[*.sln] +indent_style = tab +indent_size = 2 + +[*.{csproj,proj,projitems,shproj}] +indent_size = 2 + +[*.{json,slnf}] +indent_size = 2 +end_of_line = lf + +[*.{props,targets}] +indent_size = 2 + +[*.xaml] +indent_size = 2 +charset = utf-8-bom + +[*.xml] +indent_size = 2 +end_of_line = lf + +[*.plist] +indent_size = 2 +indent_style = tab +end_of_line = lf + +[*.manifest] +indent_size = 2 + +[*.appxmanifest] +indent_size = 2 + +[*.{json,css,webmanifest}] +indent_size = 2 +end_of_line = lf + +[web.config] +indent_size = 2 +end_of_line = lf + +[*.sh] +indent_size = 2 +end_of_line = lf + +[*.cs] +# EOL should be normalized by Git. See https://github.com/dotnet/format/issues/1099 +end_of_line = unset + +# See https://github.com/dotnet/roslyn/issues/20356#issuecomment-310143926 +trim_trailing_whitespace = false + +tab_width = 4 +indent_size = 4 + +# Sort using and Import directives with System.* appearing first +dotnet_sort_system_directives_first = true + +# Avoid "this." and "Me." if not necessary +dotnet_style_qualification_for_field = false:suggestion +dotnet_style_qualification_for_property = false:suggestion +dotnet_style_qualification_for_method = false:suggestion +dotnet_style_qualification_for_event = false:suggestion + +#### Naming styles #### + +# Naming rules + +dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion +dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface +dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i + +dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.types_should_be_pascal_case.symbols = types +dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case + +dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members +dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case + +# Symbol specifications + +dotnet_naming_symbols.interface.applicable_kinds = interface +dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.interface.required_modifiers = + +dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum +dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.types.required_modifiers = + +dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method +dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.non_field_members.required_modifiers = + +# Naming styles + +dotnet_naming_style.begins_with_i.required_prefix = I +dotnet_naming_style.begins_with_i.required_suffix = +dotnet_naming_style.begins_with_i.word_separator = +dotnet_naming_style.begins_with_i.capitalization = pascal_case + +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = +dotnet_naming_style.pascal_case.capitalization = pascal_case + +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = +dotnet_naming_style.pascal_case.capitalization = pascal_case +dotnet_style_operator_placement_when_wrapping = beginning_of_line +dotnet_style_coalesce_expression = true:suggestion +dotnet_style_null_propagation = true:suggestion +dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion +dotnet_style_prefer_auto_properties = true:silent +dotnet_style_object_initializer = true:suggestion +dotnet_style_collection_initializer = true:suggestion +dotnet_style_prefer_simplified_boolean_expressions = true:suggestion +dotnet_style_prefer_conditional_expression_over_assignment = true:silent +dotnet_style_prefer_conditional_expression_over_return = true:silent +dotnet_style_explicit_tuple_names = true:suggestion +dotnet_style_prefer_inferred_tuple_names = true:suggestion + +csharp_indent_labels = one_less_than_current +csharp_using_directive_placement = outside_namespace:silent +csharp_prefer_simple_using_statement = true:suggestion +csharp_prefer_braces = true:silent +csharp_style_namespace_declarations = file_scoped:warning +csharp_style_prefer_method_group_conversion = true:silent +csharp_style_prefer_top_level_statements = true:silent +csharp_style_prefer_primary_constructors = true:suggestion +csharp_style_expression_bodied_methods = false:silent +csharp_style_expression_bodied_constructors = false:silent +csharp_style_expression_bodied_operators = false:silent +csharp_style_expression_bodied_properties = true:silent +csharp_style_expression_bodied_indexers = true:silent +csharp_style_expression_bodied_accessors = true:silent +csharp_style_expression_bodied_lambdas = true:silent +csharp_style_expression_bodied_local_functions = false:silent diff --git a/UI/MauiEmbedding/MauiCommunityToolkitApp/.gitignore b/UI/MauiEmbedding/MauiCommunityToolkitApp/.gitignore index bc55501a7..ef88c2053 100644 --- a/UI/MauiEmbedding/MauiCommunityToolkitApp/.gitignore +++ b/UI/MauiEmbedding/MauiCommunityToolkitApp/.gitignore @@ -399,5 +399,5 @@ FodyWeavers.xsd # Single Target Config solution-config.props -# Windows Publish Profiles -!**/*.Windows/Properties/PublishProfiles/*.pubxml \ No newline at end of file +# Publish Profiles +!**/Properties/PublishProfiles/*.pubxml \ No newline at end of file diff --git a/UI/MauiEmbedding/MauiCommunityToolkitApp/.vscode/tasks.json b/UI/MauiEmbedding/MauiCommunityToolkitApp/.vscode/tasks.json index 02ee36589..54d839243 100644 --- a/UI/MauiEmbedding/MauiCommunityToolkitApp/.vscode/tasks.json +++ b/UI/MauiEmbedding/MauiCommunityToolkitApp/.vscode/tasks.json @@ -1,6 +1,5 @@ { "version": "2.0.0", "tasks": [ - ] } diff --git a/UI/MauiEmbedding/MauiCommunityToolkitApp/.vsconfig b/UI/MauiEmbedding/MauiCommunityToolkitApp/.vsconfig index 1c9c22808..2eb121686 100644 --- a/UI/MauiEmbedding/MauiCommunityToolkitApp/.vsconfig +++ b/UI/MauiEmbedding/MauiCommunityToolkitApp/.vsconfig @@ -5,34 +5,23 @@ "Microsoft.VisualStudio.Workload.CoreEditor", "Microsoft.NetCore.Component.SDK", "Microsoft.NetCore.Component.DevelopmentTools", - "Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions", - "Microsoft.NetCore.Component.Web", "Microsoft.Net.ComponentGroup.DevelopmentPrerequisites", "Microsoft.VisualStudio.Component.TextTemplating", - "Microsoft.VisualStudio.Component.IISExpress", - "Component.Microsoft.Web.LibraryManager", - "Microsoft.VisualStudio.ComponentGroup.Web", - "Microsoft.VisualStudio.Component.Web", - "Microsoft.VisualStudio.ComponentGroup.Web.Client", - "Microsoft.VisualStudio.Workload.NetWeb", - "Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites", - "Microsoft.VisualStudio.Workload.Azure", "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging", "Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites", "Microsoft.VisualStudio.Component.Debugger.JustInTime", - "Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging", "Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.Component.NetFX.Native", "Microsoft.VisualStudio.Component.Graphics", - "Component.OpenJDK", - "Microsoft.VisualStudio.Component.MonoDebugger", "Microsoft.VisualStudio.Component.Merq", "Component.Xamarin.RemotedSimulator", - "Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine", - "Component.Xamarin", - "Component.Android.SDK32", + "Microsoft.VisualStudio.Component.MonoDebugger", + "Microsoft.VisualStudio.ComponentGroup.Maui.All", + "Component.Android.SDK34", + "Component.Android.SDK33", + "Component.OpenJDK", "Microsoft.VisualStudio.Workload.NetCrossPlat", - "Microsoft.VisualStudio.Workload.NetCoreTools", - "Microsoft.VisualStudio.ComponentGroup.Maui.All" + "Microsoft.VisualStudio.Workload.NetCoreTools" ] } diff --git a/UI/MauiEmbedding/MauiCommunityToolkitApp/Directory.Build.props b/UI/MauiEmbedding/MauiCommunityToolkitApp/Directory.Build.props index 89caf9ab0..2641d132e 100644 --- a/UI/MauiEmbedding/MauiCommunityToolkitApp/Directory.Build.props +++ b/UI/MauiEmbedding/MauiCommunityToolkitApp/Directory.Build.props @@ -1,74 +1,24 @@ - - - - - - - enable - enable - - portable - True - - true - - $(NoWarn);CA1416;NU1507;NETSDK1023 - - en - - false - false - false - false - false - - 8.0.7 - 1.10.0.1 - 2.6.0.1 - 1.3.0.1 - - - - - - true - 21.0 - - - - - true - 14.2 - - - - - true - 10.14 - - - - - true - 14.0 - - - - - true - - 10.0.19041.0 - 10.0.19041.0 - win-x86;win-x64;win-arm64 - - - - - + + enable + enable + true + + + $(NoWarn);NU1507;NETSDK1201;NETSDK1023;PRI257 + + + + + 4.1.23 + 6.0.18 + 5.0.13 + 5.2.14 + diff --git a/UI/MauiEmbedding/MauiCommunityToolkitApp/Directory.Build.targets b/UI/MauiEmbedding/MauiCommunityToolkitApp/Directory.Build.targets index 30332cf7d..f75adf7e4 100644 --- a/UI/MauiEmbedding/MauiCommunityToolkitApp/Directory.Build.targets +++ b/UI/MauiEmbedding/MauiCommunityToolkitApp/Directory.Build.targets @@ -1,6 +1,2 @@ - - - - - + diff --git a/UI/MauiEmbedding/MauiCommunityToolkitApp/Directory.Packages.props b/UI/MauiEmbedding/MauiCommunityToolkitApp/Directory.Packages.props index 1cae68bc8..3a69a2b1c 100644 --- a/UI/MauiEmbedding/MauiCommunityToolkitApp/Directory.Packages.props +++ b/UI/MauiEmbedding/MauiCommunityToolkitApp/Directory.Packages.props @@ -1,38 +1,12 @@ - - - - - + + + + + \ No newline at end of file diff --git a/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.Base/AppHead.xaml b/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.Base/AppHead.xaml deleted file mode 100644 index 0910af3e4..000000000 --- a/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.Base/AppHead.xaml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - diff --git a/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.Base/AppHead.xaml.cs b/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.Base/AppHead.xaml.cs deleted file mode 100644 index 496306b2f..000000000 --- a/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.Base/AppHead.xaml.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Microsoft.UI.Xaml; -using Uno.Resizetizer; - -namespace MauiCommunityToolkitApp; - -public sealed partial class AppHead : App -{ - /// - /// Initializes the singleton application object. This is the first line of authored code - /// executed, and as such is the logical equivalent of main() or WinMain(). - /// - public AppHead() - { - this.InitializeComponent(); - } - - /// - /// Invoked when the application is launched normally by the end user. Other entry points - /// will be used such as when the application is launched to open a specific file. - /// - /// Details about the launch request and process. - protected override void OnLaunched(LaunchActivatedEventArgs args) - { - base.OnLaunched(args); - - MainWindow.SetWindowIcon(); - } -} diff --git a/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.Base/MauiCommunityToolkitApp.Base.csproj b/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.Base/MauiCommunityToolkitApp.Base.csproj deleted file mode 100644 index 82a9732e3..000000000 --- a/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.Base/MauiCommunityToolkitApp.Base.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - net8.0 - false - - - - - - - \ No newline at end of file diff --git a/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.Base/base.props b/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.Base/base.props deleted file mode 100644 index 9b39b5c0e..000000000 --- a/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.Base/base.props +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/App.xaml b/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/App.xaml index 8ef0da32d..0cd4e8a95 100644 --- a/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/App.xaml +++ b/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/App.xaml @@ -1,13 +1,15 @@  + xmlns:local="clr-namespace:MauiCommunityToolkitApp" + x:Class="MauiCommunityToolkitApp.MauiControls.App"> + diff --git a/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/App.xaml.cs b/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/App.xaml.cs index b379c2797..101660ad7 100644 --- a/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/App.xaml.cs +++ b/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/App.xaml.cs @@ -2,8 +2,8 @@ public partial class App : Application { - public App() - { - InitializeComponent(); - } + public App() + { + InitializeComponent(); + } } diff --git a/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/AppBuilderExtensions.cs b/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/AppBuilderExtensions.cs index b743d7387..9fd8fe064 100644 --- a/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/AppBuilderExtensions.cs +++ b/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/AppBuilderExtensions.cs @@ -1,15 +1,12 @@ -using CommunityToolkit.Maui; - namespace MauiCommunityToolkitApp; public static class AppBuilderExtensions { - public static MauiAppBuilder UseMauiControls(this MauiAppBuilder builder) => - builder - .UseMauiCommunityToolkit() - .ConfigureFonts(fonts => - { - fonts.AddFont("MauiCommunityToolkitApp/Assets/Fonts/OpenSansRegular.ttf", "OpenSansRegular"); - fonts.AddFont("MauiCommunityToolkitApp/Assets/Fonts/OpenSansSemibold.ttf", "OpenSansSemibold"); - }); -} \ No newline at end of file + public static MauiAppBuilder UseMauiControls(this MauiAppBuilder builder) => + builder + .ConfigureFonts(fonts => + { + fonts.AddFont("Assets/Fonts/OpenSansRegular.ttf", "OpenSansRegular"); + fonts.AddFont("Assets/Fonts/OpenSansSemibold.ttf", "OpenSansSemibold"); + }); +} diff --git a/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/AvatarControl.xaml b/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/AvatarControl.xaml deleted file mode 100644 index 2da77dbef..000000000 --- a/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/AvatarControl.xaml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - diff --git a/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/AvatarControl.xaml.cs b/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/AvatarControl.xaml.cs deleted file mode 100644 index 533d1d002..000000000 --- a/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/AvatarControl.xaml.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace MauiCommunityToolkitApp.MauiControls; - -public partial class AvatarControl : ContentView -{ - public AvatarControl() - { - InitializeComponent(); - } - -} \ No newline at end of file diff --git a/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/DrawingViewControl.xaml b/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/DrawingViewControl.xaml deleted file mode 100644 index 5d6036331..000000000 --- a/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/DrawingViewControl.xaml +++ /dev/null @@ -1,14 +0,0 @@ - - - - diff --git a/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/DrawingViewControl.xaml.cs b/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/DrawingViewControl.xaml.cs deleted file mode 100644 index 13119799b..000000000 --- a/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/DrawingViewControl.xaml.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace MauiCommunityToolkitApp.MauiControls; - -public partial class DrawingViewControl : ContentView -{ - public DrawingViewControl() - { - InitializeComponent(); - } -} \ No newline at end of file diff --git a/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/EmbeddedControl.xaml b/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/EmbeddedControl.xaml new file mode 100644 index 000000000..113e45217 --- /dev/null +++ b/UI/MauiEmbedding/MauiCommunityToolkitApp/MauiCommunityToolkitApp.MauiControls/EmbeddedControl.xaml @@ -0,0 +1,40 @@ + + + + + + +