diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000..4b46221 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/Outlookish.sln b/Outlookish.sln index 8622348..ee42685 100644 --- a/Outlookish.sln +++ b/Outlookish.sln @@ -21,10 +21,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig CodeMaid.config = CodeMaid.config + Directory.Packages.props = Directory.Packages.props readme.md = readme.md EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleApp.Services", "SampleApp.Services\SampleApp.Services.csproj", "{1AFDDD2F-2AF5-4BF3-AE04-89A23B2991D3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleApp.Services", "SampleApp.Services\SampleApp.Services.csproj", "{1AFDDD2F-2AF5-4BF3-AE04-89A23B2991D3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/SampleApp.Services/SampleApp.Services.csproj b/SampleApp.Services/SampleApp.Services.csproj index 23fe4a7..2e224a4 100644 --- a/SampleApp.Services/SampleApp.Services.csproj +++ b/SampleApp.Services/SampleApp.Services.csproj @@ -1,11 +1,16 @@ - net6.0 + net7.0 enable enable + 11.0 + + + + diff --git a/source/SampleApp.Common/SampleApp.Common.csproj b/source/SampleApp.Common/SampleApp.Common.csproj index 7dd0a84..65ed6e0 100644 --- a/source/SampleApp.Common/SampleApp.Common.csproj +++ b/source/SampleApp.Common/SampleApp.Common.csproj @@ -1,15 +1,17 @@ - net6.0 + net7.0 ..\..\output + 11.0 - - - - + + + + + diff --git a/source/SampleApp.Common/TabControlAdapter.cs b/source/SampleApp.Common/TabControlAdapter.cs index 02c9187..970fbb5 100644 --- a/source/SampleApp.Common/TabControlAdapter.cs +++ b/source/SampleApp.Common/TabControlAdapter.cs @@ -59,8 +59,9 @@ protected override void Adapt(IRegion region, TabControl regionTarget) { var items = regionTarget.Items.Cast().ToList(); items.Add(new TabItem { Header = item.Tag, Content = item }); - regionTarget.Items = items; // Avalonia v0.10.x - //// regionTarget.Items.Set(items); // Avalonia v11 + + //// regionTarget.Items = items; // Avalonia v0.10.x + regionTarget.ItemsSource = items; // Avalonia v11.0 } } else if (e.Action == NotifyCollectionChangedAction.Remove) @@ -68,12 +69,13 @@ protected override void Adapt(IRegion region, TabControl regionTarget) foreach (UserControl item in e.OldItems) { var tabToDelete = regionTarget.Items.OfType().FirstOrDefault(n => n.Content == item); - // regionTarget.Items.Remove(tabToDelete); // WPF + // regionTarget.Items.Remove(tabToDelete); // WPF var items = regionTarget.Items.Cast().ToList(); items.Remove(tabToDelete); - regionTarget.Items = items; - //// regionTarget.Items.Set(items); // Avalonia v11 + + //// regionTarget.Items = items; // Avalonia v0.10 + regionTarget.ItemsSource = items; // Avalonia v11 } } }; diff --git a/source/SampleApp.Main/App.axaml b/source/SampleApp.Main/App.axaml index fbc31a6..2db8925 100644 --- a/source/SampleApp.Main/App.axaml +++ b/source/SampleApp.Main/App.axaml @@ -1,11 +1,13 @@ - + - + - - + --> + + + + diff --git a/source/SampleApp.Main/App.axaml.cs b/source/SampleApp.Main/App.axaml.cs index d939603..b449967 100644 --- a/source/SampleApp.Main/App.axaml.cs +++ b/source/SampleApp.Main/App.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia; +using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; using Prism.Ioc; @@ -45,7 +45,7 @@ protected override void ConfigureRegionAdapterMappings(RegionAdapterMappings reg regionAdapterMappings.RegisterMapping(typeof(TabControl), Container.Resolve()); } - protected override IAvaloniaObject CreateShell() + protected override AvaloniaObject CreateShell() { return this.Container.Resolve(); } @@ -75,4 +75,4 @@ protected override void RegisterTypes(IContainerRegistry containerRegistry) containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); } -} \ No newline at end of file +} diff --git a/source/SampleApp.Main/Core/RegionAdapters/GridRegionAdapter.cs b/source/SampleApp.Main/Core/RegionAdapters/GridRegionAdapter.cs index 4c80819..ba98fac 100644 --- a/source/SampleApp.Main/Core/RegionAdapters/GridRegionAdapter.cs +++ b/source/SampleApp.Main/Core/RegionAdapters/GridRegionAdapter.cs @@ -1,4 +1,4 @@ -using Avalonia.Controls; +using Avalonia.Controls; using Prism.Regions; namespace SampleApp.Main.Core.RegionAdapters @@ -16,14 +16,15 @@ protected override void Adapt(IRegion region, Grid regionTarget) { if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add) { - foreach (IControl item in e.NewItems) + foreach (Control item in e.NewItems) { regionTarget.Children.Add(item); } } + if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Remove) { - foreach (IControl item in e.OldItems) + foreach (Control item in e.OldItems) { regionTarget.Children.Remove(item); } @@ -33,4 +34,4 @@ protected override void Adapt(IRegion region, Grid regionTarget) protected override IRegion CreateRegion() => new SingleActiveRegion() { }; } -} \ No newline at end of file +} diff --git a/source/SampleApp.Main/Core/RegionAdapters/StackPanelRegionAdapter.cs b/source/SampleApp.Main/Core/RegionAdapters/StackPanelRegionAdapter.cs index 6e5eb7c..1da8139 100644 --- a/source/SampleApp.Main/Core/RegionAdapters/StackPanelRegionAdapter.cs +++ b/source/SampleApp.Main/Core/RegionAdapters/StackPanelRegionAdapter.cs @@ -1,4 +1,4 @@ -using Avalonia.Controls; +using Avalonia.Controls; using Prism.Regions; namespace SampleApp.Main.Core.RegionAdapters @@ -16,7 +16,7 @@ protected override void Adapt(IRegion region, StackPanel regionTarget) { if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add) { - foreach (IControl item in e.NewItems) + foreach (Control item in e.NewItems) { if (e.NewItems != null) regionTarget.Children.Add(item); @@ -25,7 +25,7 @@ protected override void Adapt(IRegion region, StackPanel regionTarget) if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Remove) { - foreach (IControl item in e.OldItems) + foreach (Control item in e.OldItems) { if (e.OldItems != null) regionTarget.Children.Remove(item); @@ -36,4 +36,4 @@ protected override void Adapt(IRegion region, StackPanel regionTarget) protected override IRegion CreateRegion() => new SingleActiveRegion() { }; } -} \ No newline at end of file +} diff --git a/source/SampleApp.Main/Program.cs b/source/SampleApp.Main/Program.cs index c291f08..747ddf0 100644 --- a/source/SampleApp.Main/Program.cs +++ b/source/SampleApp.Main/Program.cs @@ -1,4 +1,5 @@ using Avalonia; +using Avalonia.Controls; using Avalonia.ReactiveUI; namespace SampleApp @@ -13,10 +14,6 @@ public static AppBuilder BuildAvaloniaApp() => AppBuilder EnableMultiTouch = false, UseDBusMenu = true }) - .With(new Win32PlatformOptions { - EnableMultitouch = true, - AllowEglInitialization = true - }) .UseSkia() .UseReactiveUI() .LogToTrace(); diff --git a/source/SampleApp.Main/SampleApp.csproj b/source/SampleApp.Main/SampleApp.csproj index 78444d2..51715d0 100644 --- a/source/SampleApp.Main/SampleApp.csproj +++ b/source/SampleApp.Main/SampleApp.csproj @@ -1,20 +1,22 @@  WinExe - net6.0 + net7.0 enable + 11.0 - - - - - - + + + + + + + diff --git a/source/SampleApp.Modules.Calendar/SampleApp.Modules.Calendar.csproj b/source/SampleApp.Modules.Calendar/SampleApp.Modules.Calendar.csproj index 78c37d1..219fc08 100644 --- a/source/SampleApp.Modules.Calendar/SampleApp.Modules.Calendar.csproj +++ b/source/SampleApp.Modules.Calendar/SampleApp.Modules.Calendar.csproj @@ -1,9 +1,10 @@ library - net6.0 + net7.0 enable ..\..\output + 11.0 @@ -15,11 +16,12 @@ - - - - - + + + + + + diff --git a/source/SampleApp.Modules.Calendar/Views/CalendarView.axaml b/source/SampleApp.Modules.Calendar/Views/CalendarView.axaml index 36398f2..4fb4dc3 100644 --- a/source/SampleApp.Modules.Calendar/Views/CalendarView.axaml +++ b/source/SampleApp.Modules.Calendar/Views/CalendarView.axaml @@ -1,4 +1,4 @@ - - - - + diff --git a/source/SampleApp.Modules.Contacts/SampleApp.Modules.Contacts.csproj b/source/SampleApp.Modules.Contacts/SampleApp.Modules.Contacts.csproj index 78c37d1..219fc08 100644 --- a/source/SampleApp.Modules.Contacts/SampleApp.Modules.Contacts.csproj +++ b/source/SampleApp.Modules.Contacts/SampleApp.Modules.Contacts.csproj @@ -1,9 +1,10 @@ library - net6.0 + net7.0 enable ..\..\output + 11.0 @@ -15,11 +16,12 @@ - - - - - + + + + + + diff --git a/source/SampleApp.Modules.Mail/SampleApp.Modules.Mail.csproj b/source/SampleApp.Modules.Mail/SampleApp.Modules.Mail.csproj index b841a4d..8856028 100644 --- a/source/SampleApp.Modules.Mail/SampleApp.Modules.Mail.csproj +++ b/source/SampleApp.Modules.Mail/SampleApp.Modules.Mail.csproj @@ -1,19 +1,21 @@ library - net6.0 + net7.0 enable ..\..\output + 11.0 - - - - - + + + + + + diff --git a/source/SampleApp.Modules.Mail/Views/MailFocusedView.axaml b/source/SampleApp.Modules.Mail/Views/MailFocusedView.axaml index e1569a8..38fd178 100644 --- a/source/SampleApp.Modules.Mail/Views/MailFocusedView.axaml +++ b/source/SampleApp.Modules.Mail/Views/MailFocusedView.axaml @@ -1,4 +1,4 @@ - diff --git a/source/SampleApp.Modules.Message/SampleApp.Modules.Message.csproj b/source/SampleApp.Modules.Message/SampleApp.Modules.Message.csproj index 78c37d1..219fc08 100644 --- a/source/SampleApp.Modules.Message/SampleApp.Modules.Message.csproj +++ b/source/SampleApp.Modules.Message/SampleApp.Modules.Message.csproj @@ -1,9 +1,10 @@ library - net6.0 + net7.0 enable ..\..\output + 11.0 @@ -15,11 +16,12 @@ - - - - - + + + + + +