Skip to content

Update to Avalonia 12, Swap to ReactiveUI.SourceGenerators for samples #45

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

Merged
mysteryx93 merged 14 commits into from
Apr 24, 2026
Merged

Update to Avalonia 12, Swap to ReactiveUI.SourceGenerators for samples #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c1bc3c8
Updated to Avalonia 12.
FirehawkV21 Apr 17, 2026
ef21d66
Move to ReactUI.SourceGenerators. Fix some errors with NavigationView.
FirehawkV21 Apr 17, 2026
03659ca
Pull bin/obj into artifacts folders
FirehawkV21 Apr 17, 2026
527aaf9
Fixed up some of the demos.
FirehawkV21 Apr 17, 2026
1703b3d
Fixed more demos.
FirehawkV21 Apr 17, 2026
d3606de
More demo fixes, alongside fixing warnings from ReactiveUI.SsourceGen…
FirehawkV21 Apr 17, 2026
df7375a
Fix the last demo.
FirehawkV21 Apr 17, 2026
891cfab
Fix another demo.
FirehawkV21 Apr 17, 2026
5feae21
Found a better way for getting top level. Fixed error in Android sample.
FirehawkV21 Apr 17, 2026
6252562
Migrate to FluentAvalonia v3.
FirehawkV21 Apr 18, 2026
a43d192
Switch over to a fork for MessageBox.Avalonia (at least until the mai…
FirehawkV21 Apr 18, 2026
ae3aa1e
Mised a bit for debugging the Android app.
FirehawkV21 Apr 18, 2026
b00ecad
Switch back to MessageBox.Avalonia. Remove the deprecated DevTools (b…
FirehawkV21 Apr 21, 2026
d1c4c2a
Removed the commented code for the new dev tools.
FirehawkV21 Apr 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 23 additions & 21 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,32 @@
<ItemGroup>
<PackageVersion Include="Aura.UI" Version="0.1.5-dev-04" />
<PackageVersion Include="Aura.UI.FluentTheme" Version="0.1.5-dev-04" />
<PackageVersion Include="Avalonia" Version="11.3.12" />
<PackageVersion Include="Avalonia.Android" Version="11.3.12" />
<PackageVersion Include="Avalonia.Browser" Version="11.3.12" />
<PackageVersion Include="Avalonia.Desktop" Version="11.3.12" />
<PackageVersion Include="Avalonia.Diagnostics" Version="11.3.12" />
<PackageVersion Include="Avalonia.Fonts.Inter" Version="11.3.12" />
<PackageVersion Include="Avalonia.iOS" Version="11.3.12" />
<PackageVersion Include="Avalonia.Themes.Fluent" Version="11.3.12" />
<PackageVersion Include="ReactiveUI.Avalonia" Version="11.4.7" />
<PackageVersion Include="ReactiveUI" Version="23.1.8" />
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageVersion Include="coverlet.collector" Version="8.0.0" />
<PackageVersion Include="DialogHost.Avalonia" Version="0.10.4" />
<PackageVersion Include="FluentAvaloniaUI" Version="2.5.0" />
<PackageVersion Include="Avalonia" Version="12.0.1" />
<PackageVersion Include="Avalonia.Android" Version="12.0.1" />
<PackageVersion Include="Avalonia.Browser" Version="12.0.1" />
<PackageVersion Include="Avalonia.Desktop" Version="12.0.1" />
<PackageVersion Include="Avalonia.Diagnostics" Version="11.3.14" />
<PackageVersion Include="Avalonia.Fonts.Inter" Version="12.0.1" />
<PackageVersion Include="Avalonia.iOS" Version="12.0.1" />
<PackageVersion Include="Avalonia.Themes.Fluent" Version="12.0.1" />
<PackageVersion Include="Dragonhouse.Avalonia.MessageBox" Version="1.0.0" />
<PackageVersion Include="ReactiveUI.Avalonia" Version="12.0.1" />
<PackageVersion Include="ReactiveUI" Version="23.2.1" />
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" />
<PackageVersion Include="coverlet.collector" Version="10.0.0" />
<PackageVersion Include="DialogHost.Avalonia" Version="0.12.1" />
<PackageVersion Include="FluentAvaloniaUI" Version="3.0.0-preview1" />
<PackageVersion Include="HanumanInstitute.MvvmDialogs" Version="2.2.0" />
<PackageVersion Include="HanumanInstitute.MvvmDialogs.Avalonia" Version="2.2.0" />
<PackageVersion Include="HanumanInstitute.MvvmDialogs.Avalonia.MessageBox" Version="2.2.0" />
<PackageVersion Include="HanumanInstitute.MvvmDialogs.Wpf" Version="2.2.0" />
<PackageVersion Include="JetBrains.dotMemoryUnit" Version="3.2.20220510" />
<PackageVersion Include="MessageBox.Avalonia" Version="3.3.1.1" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.3" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.3" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="10.0.3" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageVersion Include="MessageBox.Avalonia" Version="12.0.0" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.6" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.7" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.7" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="10.0.7" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.142" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="NUnit" Version="4.5.0" />
Expand All @@ -40,10 +41,11 @@
<PackageVersion Include="Ookii.Dialogs.Wpf" Version="5.0.1" />
<PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
<PackageVersion Include="ReactiveUI.Drawing" Version="23.1.8" />
<PackageVersion Include="ReactiveUI.SourceGenerators" Version="2.6.1" />
<PackageVersion Include="System.Linq.Async" Version="7.0.0" />
<PackageVersion Include="Splat" Version="19.3.1" />
<PackageVersion Include="Splat.DependencyInjection.SourceGenerator" Version="2.2.2" />
<PackageVersion Include="System.Linq.AsyncEnumerable" Version="10.0.3" />
<PackageVersion Include="System.Linq.AsyncEnumerable" Version="10.0.7" />
<PackageVersion Include="TestStack.White.ScreenObjects" Version="0.13.3" />
<PackageVersion Include="xunit.v3" Version="3.2.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
Expand Down
47 changes: 24 additions & 23 deletions MvvmDialogs.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvvmDialogs.Wpf", "src\Mvvm
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Avalonia", "Avalonia", "{0CAFC532-721B-4CD0-B4CA-AF10F07BFD76}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Demo.ActivateNonModalDialog", "samples\Avalonia\Demo.ActivateNonModalDialog\Demo.ActivateNonModalDialog.csproj", "{696E93F8-4AAE-4230-9B6A-5BA53A69249D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Demo.CloseNonModalDialog", "samples\Avalonia\Demo.CloseNonModalDialog\Demo.CloseNonModalDialog.csproj", "{26E80F33-67D7-4F29-87E4-DFA45FBCF6B3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Demo.MessageBox", "samples\Avalonia\Demo.MessageBox\Demo.MessageBox.csproj", "{ADB64CA1-52F9-47B9-AC03-975D2C9E4022}"
Expand Down Expand Up @@ -109,6 +107,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
Directory.Packages.props = Directory.Packages.props
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demo.ActivateNonModalDialog.MvvmToolkit", "samples\Avalonia\Demo.ActivateNonModalDialog.MvvmToolkit\Demo.ActivateNonModalDialog.MvvmToolkit.csproj", "{84D06F7E-6381-7653-27C1-4FF4A0232C92}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -363,26 +363,6 @@ Global
{32D9C89C-9D88-40F9-A05D-CD95F05F38D0}.Release|x64.Build.0 = Release|Any CPU
{32D9C89C-9D88-40F9-A05D-CD95F05F38D0}.Release|x86.ActiveCfg = Release|Any CPU
{32D9C89C-9D88-40F9-A05D-CD95F05F38D0}.Release|x86.Build.0 = Release|Any CPU
{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Debug|ARM.ActiveCfg = Debug|Any CPU
{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Debug|ARM.Build.0 = Debug|Any CPU
{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Debug|ARM64.Build.0 = Debug|Any CPU
{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Debug|x64.ActiveCfg = Debug|Any CPU
{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Debug|x64.Build.0 = Debug|Any CPU
{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Debug|x86.ActiveCfg = Debug|Any CPU
{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Debug|x86.Build.0 = Debug|Any CPU
{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Release|Any CPU.Build.0 = Release|Any CPU
{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Release|ARM.ActiveCfg = Release|Any CPU
{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Release|ARM.Build.0 = Release|Any CPU
{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Release|ARM64.ActiveCfg = Release|Any CPU
{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Release|ARM64.Build.0 = Release|Any CPU
{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Release|x64.ActiveCfg = Release|Any CPU
{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Release|x64.Build.0 = Release|Any CPU
{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Release|x86.ActiveCfg = Release|Any CPU
{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Release|x86.Build.0 = Release|Any CPU
{26E80F33-67D7-4F29-87E4-DFA45FBCF6B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{26E80F33-67D7-4F29-87E4-DFA45FBCF6B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{26E80F33-67D7-4F29-87E4-DFA45FBCF6B3}.Debug|ARM.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -865,6 +845,7 @@ Global
{24D92E73-9429-48AD-A805-25CE7AF84D50}.Release|x86.Build.0 = Release|Any CPU
{497C1B3B-3326-45DB-BC0B-76C3EDAA26E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{497C1B3B-3326-45DB-BC0B-76C3EDAA26E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{497C1B3B-3326-45DB-BC0B-76C3EDAA26E0}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{497C1B3B-3326-45DB-BC0B-76C3EDAA26E0}.Debug|ARM.ActiveCfg = Debug|Any CPU
{497C1B3B-3326-45DB-BC0B-76C3EDAA26E0}.Debug|ARM.Build.0 = Debug|Any CPU
{497C1B3B-3326-45DB-BC0B-76C3EDAA26E0}.Debug|ARM64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -1023,6 +1004,26 @@ Global
{86D96E8C-F62A-4563-AFEF-1907F9280D7D}.Release|x64.Build.0 = Release|Any CPU
{86D96E8C-F62A-4563-AFEF-1907F9280D7D}.Release|x86.ActiveCfg = Release|Any CPU
{86D96E8C-F62A-4563-AFEF-1907F9280D7D}.Release|x86.Build.0 = Release|Any CPU
{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Debug|Any CPU.Build.0 = Debug|Any CPU
{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Debug|ARM.ActiveCfg = Debug|Any CPU
{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Debug|ARM.Build.0 = Debug|Any CPU
{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Debug|ARM64.Build.0 = Debug|Any CPU
{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Debug|x64.ActiveCfg = Debug|Any CPU
{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Debug|x64.Build.0 = Debug|Any CPU
{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Debug|x86.ActiveCfg = Debug|Any CPU
{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Debug|x86.Build.0 = Debug|Any CPU
{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Release|Any CPU.ActiveCfg = Release|Any CPU
{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Release|Any CPU.Build.0 = Release|Any CPU
{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Release|ARM.ActiveCfg = Release|Any CPU
{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Release|ARM.Build.0 = Release|Any CPU
{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Release|ARM64.ActiveCfg = Release|Any CPU
{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Release|ARM64.Build.0 = Release|Any CPU
{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Release|x64.ActiveCfg = Release|Any CPU
{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Release|x64.Build.0 = Release|Any CPU
{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Release|x86.ActiveCfg = Release|Any CPU
{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -1042,7 +1043,6 @@ Global
{E14F830F-2A00-46D0-B25B-B3D675E86B02} = {958591BB-32C1-48C4-B5FA-11A2C5686814}
{32D9C89C-9D88-40F9-A05D-CD95F05F38D0} = {958591BB-32C1-48C4-B5FA-11A2C5686814}
{0CAFC532-721B-4CD0-B4CA-AF10F07BFD76} = {62592C78-61AA-44B4-A7C3-EAC678A568A2}
{696E93F8-4AAE-4230-9B6A-5BA53A69249D} = {0CAFC532-721B-4CD0-B4CA-AF10F07BFD76}
{26E80F33-67D7-4F29-87E4-DFA45FBCF6B3} = {0CAFC532-721B-4CD0-B4CA-AF10F07BFD76}
{ADB64CA1-52F9-47B9-AC03-975D2C9E4022} = {0CAFC532-721B-4CD0-B4CA-AF10F07BFD76}
{89BFF856-E543-4EB5-B443-78B30D818D57} = {0CAFC532-721B-4CD0-B4CA-AF10F07BFD76}
Expand Down Expand Up @@ -1076,6 +1076,7 @@ Global
{3D577143-DEEA-42A4-B261-9A0846E537EF} = {0A8EF671-0277-4F7A-B03D-C6E227020E86}
{C9971FF8-3695-457F-8A78-CBDD098617D7} = {958591BB-32C1-48C4-B5FA-11A2C5686814}
{86D96E8C-F62A-4563-AFEF-1907F9280D7D} = {0CAFC532-721B-4CD0-B4CA-AF10F07BFD76}
{84D06F7E-6381-7653-27C1-4FF4A0232C92} = {0CAFC532-721B-4CD0-B4CA-AF10F07BFD76}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {983A22B3-AE5B-4B67-A798-F6A6697B82A8}
Expand Down
2 changes: 1 addition & 1 deletion samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Android/Demo.CrossPlatform.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net10.0-android36.0</TargetFramework>
<SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion>23.0</SupportedOSPlatformVersion>
<Nullable>enable</Nullable>
<ApplicationId>com.CompanyName.Avalonia11</ApplicationId>
<ApplicationVersion>1</ApplicationVersion>
Expand Down
27 changes: 19 additions & 8 deletions samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Android/MainActivity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,33 @@
using Android.App;
using System;
using Android.App;
using Android.Content.PM;
using Android.Runtime;
using Avalonia;
using Avalonia.Android;
using ReactiveUI.Avalonia;

namespace Demo.CrossPlatform.Android;

[Activity(
Label = "Avalonia11.Android",
Theme = "@style/MyTheme.NoActionBar",
Icon = "@drawable/icon",
MainLauncher = true,
ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
public class MainActivity : AvaloniaMainActivity<App>
[Application]
public class MainApplication : AvaloniaAndroidApplication<App>
{
protected MainApplication(IntPtr javaReference, JniHandleOwnership transfer) : base(javaReference, transfer)
{
}
protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
{
return base.CustomizeAppBuilder(builder)
.UseReactiveUI(rxui => { });
}
}

[Activity(
Label = "Avalonia12.Android",
Theme = "@style/MyTheme.NoActionBar",
Icon = "@drawable/icon",
MainLauncher = true,
ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
public class MainActivity : AvaloniaMainActivity
{

}
3 changes: 1 addition & 2 deletions samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Desktop/Demo.CrossPlatform.Desktop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Avalonia.Desktop"/>
<PackageReference Include="Avalonia.Desktop" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics"/>
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions samples/Avalonia/CrossPlatform/Demo.CrossPlatform.iOS/AppDelegate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Avalonia;
using Avalonia.iOS;
using Avalonia.ReactiveUI;
using Foundation;
using ReactiveUI.Avalonia;

namespace Demo.CrossPlatform.iOS;

Expand All @@ -13,6 +13,6 @@ public partial class AppDelegate : AvaloniaAppDelegate<App>
{
protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
{
return builder.UseReactiveUI();
return builder.UseReactiveUI(rxgui => { });
}
}
2 changes: 1 addition & 1 deletion samples/Avalonia/CrossPlatform/Demo.CrossPlatform.iOS/Demo.CrossPlatform.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net10.0-ios18.0</TargetFramework>
<TargetFramework>net10.0-ios26.0</TargetFramework>
<SupportedOSPlatformVersion>13.0</SupportedOSPlatformVersion>
<ProvisioningType>manual</ProvisioningType>
<Nullable>enable</Nullable>
Expand Down
4 changes: 2 additions & 2 deletions samples/Avalonia/CrossPlatform/Demo.CrossPlatform/App.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Avalonia.Markup.Xaml;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml;
using Demo.CrossPlatform.Services;
using Demo.CrossPlatform.ViewModels;
using HanumanInstitute.MvvmDialogs;
Expand Down Expand Up @@ -34,7 +35,6 @@ public override void Initialize()
public override void OnFrameworkInitializationCompleted()
{
DialogService.Show(null, MainViewModel);

base.OnFrameworkInitializationCompleted();
}

Expand Down
14 changes: 8 additions & 6 deletions samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Demo.CrossPlatform.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Avalonia"/>
<PackageReference Include="Avalonia.Themes.Fluent"/>
<PackageReference Include="Avalonia" />
<PackageReference Include="Avalonia.Themes.Fluent" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug"/>
<PackageReference Include="ReactiveUI.Fody"/>
<PackageReference Include="ReactiveUI.Avalonia"/>
<PackageReference Include="Microsoft.Extensions.Logging.Debug" />
<PackageReference Include="ReactiveUI.Avalonia" />
<PackageReference Include="ReactiveUI.SourceGenerators">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Splat.DependencyInjection.SourceGenerator">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
3 changes: 1 addition & 2 deletions samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Services/StorageService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ public class StorageService : IStorageService
}
if (app?.ApplicationLifetime is ISingleViewApplicationLifetime viewApp)
{
var visualRoot = viewApp.MainView?.GetVisualRoot();
return visualRoot as TopLevel;
return TopLevel.GetTopLevel(viewApp.MainView);
}
return null;
}
Expand Down
6 changes: 3 additions & 3 deletions samples/Avalonia/CrossPlatform/Demo.CrossPlatform/ViewModels/ConfirmCloseViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
using HanumanInstitute.MvvmDialogs;
using HanumanInstitute.MvvmDialogs.FrameworkDialogs;
using ReactiveUI;
using ReactiveUI.Fody.Helpers;
using ReactiveUI.SourceGenerators;

namespace Demo.CrossPlatform.ViewModels;

public class ConfirmCloseViewModel : ViewModelBase, IModalDialogViewModel, IViewClosing, IViewLoaded, ICloseable
public partial class ConfirmCloseViewModel : ViewModelBase, IModalDialogViewModel, IViewClosing, IViewLoaded, ICloseable
{
private readonly IDialogService _dialogService;
public event EventHandler? RequestClose;
Expand All @@ -20,7 +20,7 @@ public ConfirmCloseViewModel(IDialogService dialogService)
}

[Reactive]
public string Text { get; set; } = string.Empty;
public partial string Text { get; set; } = string.Empty;

public RxCommandUnit Close { get; }

Expand Down
6 changes: 3 additions & 3 deletions samples/Avalonia/CrossPlatform/Demo.CrossPlatform/ViewModels/MainViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
using HanumanInstitute.MvvmDialogs.FileSystem;
using HanumanInstitute.MvvmDialogs.FrameworkDialogs;
using ReactiveUI;
using ReactiveUI.Fody.Helpers;
using ReactiveUI.SourceGenerators;

namespace Demo.CrossPlatform.ViewModels;

public class MainViewModel : ViewModelBase
public partial class MainViewModel : ViewModelBase
{
private readonly IDialogService _dialogService;
private readonly IStorageService _storage;
Expand All @@ -39,7 +39,7 @@ public MainViewModel(IDialogService dialogService, IStorageService storage)
}

[Reactive]
public string? Output { get; set; }
public partial string? Output { get; set; }

private CurrentTimeViewModel? _dialogViewModel;
protected CurrentTimeViewModel? DialogViewModel
Expand Down
3 changes: 2 additions & 1 deletion samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Views/ConfirmCloseView.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:viewmodels="using:Demo.CrossPlatform.ViewModels"
xmlns:local="clr-namespace:Demo.CrossPlatform"
mc:Ignorable="d"
d:DataContext="{x:Static local:App.ConfirmCloseViewModel}">
d:DataContext="{x:Static local:App.ConfirmCloseViewModel}" x:DataType="viewmodels:ConfirmCloseViewModel">
<Grid>
<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
Text="{Binding Text}" />
Expand Down
3 changes: 0 additions & 3 deletions samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Views/ConfirmCloseWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ public partial class ConfirmCloseWindow : Window
public ConfirmCloseWindow()
{
InitializeComponent();
#if DEBUG
this.AttachDevTools();
#endif
}

private void InitializeComponent()
Expand Down
4 changes: 2 additions & 2 deletions samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Views/CurrentTimeView.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Demo.CrossPlatform"
xmlns:local="clr-namespace:Demo.CrossPlatform" xmlns:viewmodels="using:Demo.CrossPlatform.ViewModels"
mc:Ignorable="d"
d:DataContext="{x:Static local:App.CurrentTimeViewModel}">
d:DataContext="{x:Static local:App.CurrentTimeViewModel}" x:DataType="viewmodels:CurrentTimeViewModel">
<Grid>
<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
Text="{Binding CurrentTime, StringFormat=Current time is {0:HH:mm:ss}}" />
Expand Down
3 changes: 0 additions & 3 deletions samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Views/CurrentTimeWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ public partial class CurrentTimeWindow : Window
public CurrentTimeWindow()
{
InitializeComponent();
#if DEBUG
this.AttachDevTools();
#endif
}

private void InitializeComponent()
Expand Down
Loading