Skip to content

Commit b9feb1c

Browse files
Dan WalmsleyjmacatoTakoooooo
authored
Avalonia11 (#55)
* Port core library to Avalonia 11 preview 5 * port examples app part 1 * Fix all examples * update to preview6 code. * make sure invalidate plot alsways starts from 0. * Update azure-pipelines.yml * Update azure-pipelines.yml * test * test * test * wip * WIP * wip * wip * Change package id * update to preview7 * update to preview7 * fix breaking changes. * fix breaking changes. * update to rc1.1 * fix examples. * fix build * Revert "make sure invalidate plot alsways starts from 0." This reverts commit 65554e4. * Update to Avalonia 11 --------- Co-authored-by: Jumar Macato <16554748+jmacato@users.noreply.github.com> Co-authored-by: Tako <53405089+Takoooooo@users.noreply.github.com> Co-authored-by: Daniil Pavliuchyk <tako0qq@gmail.com>
1 parent c5ba480 commit b9feb1c

File tree

123 files changed

+171
-275
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+171
-275
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Application xmlns="https://github.com/avaloniaui"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3+
x:Class="AvaloniaExamples.App">
4+
<Application.Styles>
5+
<SimpleTheme/>
6+
<StyleInclude Source="avares://OxyPlot.Avalonia/Themes/Default.axaml"/>
7+
</Application.Styles>
8+
</Application>

Source/Examples/Avalonia/AvaloniaExamples/App.xaml

Lines changed: 0 additions & 9 deletions
This file was deleted.
Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp3.1</TargetFramework>
4-
<OutputType>Exe</OutputType>
5-
</PropertyGroup>
6-
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
7-
<PlatformTarget>x64</PlatformTarget>
8-
</PropertyGroup>
9-
<ItemGroup>
10-
<EmbeddedResource Include="**\*.xaml;Assets\*;Images\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
11-
</ItemGroup>
3+
<TargetFramework>net7.0</TargetFramework>
4+
<OutputType>WinExe</OutputType>
5+
</PropertyGroup>
126
<ItemGroup>
7+
<AvaloniaResource Include="Images\*" />
8+
<None Remove="Examples\AlignedAxesDemo\MainWindow.xaml" />
9+
<AvaloniaXaml Include="Examples\AlignedAxesDemo\MainWindow.xaml" />
1310
<PackageReference Include="JetBrains.Annotations" Version="11.0.0" />
1411
<ProjectReference Include="..\..\..\OxyPlot.Avalonia\OxyPlot.Avalonia.csproj" />
15-
<PackageReference Include="Avalonia.Desktop" Version="0.10.11" />
16-
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.11" />
12+
<PackageReference Include="Avalonia.Desktop" Version="11.0.0" />
13+
<PackageReference Include="Avalonia.Themes.Simple" Version="11.0.0" />
14+
<PackageReference Include="Avalonia.Diagnostics" Version="11.0.0" />
1715
</ItemGroup>
1816
</Project>

Source/Examples/Avalonia/AvaloniaExamples/Example.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ public Example(Type mainWindowType, string title = null, string description = nu
2424
try
2525
{
2626
var uri = new Uri("resm:AvaloniaExamples.Images." + this.ThumbnailFileName);
27-
var assets = AvaloniaLocator.Current.GetService<IAssetLoader>();
28-
var stream = assets.Open(uri);
27+
var stream = AssetLoader.Open(uri);
2928
this.Thumbnail = new Bitmap(stream);
3029
}
3130
catch (Exception e)
@@ -38,7 +37,7 @@ public Example(Type mainWindowType, string title = null, string description = nu
3837
public string Description { get; set; }
3938
private Type MainWindowType { get; }
4039

41-
public IBitmap Thumbnail { get; set; }
40+
public Bitmap Thumbnail { get; set; }
4241

4342
public string ThumbnailFileName
4443
{
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
<StackPanel Grid.Row="1" Orientation="Horizontal">
2525
<TextBlock Text="Easing function" VerticalAlignment="Center" Margin="6,4,6,4" />
26-
<DropDown Items="{Binding EasingFunctions}" SelectedItem="{Binding SelectedEasingFunction}"
26+
<ComboBox ItemsSource="{Binding EasingFunctions}" SelectedItem="{Binding SelectedEasingFunction}"
2727
Margin="6,4,6,4" Width="100"
2828
IsEnabled="{Binding SupportsEasingFunction}"/>
2929

0 commit comments

Comments
 (0)