Update to 11.0.0-preview7

wieslawsoltes · Apr 25, 2023 · 3628d35 · 3628d35
1 parent f6a5385
commit 3628d35
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 13 deletions.
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="11.0.0-preview6" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview7" />
   </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="11.0.0-preview6" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.0-preview7" />
   </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="11.0.0-preview6" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview7" />
   </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="11.0.0-preview6" />
+    <PackageReference Include="Avalonia.Skia" Version="11.0.0-preview7" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.Themes.Fluent.props b/build/Avalonia.Themes.Fluent.props
@@ -1,7 +1,7 @@
 <?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-preview6" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.0-preview6" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview7" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.0-preview7" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.Web.props b/build/Avalonia.Web.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.Browser" Version="11.0.0-preview6" />
+    <PackageReference Include="Avalonia.Browser" Version="11.0.0-preview7" />
   </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="11.0.0-preview6" />
+    <PackageReference Include="Avalonia" Version="11.0.0-preview7" />
   </ItemGroup>
 </Project>
diff --git a/build/Base.props b/build/Base.props
@@ -2,7 +2,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VersionPrefix>0.6.0</VersionPrefix>
-    <VersionSuffix>preview6</VersionSuffix>
+    <VersionSuffix>preview7</VersionSuffix>
     <AvaloniaVersionPrefix>11.0.0</AvaloniaVersionPrefix>
     <AvaloniaVersionSuffix>$(VersionSuffix)</AvaloniaVersionSuffix>
     <Authors>Wiesław Šoltés</Authors>

diff --git a/samples/AvaloniaSvgSkiaSample/MainWindow.axaml.cs b/samples/AvaloniaSvgSkiaSample/MainWindow.axaml.cs
@@ -78,7 +78,7 @@ private void DragOver(object sender, DragEventArgs e)
 
     private void Drop(object sender, DragEventArgs e)
     {
-        if (e.Data.Contains(DataFormats.FileNames))
+        if (e.Data.Contains(DataFormats.Files))
         {
             var fileName = e.Data.GetFileNames()?.FirstOrDefault();
             if (!string.IsNullOrWhiteSpace(fileName))

diff --git a/samples/TestApp/Views/MainView.axaml b/samples/TestApp/Views/MainView.axaml
@@ -28,7 +28,7 @@
     <ListBox Grid.Column="0"
              Grid.Row="1"
              Margin="6,0,6,0"
-             Items="{Binding FilteredItems}"
+             ItemsSource="{Binding FilteredItems}"
              SelectedItem="{Binding SelectedItem, Mode=TwoWay}">
       <ListBox.Styles>
         <Style Selector="ListBoxItem">

diff --git a/src/Svg.Model/Drawables/Elements/TextDrawable.cs b/src/Svg.Model/Drawables/Elements/TextDrawable.cs
@@ -535,7 +535,7 @@ internal void DrawTextPath(SvgTextPath svgTextPath, ref float currentX, ref floa
                 if (SvgExtensions.IsValidFill(svgTextPath))
                 {
                     var skPaint = SvgExtensions.GetFillPaint(svgTextPath, skBounds, AssetLoader, References, ignoreAttributes);
-                    if (skPaint is { })
+                    if (skPaint is { } && text is { })
                     {
                         SvgExtensions.SetPaintText(svgTextPath, skBounds, skPaint);
                         skCanvas.DrawTextOnPath(text, skPath, hOffset, vOffset, skPaint);
@@ -545,7 +545,7 @@ internal void DrawTextPath(SvgTextPath svgTextPath, ref float currentX, ref floa
                 if (SvgExtensions.IsValidStroke(svgTextPath, skBounds))
                 {
                     var skPaint = SvgExtensions.GetStrokePaint(svgTextPath, skBounds, AssetLoader, References, ignoreAttributes);
-                    if (skPaint is { })
+                    if (skPaint is { } && text is { })
                     {
                         SvgExtensions.SetPaintText(svgTextPath, skBounds, skPaint);
                         skCanvas.DrawTextOnPath(text, skPath, hOffset, vOffset, skPaint);