Downgrade to 0.10.22

wieslawsoltes · Jan 28, 2024 · e9cd6e9 · e9cd6e9
1 parent 80a53b3
commit e9cd6e9
Show file tree

Hide file tree

Showing 51 changed files with 297 additions and 344 deletions.
diff --git a/Svg.Skia.sln b/Svg.Skia.sln
@@ -45,8 +45,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "props", "props", "{5BFEF4F8
 		build\Avalonia.props = build\Avalonia.props
 		build\Avalonia.ReactiveUI.props = build\Avalonia.ReactiveUI.props
 		build\Avalonia.Skia.props = build\Avalonia.Skia.props
-		build\Avalonia.Themes.Fluent.props = build\Avalonia.Themes.Fluent.props
-		build\Avalonia.Web.props = build\Avalonia.Web.props
 		build\Base.props = build\Base.props
 		build\HarfBuzzSharp.NativeAssets.Linux.props = build\HarfBuzzSharp.NativeAssets.Linux.props
 		build\Newtonsoft.Json.props = build\Newtonsoft.Json.props
@@ -60,6 +58,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "props", "props", "{5BFEF4F8
 		build\Svg.props = build\Svg.props
 		build\System.CommandLine.props = build\System.CommandLine.props
 		build\XUnit.props = build\XUnit.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="11.0.0" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.22" />
   </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" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.22" />
   </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" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.22" />
   </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" />
+    <PackageReference Include="Avalonia.Skia" Version="0.10.22" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.Themes.Fluent.props b/build/Avalonia.Themes.Fluent.props
@@ -1,7 +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" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.0" />
+    <PackageReference Include="XamlNameReferenceGenerator" Version="1.6.1" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.Web.props b/build/Avalonia.Web.props
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" />
+    <PackageReference Include="Avalonia" Version="0.10.22" />
   </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>1.0.0.13</VersionPrefix>
+    <VersionPrefix>0.5.22.1</VersionPrefix>
     <VersionSuffix></VersionSuffix>
-    <AvaloniaVersionPrefix>11.0.0.13</AvaloniaVersionPrefix>
+    <AvaloniaVersionPrefix>0.10.22.1</AvaloniaVersionPrefix>
     <AvaloniaVersionSuffix>$(VersionSuffix)</AvaloniaVersionSuffix>
     <Authors>Wiesław Šoltés</Authors>
     <Company>Wiesław Šoltés</Company>

diff --git a/samples/AvaloniaControlsSample/App.axaml b/samples/AvaloniaControlsSample/App.axaml
@@ -1,8 +1,7 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="AvaloniaControlsSample.App"
-             Name="AvaloniaControlsSample"
-             RequestedThemeVariant="Light">
+             Name="AvaloniaControlsSample">
   <Application.Styles>
     <FluentTheme />
   </Application.Styles>

diff --git a/samples/AvaloniaSKPictureImageSample/App.axaml b/samples/AvaloniaSKPictureImageSample/App.axaml
@@ -1,8 +1,7 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="AvaloniaSKPictureImageSample.App"
-             Name="AvaloniaSKPictureImageSample"
-             RequestedThemeVariant="Light">
+             Name="AvaloniaSKPictureImageSample">
   <Application.Styles>
     <FluentTheme />
   </Application.Styles>

diff --git a/samples/AvaloniaSKPictureImageSample/MainWindow.axaml b/samples/AvaloniaSKPictureImageSample/MainWindow.axaml
@@ -18,8 +18,8 @@
           <ComboBoxItem>Uniform</ComboBoxItem>
           <ComboBoxItem>UniformToFill</ComboBoxItem>
         </ComboBox>
-        <SKPictureControl Picture="{x:Static local:Tiger.Picture}"
-                          Stretch="{Binding #SvgPictureStretch.SelectedItem.Content, FallbackValue=None}" />
+        <!-- <SKPictureControl Picture="{x:Static local:Tiger.Picture}" -->
+        <!--                   Stretch="{Binding #SvgPictureStretch.SelectedItem.Content, FallbackValue=None}" /> -->
       </DockPanel>
     </TabItem>
 
@@ -54,39 +54,39 @@
           <ComboBoxItem>Uniform</ComboBoxItem>
           <ComboBoxItem>UniformToFill</ComboBoxItem>
         </ComboBox>
-        <SKPictureControl Picture="{x:Static local:Logo.Picture}"
-                          Stretch="{Binding #SvgAnimationPictureStretch.SelectedItem.Content, FallbackValue=None}"
-                          Margin="100"
-                          Classes="bounce rotate">
-          <SKPictureControl.RenderTransform>
-            <TransformGroup>
-              <RotateTransform />
-              <TranslateTransform />
-            </TransformGroup>
-          </SKPictureControl.RenderTransform>
-        </SKPictureControl>
+        <!-- <SKPictureControl Picture="{x:Static local:Logo.Picture}" -->
+        <!--                   Stretch="{Binding #SvgAnimationPictureStretch.SelectedItem.Content, FallbackValue=None}" -->
+        <!--                   Margin="100" -->
+        <!--                   Classes="bounce rotate"> -->
+        <!--   <SKPictureControl.RenderTransform> -->
+        <!--     <TransformGroup> -->
+        <!--       <RotateTransform /> -->
+        <!--       <TranslateTransform /> -->
+        <!--     </TransformGroup> -->
+        <!--   </SKPictureControl.RenderTransform> -->
+        <!-- </SKPictureControl> -->
       </DockPanel>
     </TabItem>
 
     <TabItem Header="Image">
       <DockPanel Background="Transparent" Margin="16" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-        <DockPanel.Resources>
-          <SKPictureImage x:Key="CameraImage" Source="{x:Static local:Camera.Picture}" />
-        </DockPanel.Resources>
+        <!-- <DockPanel.Resources> -->
+        <!--   <SKPictureImage x:Key="CameraImage" Source="{x:Static local:Camera.Picture}" /> -->
+        <!-- </DockPanel.Resources> -->
         <ComboBox Name="SvgImageStretch" DockPanel.Dock="Top" SelectedIndex="2">
           <ComboBoxItem>None</ComboBoxItem>
           <ComboBoxItem>Fill</ComboBoxItem>
           <ComboBoxItem>Uniform</ComboBoxItem>
           <ComboBoxItem>UniformToFill</ComboBoxItem>
         </ComboBox>
-        <Image Source="{StaticResource CameraImage}"
-               Stretch="{Binding #SvgImageStretch.SelectedItem.Content, FallbackValue=None}" />
+        <!-- <Image Source="{StaticResource CameraImage}" -->
+        <!--        Stretch="{Binding #SvgImageStretch.SelectedItem.Content, FallbackValue=None}" /> -->
       </DockPanel>
     </TabItem>
 
     <TabItem Header="Pattern">
-      <SKPictureControl Picture="{x:Static local:Pattern.Picture}"
-                        Stretch="Uniform" />
+      <!-- <SKPictureControl Picture="{x:Static local:Pattern.Picture}" -->
+      <!--                   Stretch="Uniform" /> -->
     </TabItem>
 
   </TabControl>

diff --git a/samples/AvaloniaSvgSample/App.axaml b/samples/AvaloniaSvgSample/App.axaml
@@ -1,8 +1,7 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="AvaloniaSvgSample.App"
-             Name="AvaloniaSvgSample"
-             RequestedThemeVariant="Light">
+             Name="AvaloniaSvgSample">
   <Application.Styles>
     <FluentTheme />
   </Application.Styles>

diff --git a/samples/AvaloniaSvgSample/MainWindow.axaml.cs b/samples/AvaloniaSvgSample/MainWindow.axaml.cs
@@ -86,15 +86,15 @@ private void DragOver(object sender, DragEventArgs e)
     {
         e.DragEffects = e.DragEffects & (DragDropEffects.Copy | DragDropEffects.Link);
 
-        if (!e.Data.Contains(DataFormats.Files))
+        if (!e.Data.Contains(DataFormats.FileNames))
         {
             e.DragEffects = DragDropEffects.None;
         }
     }
 
     private void Drop(object sender, DragEventArgs e)
     {
-        if (e.Data.Contains(DataFormats.Files))
+        if (e.Data.Contains(DataFormats.FileNames))
         {
             var fileName = e.Data.GetFileNames()?.FirstOrDefault();
             if (!string.IsNullOrWhiteSpace(fileName))

diff --git a/samples/AvaloniaSvgSkiaSample/App.axaml b/samples/AvaloniaSvgSkiaSample/App.axaml
@@ -1,8 +1,7 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="AvaloniaSvgSkiaSample.App"
-             Name="AvaloniaSvgSkiaSample"
-             RequestedThemeVariant="Light">
+             Name="AvaloniaSvgSkiaSample">
   <Application.Styles>
     <FluentTheme />
   </Application.Styles>

diff --git a/samples/AvaloniaSvgSkiaSample/App.axaml.cs b/samples/AvaloniaSvgSkiaSample/App.axaml.cs
@@ -20,4 +20,4 @@ public override void OnFrameworkInitializationCompleted()
 
         base.OnFrameworkInitializationCompleted();
     }
-}
+}
diff --git a/samples/AvaloniaSvgSkiaSample/MainWindow.axaml.cs b/samples/AvaloniaSvgSkiaSample/MainWindow.axaml.cs
@@ -88,15 +88,15 @@ private void DragOver(object sender, DragEventArgs e)
     {
         e.DragEffects = e.DragEffects & (DragDropEffects.Copy | DragDropEffects.Link);
 
-        if (!e.Data.Contains(DataFormats.Files))
+        if (!e.Data.Contains(DataFormats.FileNames))
         {
             e.DragEffects = DragDropEffects.None;
         }
     }
 
     private void Drop(object sender, DragEventArgs e)
     {
-        if (e.Data.Contains(DataFormats.Files))
+        if (e.Data.Contains(DataFormats.FileNames))
         {
             var fileName = e.Data.GetFileNames()?.FirstOrDefault();
             if (!string.IsNullOrWhiteSpace(fileName))

diff --git a/samples/AvaloniaSvgSkiaSample/Program.cs b/samples/AvaloniaSvgSkiaSample/Program.cs
@@ -7,8 +7,17 @@ namespace AvaloniaSvgSkiaSample;
 internal class Program
 {
     [STAThread]
-    public static void Main(string[] args) => BuildAvaloniaApp()
-        .StartWithClassicDesktopLifetime(args);
+    public static void Main(string[] args)
+    {
+        try
+        {
+            BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
+        }
+        catch (Exception e)
+        {
+            Console.WriteLine(e);
+        }
+    }
 
     public static AppBuilder BuildAvaloniaApp()
     {

diff --git a/samples/AvaloniaSvgSkiaStylingSample/App.axaml b/samples/AvaloniaSvgSkiaStylingSample/App.axaml
@@ -1,8 +1,7 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="AvaloniaSvgSkiaStylingSample.App"
-             Name="AvaloniaSvgSkiaStylingSample"
-             RequestedThemeVariant="Light">
+             Name="AvaloniaSvgSkiaStylingSample">
   <Application.Styles>
     <FluentTheme />
   </Application.Styles>

diff --git a/samples/AvaloniaSvgSkiaStylingSample/MainWindow.axaml.cs b/samples/AvaloniaSvgSkiaStylingSample/MainWindow.axaml.cs
@@ -21,11 +21,11 @@ public MainWindow()
 
     private void ApplySvgStyleButtonClick(object sender, EventArgs e) 
     {
-        SvgControl.SetCurrentValue(Avalonia.Svg.Skia.Svg.CssProperty, ".Black { fill: #AAAAFF; }");
+        SvgControl.SetValue(Avalonia.Svg.Skia.Svg.CssProperty, ".Black { fill: #AAAAFF; }");
     }
 
     private void ApplySvgImageStyleButtonClick(object sender, EventArgs e) 
     {
-        SvgImageButton.SetCurrentValue(Avalonia.Svg.Skia.Svg.CssProperty, ".Black { fill: #AAAAFF; }");
+        SvgImageButton.SetValue(Avalonia.Svg.Skia.Svg.CssProperty, ".Black { fill: #AAAAFF; }");
     }
 }
diff --git a/samples/TestApp/App.axaml b/samples/TestApp/App.axaml
@@ -2,8 +2,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="using:TestApp"
              x:Class="TestApp.App"
-             Name="TestApp"
-             RequestedThemeVariant="Light">
+             Name="TestApp">
   <Application.DataTemplates>
     <local:ViewLocator />
   </Application.DataTemplates>
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,4 +20,4 @@ public override void OnFrameworkInitializationCompleted() @@
             base.OnFrameworkInitializationCompleted();
         }
-    }
+    }