Update to 11.0.0-preview1

wieslawsoltes · Aug 19, 2022 · 20c9158 · 20c9158
1 parent abb1c45
commit 20c9158
Show file tree

Hide file tree

Showing 40 changed files with 123 additions and 80 deletions.
diff --git a/Svg.Skia.sln b/Svg.Skia.sln
@@ -59,6 +59,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "props", "props", "{5BFEF4F8
 		build\XUnit.props = build\XUnit.props
 		build\SourceLink.props = build\SourceLink.props
 		build\Avalonia.Web.Blazor.props = build\Avalonia.Web.Blazor.props
+		build\Avalonia.Themes.Fluent.props = build\Avalonia.Themes.Fluent.props
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{7863AE7D-FF68-45BF-BA68-6FA0E5604CB7}"

diff --git a/build/Avalonia.Desktop.props b/build/Avalonia.Desktop.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.16" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview1" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.Diagnostics.props b/build/Avalonia.Diagnostics.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.16" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.0-preview1" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.ReactiveUI.props b/build/Avalonia.ReactiveUI.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.16" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview1" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.Skia.props b/build/Avalonia.Skia.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.Skia" Version="0.10.16" />
+    <PackageReference Include="Avalonia.Skia" Version="11.0.0-preview1" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.Themes.Fluent.props b/build/Avalonia.Themes.Fluent.props
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview1" />
+  </ItemGroup>
+</Project>
diff --git a/build/Avalonia.Web.Blazor.props b/build/Avalonia.Web.Blazor.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.Web.Blazor" Version="0.10.16" />
+    <PackageReference Include="Avalonia.Web.Blazor" Version="11.0.0-preview1" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.props b/build/Avalonia.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.16" />
+    <PackageReference Include="Avalonia" Version="11.0.0-preview1" />
   </ItemGroup>
 </Project>
diff --git a/build/Base.props b/build/Base.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <VersionPrefix>0.5.16</VersionPrefix>
-    <VersionSuffix></VersionSuffix>
-    <AvaloniaVersionPrefix>0.10.16</AvaloniaVersionPrefix>
+    <VersionPrefix>0.6.0</VersionPrefix>
+    <VersionSuffix>preview1</VersionSuffix>
+    <AvaloniaVersionPrefix>11.0.0</AvaloniaVersionPrefix>
     <AvaloniaVersionSuffix>$(VersionSuffix)</AvaloniaVersionSuffix>
     <Authors>Wiesław Šoltés</Authors>
     <Company>Wiesław Šoltés</Company>

diff --git a/build/SkiaSharp.HarfBuzz.props b/build/SkiaSharp.HarfBuzz.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.1-preview.1" />
+    <PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.1-preview.108" />
   </ItemGroup>
 </Project>
diff --git a/build/SkiaSharp.Linux.props b/build/SkiaSharp.Linux.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.1-preview.1" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.1-preview.108" />
   </ItemGroup>
 </Project>
diff --git a/build/SkiaSharp.props b/build/SkiaSharp.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.88.1-preview.1" />
+    <PackageReference Include="SkiaSharp" Version="2.88.1-preview.108" />
   </ItemGroup>
 </Project>
diff --git a/samples/AvaloniaSKPictureImageSample/AvaloniaSKPictureImageSample.csproj b/samples/AvaloniaSKPictureImageSample/AvaloniaSKPictureImageSample.csproj
@@ -13,6 +13,7 @@
   </ItemGroup>
 
   <Import Project="..\..\build\Avalonia.props" />
+  <Import Project="..\..\build\Avalonia.Themes.Fluent.props" />
   <Import Project="..\..\build\Avalonia.Desktop.props" />
   <Import Project="..\..\build\Avalonia.Diagnostics.props" />
 

diff --git a/samples/AvaloniaSvgSample/AvaloniaSvgSample.csproj b/samples/AvaloniaSvgSample/AvaloniaSvgSample.csproj
@@ -13,6 +13,7 @@
   </ItemGroup>
 
   <Import Project="..\..\build\Avalonia.props" />
+  <Import Project="..\..\build\Avalonia.Themes.Fluent.props" />
   <Import Project="..\..\build\Avalonia.Desktop.props" />
   <Import Project="..\..\build\Avalonia.Diagnostics.props" />
 

diff --git a/samples/AvaloniaSvgSkiaSample/AvaloniaSvgSkiaSample.csproj b/samples/AvaloniaSvgSkiaSample/AvaloniaSvgSkiaSample.csproj
@@ -13,6 +13,7 @@
   </ItemGroup>
 
   <Import Project="..\..\build\Avalonia.props" />
+  <Import Project="..\..\build\Avalonia.Themes.Fluent.props" />
   <Import Project="..\..\build\Avalonia.Desktop.props" />
   <Import Project="..\..\build\Avalonia.Diagnostics.props" />
 

diff --git a/samples/TestApp.Base/TestApp.Base.csproj b/samples/TestApp.Base/TestApp.Base.csproj
@@ -14,7 +14,7 @@
 
   <Import Project="..\..\build\ReferenceAssemblies.props" />
   <Import Project="..\..\build\Avalonia.props" />
-  <Import Project="..\..\build\Avalonia.Desktop.props" />
+  <Import Project="..\..\build\Avalonia.Themes.Fluent.props" />
   <Import Project="..\..\build\Avalonia.Diagnostics.props" />
   <Import Project="..\..\build\Avalonia.ReactiveUI.props" />
   <Import Project="..\..\build\SkiaSharp.props" />

diff --git a/samples/TestApp.Base/ViewLocator.cs b/samples/TestApp.Base/ViewLocator.cs
@@ -9,10 +9,10 @@ public class ViewLocator : IDataTemplate
 {
     public bool SupportsRecycling => false;
 
-    public IControl Build(object data)
+    public IControl Build(object? data)
     {
-        var name = data.GetType().FullName!.Replace("ViewModel", "View");
-        var type = Type.GetType(name);
+        var name = data?.GetType().FullName?.Replace("ViewModel", "View");
+        var type = name is null ? null : Type.GetType(name);
 
         if (type != null)
         {
@@ -24,8 +24,8 @@ public IControl Build(object data)
         }
     }
 
-    public bool Match(object data)
+    public bool Match(object? data)
     {
         return data is ViewModelBase;
     }
-}
+}
diff --git a/samples/TestApp.Base/Views/MainView.axaml.cs b/samples/TestApp.Base/Views/MainView.axaml.cs
@@ -54,7 +54,7 @@ private void Drop(object? sender, DragEventArgs e)
         }
     }
 
-    private void FileItem_OnDoubleTapped(object? sender, RoutedEventArgs e)
+    private void FileItem_OnDoubleTapped(object? sender, TappedEventArgs e)
     {
         if (sender is Control control && control.DataContext is FileItemViewModel fileItemViewModel)
         {

diff --git a/src/Avalonia.Controls.Skia/SKBitmapControl.cs b/src/Avalonia.Controls.Skia/SKBitmapControl.cs
@@ -133,7 +133,7 @@ public override void Render(DrawingContext context)
     }
 
     /// <inheritdoc/>
-    protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
     {
         base.OnPropertyChanged(change);
 

diff --git a/src/Avalonia.Controls.Skia/SKBitmapDrawOperation.cs b/src/Avalonia.Controls.Skia/SKBitmapDrawOperation.cs
@@ -28,7 +28,13 @@ public void Dispose()
 
     public void Render(IDrawingContextImpl context)
     {
-        var canvas = (context as ISkiaDrawingContextImpl)?.SkCanvas;
+        var leaseFeature = context.GetFeature<ISkiaSharpApiLeaseFeature>();
+        if (leaseFeature is null)
+        {
+            return;
+        }
+        using var lease = leaseFeature.Lease();
+        var canvas = lease?.SkCanvas;
         if (canvas is { } && _bitmap is { })
         {
             canvas.DrawBitmap(
@@ -37,4 +43,4 @@ public void Render(IDrawingContextImpl context)
                 SKRect.Create((float)_bounds.Left, (float)_bounds.Top, (float)_bounds.Width, (float)_bounds.Height));
         }
     }
-}
+}
diff --git a/src/Avalonia.Controls.Skia/SKBitmapImage.cs b/src/Avalonia.Controls.Skia/SKBitmapImage.cs
@@ -1,7 +1,7 @@
 using System;
 using Avalonia.Media;
+using Avalonia.Media.Imaging;
 using Avalonia.Metadata;
-using Avalonia.Visuals.Media.Imaging;
 using SkiaSharp;
 
 namespace Avalonia.Controls.Skia;
@@ -55,7 +55,7 @@ void IImage.Draw(DrawingContext context, Rect sourceRect, Rect destRect, BitmapI
     }
 
     /// <inheritdoc/>
-    protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
     {
         base.OnPropertyChanged(change);
         if (change.Property == SourceProperty)
@@ -69,4 +69,4 @@ protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T>
     /// </summary>
     /// <param name="e">The event args.</param>
     protected void RaiseInvalidated(EventArgs e) => Invalidated?.Invoke(this, e);
-}
+}
diff --git a/src/Avalonia.Controls.Skia/SKPathControl.cs b/src/Avalonia.Controls.Skia/SKPathControl.cs
@@ -154,7 +154,7 @@ public override void Render(DrawingContext context)
     }
 
     /// <inheritdoc/>
-    protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
     {
         base.OnPropertyChanged(change);
 
@@ -174,4 +174,4 @@ protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T>
     /// </summary>
     /// <param name="e">The event args.</param>
     protected void RaiseInvalidated(EventArgs e) => Invalidated?.Invoke(this, e);
-}
+}
diff --git a/src/Avalonia.Controls.Skia/SKPathDrawOperation.cs b/src/Avalonia.Controls.Skia/SKPathDrawOperation.cs
@@ -30,12 +30,18 @@ public void Dispose()
 
     public void Render(IDrawingContextImpl context)
     {
-        var canvas = (context as ISkiaDrawingContextImpl)?.SkCanvas;
+        var leaseFeature = context.GetFeature<ISkiaSharpApiLeaseFeature>();
+        if (leaseFeature is null)
+        {
+            return;
+        }
+        using var lease = leaseFeature.Lease();
+        var canvas = lease?.SkCanvas;
         if (canvas is null || _path is null)
         {
             return;
         }
 
         canvas.DrawPath(_path, _paint);
     }
-}
+}
diff --git a/src/Avalonia.Controls.Skia/SKPathImage.cs b/src/Avalonia.Controls.Skia/SKPathImage.cs
@@ -1,7 +1,7 @@
 using System;
 using Avalonia.Media;
 using Avalonia.Metadata;
-using Avalonia.Visuals.Media.Imaging;
+using Avalonia.Media.Imaging;
 using SkiaSharp;
 
 namespace Avalonia.Controls.Skia;
@@ -75,7 +75,7 @@ void IImage.Draw(DrawingContext context, Rect sourceRect, Rect destRect, BitmapI
     }
 
     /// <inheritdoc/>
-    protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
     {
         base.OnPropertyChanged(change);
         if (change.Property == SourceProperty)
@@ -89,4 +89,4 @@ protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T>
     /// </summary>
     /// <param name="e">The event args.</param>
     protected void RaiseInvalidated(EventArgs e) => Invalidated?.Invoke(this, e);
-}
+}
diff --git a/src/Avalonia.Controls.Skia/SKPictureControl.cs b/src/Avalonia.Controls.Skia/SKPictureControl.cs
@@ -136,7 +136,7 @@ public override void Render(DrawingContext context)
     }
 
     /// <inheritdoc/>
-    protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
     {
         base.OnPropertyChanged(change);
 
@@ -151,4 +151,4 @@ protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T>
     /// </summary>
     /// <param name="e">The event args.</param>
     protected void RaiseInvalidated(EventArgs e) => Invalidated?.Invoke(this, e);
-}
+}
diff --git a/src/Avalonia.Controls.Skia/SKPictureDrawOperation.cs b/src/Avalonia.Controls.Skia/SKPictureDrawOperation.cs
@@ -28,7 +28,13 @@ public void Dispose()
 
     public void Render(IDrawingContextImpl context)
     {
-        var canvas = (context as ISkiaDrawingContextImpl)?.SkCanvas;
+        var leaseFeature = context.GetFeature<ISkiaSharpApiLeaseFeature>();
+        if (leaseFeature is null)
+        {
+            return;
+        }
+        using var lease = leaseFeature.Lease();
+        var canvas = lease?.SkCanvas;
         if (canvas is null || _picture is null)
         {
             return;
@@ -38,4 +44,4 @@ public void Render(IDrawingContextImpl context)
         canvas.DrawPicture(_picture);
         canvas.Restore();
     }
-}
+}
diff --git a/src/Avalonia.Controls.Skia/SKPictureImage.cs b/src/Avalonia.Controls.Skia/SKPictureImage.cs
@@ -1,7 +1,7 @@
 using System;
 using Avalonia.Media;
 using Avalonia.Metadata;
-using Avalonia.Visuals.Media.Imaging;
+using Avalonia.Media.Imaging;
 using SkiaSharp;
 
 namespace Avalonia.Controls.Skia;
@@ -55,7 +55,7 @@ void IImage.Draw(DrawingContext context, Rect sourceRect, Rect destRect, BitmapI
     }
 
     /// <inheritdoc/>
-    protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
     {
         base.OnPropertyChanged(change);
         if (change.Property == SourceProperty)
@@ -69,4 +69,4 @@ protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T>
     /// </summary>
     /// <param name="e">The event args.</param>
     protected void RaiseInvalidated(EventArgs e) => Invalidated?.Invoke(this, e);
-}
+}
diff --git a/src/Avalonia.Svg.Skia/Svg.cs b/src/Avalonia.Svg.Skia/Svg.cs
@@ -197,20 +197,20 @@ public override void Render(DrawingContext context)
     }
 
     /// <inheritdoc/>
-    protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
     {
         base.OnPropertyChanged(change);
 
         if (change.Property == PathProperty)
         {
-            var path = change.NewValue.GetValueOrDefault<string?>();
+            var path = change.GetNewValue<string?>();
             Load(path);
             RaiseInvalidated(EventArgs.Empty);
         }
 
         if (change.Property == EnableCacheProperty)
         {
-            var enableCache = change.NewValue.GetValueOrDefault<bool>();
+            var enableCache = change.GetNewValue<bool>();
             if (enableCache == false)
             {
                 DisposeCache();

diff --git a/src/Avalonia.Svg.Skia/SvgCustomDrawOperation.cs b/src/Avalonia.Svg.Skia/SvgCustomDrawOperation.cs
@@ -31,8 +31,14 @@ public void Render(IDrawingContextImpl context)
         {
             return;
         }
-
-        var canvas = (context as ISkiaDrawingContextImpl)?.SkCanvas;
+
+        var leaseFeature = context.GetFeature<ISkiaSharpApiLeaseFeature>();
+        if (leaseFeature is null)
+        {
+            return;
+        }
+        using var lease = leaseFeature.Lease();
+        var canvas = lease?.SkCanvas;
         if (canvas is null)
         {
             return;
@@ -42,4 +48,4 @@ public void Render(IDrawingContextImpl context)
         canvas.DrawPicture(_svg.Picture);
         canvas.Restore();
     }
-}
+}