AvaloniaUI
/
XamlControlsGallery
зеркало из https://github.com/AvaloniaUI/XamlControlsGallery.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

update avalonia

This commit is contained in:
Dan Walmsley 2021-01-20 16:30:57 +00:00
Родитель 1249572a75
Коммит 585f20f365
7 изменённых файлов: 14 добавлений и 15 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
NuGet.Config
Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<packageSources> <packageSources>
<add key="AvaloniaCI" value="https://nuget.avaloniaui.net/repository/avalonia-all/" /> <add key="AvaloniaCI" value="https://nuget.avaloniaui.net/repository/avalonia-all/index.json" />
</packageSources> </packageSources>
</configuration> </configuration>

6
XamlControlGallery.iOS/XamlControlGallery.iOS.csproj
Просмотреть файл

@ -69,9 +69,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" /> <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
<PackageReference Include="Avalonia.iOS" Version="0.10.0-preview5" /> <PackageReference Include="Avalonia.iOS" Version="0.10.999-cibuild0012558-beta" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.0-preview5" /> <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.999-cibuild0012558-beta" />
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-preview5" /> <PackageReference Include="Avalonia.Diagnostics" Version="0.10.999-cibuild0012558-beta" />
<PackageReference Include="SkiaSharp" Version="2.80.2-preview.33" /> <PackageReference Include="SkiaSharp" Version="2.80.2-preview.33" />
<PackageReference Include="SkiaSharp.HarfBuzz" Version="2.80.2-preview.33" /> <PackageReference Include="SkiaSharp.HarfBuzz" Version="2.80.2-preview.33" />
<PackageReference Include="Xamarin.Essentials" Version="1.3.1" /> <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />

1
XamlControlsGallery.NetCore/Program.cs
Просмотреть файл

@ -18,6 +18,7 @@ namespace XamlControlsGallery
=> AppBuilder.Configure<App>() => AppBuilder.Configure<App>()
.UsePlatformDetect() .UsePlatformDetect()
.With(new SkiaOptions{ MaxGpuResourceSizeBytes = 8096000}) .With(new SkiaOptions{ MaxGpuResourceSizeBytes = 8096000})
.With(new Win32PlatformOptions{ AllowEglInitialization = true })
.LogToDebug() .LogToDebug()
.UseReactiveUI(); .UseReactiveUI();
} }

4
XamlControlsGallery.NetCore/XamlControlsGallery.NetCore.csproj
Просмотреть файл

@ -7,8 +7,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia.Desktop" Version="0.10.999-cibuild0012021-beta" /> <PackageReference Include="Avalonia.Desktop" Version="0.10.999-cibuild0012558-beta" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.999-cibuild0012021-beta" /> <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.999-cibuild0012558-beta" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\XamlControlsGallery\XamlControlsGallery.csproj" /> <ProjectReference Include="..\XamlControlsGallery\XamlControlsGallery.csproj" />

3
XamlControlsGallery/App.xaml
Просмотреть файл

@ -7,8 +7,7 @@
</Application.DataTemplates> </Application.DataTemplates>
<Application.Styles> <Application.Styles>
<StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseDark.xaml"/> <FluentTheme Mode="Dark" />
<StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentDark.xaml"/>
<StyleInclude Source="/Styles/Styles.xaml" /> <StyleInclude Source="/Styles/Styles.xaml" />
<StyleInclude Source="/Styles/SideBar.xaml" /> <StyleInclude Source="/Styles/SideBar.xaml" />
</Application.Styles> </Application.Styles>

4
XamlControlsGallery/App.xaml.cs
Просмотреть файл

@ -34,8 +34,8 @@ namespace XamlControlsGallery
var theme = new Avalonia.Themes.Default.DefaultTheme(); var theme = new Avalonia.Themes.Default.DefaultTheme();
theme.TryGetResource("Button", out _); theme.TryGetResource("Button", out _);
var theme1 = new Avalonia.Themes.Fluent.FluentTheme(); //var theme1 = new Avalonia.Themes.Fluent.FluentTheme();
theme1.TryGetResource("Button", out _); //theme1.TryGetResource("Button", out _);
base.OnFrameworkInitializationCompleted(); base.OnFrameworkInitializationCompleted();
} }

7
XamlControlsGallery/XamlControlsGallery.csproj
Просмотреть файл

@ -6,7 +6,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Models\" />
<Compile Update="**\*.xaml.cs"> <Compile Update="**\*.xaml.cs">
<DependentUpon>%(Filename)</DependentUpon> <DependentUpon>%(Filename)</DependentUpon>
</Compile> </Compile>
@ -20,9 +19,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="0.10.999-cibuild0012021-beta" /> <PackageReference Include="Avalonia" Version="0.10.999-cibuild0012558-beta" />
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.999-cibuild0012021-beta" /> <PackageReference Include="Avalonia.Diagnostics" Version="0.10.999-cibuild0012558-beta" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.999-cibuild0012021-beta" /> <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.999-cibuild0012558-beta" />
</ItemGroup> </ItemGroup>
</Project> </Project>