holger/AvaloniaCoreRTDemo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Avalonia with fixed NativeMenuBar in AOT

Browse Source
This commit is contained in:
Maksym Katsydan 2022-11-19 23:48:23 -05:00
parent f55c202b93
commit 59bc165240
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/AvaloniaCoreRTDemo.csproj
View File

@ -40,14 +40,14 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="11.0.999-cibuild0026132-beta" /> <PackageReference Include="Avalonia" Version="11.0.999-cibuild0026389-beta" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.999-cibuild0026132-beta" /> <PackageReference Include="Avalonia.Desktop" Version="11.0.999-cibuild0026389-beta" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.999-cibuild0026132-beta" /> <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.999-cibuild0026389-beta" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.999-cibuild0026132-beta" /> <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.999-cibuild0026389-beta" />
<PackageReference Include="Avalonia.Themes.Simple" Version="11.0.999-cibuild0026132-beta" /> <PackageReference Include="Avalonia.Themes.Simple" Version="11.0.999-cibuild0026389-beta" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.999-cibuild0026132-beta" /> <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.999-cibuild0026389-beta" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.--> <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.999-cibuild0026132-beta" /> <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.999-cibuild0026389-beta" />
<!--Condition below is needed to generate macOS App only.--> <!--Condition below is needed to generate macOS App only.-->
<PackageReference Include="Dotnet.Bundle" Version="*" Condition="$(RuntimeIdentifier.StartsWith('osx'))" /> <PackageReference Include="Dotnet.Bundle" Version="*" Condition="$(RuntimeIdentifier.StartsWith('osx'))" />
</ItemGroup> </ItemGroup>

3
src/Windows/MainWindow.axaml
View File

@ -7,9 +7,6 @@
x:DataType="viewModels1:MainViewModelBase"> x:DataType="viewModels1:MainViewModelBase">
<DockPanel> <DockPanel>
<NativeMenuBar DockPanel.Dock="Top" /> <NativeMenuBar DockPanel.Dock="Top" />
<StackPanel DockPanel.Dock="Top">
<Button Content="About" Command="{Binding HelpAboutMethod}" />
</StackPanel>
<controls:MainControl/> <controls:MainControl/>
</DockPanel> </DockPanel>
<NativeMenu.Menu> <NativeMenu.Menu>