Skip to content

Commit a3e80cb

Browse files
authored
Merge pull request #82 from AvaloniaUtils/avalonia11.2
Fix proper routed events generic type
2 parents a898cdf + eec31f0 commit a3e80cb

File tree

2 files changed

+26
-24
lines changed

2 files changed

+26
-24
lines changed

DialogHost.Avalonia/DialogHost.axaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@ public class DialogHost : ContentControl {
8787
/// <summary>
8888
/// Identifies the <see cref="DialogOpened"/> routed event.
8989
/// </summary>
90-
public static readonly RoutedEvent DialogOpenedEvent =
90+
public static readonly RoutedEvent<DialogOpenedEventArgs> DialogOpenedEvent =
9191
RoutedEvent.Register<DialogHost, DialogOpenedEventArgs>(nameof(DialogOpened), RoutingStrategies.Bubble);
9292

9393
/// <summary>
9494
/// Identifies the <see cref="DialogClosing"/> routed event.
9595
/// </summary>
96-
public static readonly RoutedEvent DialogClosingEvent =
96+
public static readonly RoutedEvent<DialogClosingEventArgs> DialogClosingEvent =
9797
RoutedEvent.Register<DialogHost, DialogClosingEventArgs>(nameof(DialogClosing), RoutingStrategies.Bubble);
9898

9999
/// <summary>
Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<Nullable>enable</Nullable>
6-
<RootNamespace>DialogHostDemo</RootNamespace>
7-
<IsPackable>false</IsPackable>
8-
</PropertyGroup>
9-
<ItemGroup>
10-
<Folder Include="Models\" />
11-
<AvaloniaResource Include="Assets\**" />
12-
</ItemGroup>
13-
<ItemGroup>
14-
<PackageReference Include="Avalonia" Version="11.1.3" />
15-
<PackageReference Include="Avalonia.Desktop" Version="11.1.3" />
16-
<PackageReference Include="Avalonia.Diagnostics" Version="11.1.3" />
17-
<PackageReference Include="Avalonia.ReactiveUI" Version="11.1.3" />
18-
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.3" />
19-
<PackageReference Include="Material.Icons.Avalonia" Version="2.1.0" />
20-
</ItemGroup>
21-
<ItemGroup>
22-
<ProjectReference Include="..\DialogHost.Avalonia\DialogHost.Avalonia.csproj" />
23-
</ItemGroup>
2+
<PropertyGroup>
3+
<OutputType>WinExe</OutputType>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
<RootNamespace>DialogHostDemo</RootNamespace>
7+
<IsPackable>false</IsPackable>
8+
9+
<AvaloniaVersion>11.2.3</AvaloniaVersion>
10+
</PropertyGroup>
11+
<ItemGroup>
12+
<Folder Include="Models\"/>
13+
<AvaloniaResource Include="Assets\**"/>
14+
</ItemGroup>
15+
<ItemGroup>
16+
<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)"/>
17+
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)"/>
18+
<PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)"/>
19+
<PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)"/>
20+
<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)"/>
21+
<PackageReference Include="Material.Icons.Avalonia" Version="2.1.0"/>
22+
</ItemGroup>
23+
<ItemGroup>
24+
<ProjectReference Include="..\DialogHost.Avalonia\DialogHost.Avalonia.csproj"/>
25+
</ItemGroup>
2426
</Project>

0 commit comments

Comments
 (0)