Merge pull request #82 from AvaloniaUtils/avalonia11.2

Fix proper routed events generic type
AvaloniaUtils · Jan 4, 2025 · a3e80cb · a3e80cb
2 parents a898cdf + eec31f0
commit a3e80cb
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git a/DialogHost.Avalonia/DialogHost.axaml.cs b/DialogHost.Avalonia/DialogHost.axaml.cs
@@ -87,13 +87,13 @@ public class DialogHost : ContentControl {
     /// <summary>
     /// Identifies the <see cref="DialogOpened"/> routed event.
     /// </summary>
-    public static readonly RoutedEvent DialogOpenedEvent =
+    public static readonly RoutedEvent<DialogOpenedEventArgs> DialogOpenedEvent =
         RoutedEvent.Register<DialogHost, DialogOpenedEventArgs>(nameof(DialogOpened), RoutingStrategies.Bubble);
 
     /// <summary>
     /// Identifies the <see cref="DialogClosing"/> routed event.
     /// </summary>
-    public static readonly RoutedEvent DialogClosingEvent =
+    public static readonly RoutedEvent<DialogClosingEventArgs> DialogClosingEvent =
         RoutedEvent.Register<DialogHost, DialogClosingEventArgs>(nameof(DialogClosing), RoutingStrategies.Bubble);
 
     /// <summary>

diff --git a/DialogHost.Demo/DialogHost.Demo.csproj b/DialogHost.Demo/DialogHost.Demo.csproj
@@ -1,24 +1,26 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <OutputType>WinExe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
-        <Nullable>enable</Nullable>
-        <RootNamespace>DialogHostDemo</RootNamespace>
-        <IsPackable>false</IsPackable>
-    </PropertyGroup>
-    <ItemGroup>
-        <Folder Include="Models\" />
-        <AvaloniaResource Include="Assets\**" />
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.1.3" />
-        <PackageReference Include="Avalonia.Desktop" Version="11.1.3" />
-        <PackageReference Include="Avalonia.Diagnostics" Version="11.1.3" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="11.1.3" />
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.3" />
-        <PackageReference Include="Material.Icons.Avalonia" Version="2.1.0" />
-    </ItemGroup>
-    <ItemGroup>
-      <ProjectReference Include="..\DialogHost.Avalonia\DialogHost.Avalonia.csproj" />
-    </ItemGroup>
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <RootNamespace>DialogHostDemo</RootNamespace>
+    <IsPackable>false</IsPackable>
+
+    <AvaloniaVersion>11.2.3</AvaloniaVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Folder Include="Models\"/>
+    <AvaloniaResource Include="Assets\**"/>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)"/>
+    <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)"/>
+    <PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)"/>
+    <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)"/>
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)"/>
+    <PackageReference Include="Material.Icons.Avalonia" Version="2.1.0"/>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\DialogHost.Avalonia\DialogHost.Avalonia.csproj"/>
+  </ItemGroup>
 </Project>