Skip to content
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

Update Avalonia version to stable latest #1357

Closed
wants to merge 1 commit into from
Closed

Update Avalonia version to stable latest #1357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions demo/dotnet-vui/AvaloniaVUI/App.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
</Application.DataTemplates>

<Application.Styles>
<StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
<SimpleTheme />
</Application.Styles>
</Application>
8 changes: 5 additions & 3 deletions demo/dotnet-vui/AvaloniaVUI/AvaloniaVUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@
<None Remove="Models\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="0.9.12" />
<PackageReference Include="Avalonia.Desktop" Version="0.9.12" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.9.12" />
<PackageReference Include="Avalonia" Version="11.2.3" />
<PackageReference Include="Avalonia.Desktop" Version="11.2.3" />
<PackageReference Include="Avalonia.Diagnostics" Version="11.2.3" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.2.3" />
<PackageReference Include="Avalonia.Themes.Simple" Version="11.2.3" />
<PackageReference Include="PvRecorder" Version="1.2.5" />
<PackageReference Include="Porcupine" Version="3.0.4" />
</ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions demo/dotnet-vui/AvaloniaVUI/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Avalonia;
using Avalonia.Logging.Serilog;
using Avalonia.ReactiveUI;

namespace AvaloniaVUI
Expand All @@ -20,7 +19,7 @@ public static AppBuilder BuildAvaloniaApp()
{
return AppBuilder.Configure<App>()
.UsePlatformDetect()
.LogToDebug()
.LogToTrace()
.UseReactiveUI();
}
}
Expand Down
2 changes: 1 addition & 1 deletion demo/dotnet-vui/AvaloniaVUI/ViewLocator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class ViewLocator : IDataTemplate
{
public bool SupportsRecycling => false;

public IControl Build(object data)
public Control Build(object data)
{
string name = data.GetType().FullName.Replace("ViewModel", "View");
Type type = Type.GetType(name);
Expand Down
2 changes: 1 addition & 1 deletion demo/dotnet-vui/AvaloniaVUI/Views/MainWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace AvaloniaVUI.Views
{
public class MainWindow : Window
public partial class MainWindow : Window
{
public MainWindow()
{
Expand Down
Loading