Update to preview8

wieslawsoltes · May 9, 2023 · baa1177 · baa1177
1 parent 886c82f
commit baa1177
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 15 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-preview8" />
   </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-preview8" />
   </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-preview8" />
   </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-preview8" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.0-preview8" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.Themes.Simple.props b/build/Avalonia.Themes.Simple.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.Simple" Version="11.0.0-preview6" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.0-preview6" />
+    <PackageReference Include="Avalonia.Themes.Simple" Version="11.0.0-preview8" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.0-preview8" />
   </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-preview8" />
   </ItemGroup>
 </Project>
diff --git a/build/Base.props b/build/Base.props
@@ -1,10 +1,10 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VersionPrefix>11.0.0</VersionPrefix>
-    <VersionSuffix>preview6</VersionSuffix>
+    <VersionSuffix>preview8</VersionSuffix>
     <Authors>Wiesław Šoltés</Authors>
     <Company>Wiesław Šoltés</Company>
-    <Copyright>Copyright © Wiesław Šoltés 2022</Copyright>
+    <Copyright>Copyright © Wiesław Šoltés 2023</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/wieslawsoltes/ThemeEditor</PackageProjectUrl>
   </PropertyGroup>

diff --git a/samples/ColorPickerDemo/HexToColorConverter.cs b/samples/ColorPickerDemo/HexToColorConverter.cs
@@ -35,7 +35,7 @@ public class HexToColorConverter : IValueConverter
         {
             try
             {
-                return $"#{c.ToUint32():x8}";
+                return $"#{c.ToUInt32():x8}";
             }
             catch (Exception)
             {

diff --git a/samples/ColorPickerDemo/MainWindow.axaml.cs b/samples/ColorPickerDemo/MainWindow.axaml.cs
@@ -69,7 +69,7 @@ public MainWindow()
         NullColor = null;
         Hex = "#5F1F001F";
         NullHex = null;
-        Value = Colors.Green.ToUint32();
+        Value = Colors.Green.ToUInt32();
         NullValue = null;
         DataContext = this;
     }

diff --git a/samples/ColorPickerDemo/UInt32ToColorConverter.cs b/samples/ColorPickerDemo/UInt32ToColorConverter.cs
@@ -32,7 +32,7 @@ public class UInt32ToColorConverter : IValueConverter
         {
             try
             {
-                return c2.ToUint32();
+                return c2.ToUInt32();
             }
             catch (Exception)
             {

diff --git a/src/ThemeEditor.Controls.ColorPicker/ColorPicker.axaml b/src/ThemeEditor.Controls.ColorPicker/ColorPicker.axaml
@@ -24,7 +24,7 @@
   <Style Selector="cp|ColorPickerPropertiesPresenter">
     <Setter Property="Template">
       <ControlTemplate>
-        <TabControl Items="{TemplateBinding Properties}" Classes="picker">
+        <TabControl ItemsSource="{TemplateBinding Properties}" Classes="picker">
           <TabControl.DataTemplates>
             <DataTemplate DataType="props:HexProperties">
               <Grid RowDefinitions="Auto" ColumnDefinitions="*" Classes="properties">

diff --git a/src/ThemeEditor.Controls.ColorPicker/ColorPickerHelpers.cs b/src/ThemeEditor.Controls.ColorPicker/ColorPickerHelpers.cs
@@ -16,7 +16,7 @@ public static bool IsValidHexColor(string? hex)
 
     public static string ToHexColor(Color color)
     {
-        return $"#{color.ToUint32():X8}";
+        return $"#{color.ToUInt32():X8}";
     }
 
     public static Color FromHexColor(string hex)
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,7 @@ public class HexToColorConverter : IValueConverter @@
             {
                 try
                 {
-                    return $"#{c.ToUint32():x8}";
+                    return $"#{c.ToUInt32():x8}";
                 }
                 catch (Exception)
                 {
@@ Expand Down @@