Merge pull request #170 from AvaloniaUI/release/11.0.0-preview7

Release 11.0.0-preview7
AvaloniaUI · Apr 25, 2023 · a8762b0 · a8762b0
2 parents f07456a + 5c200d6
commit a8762b0
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 13 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -12,6 +12,6 @@
     <MSBuildEnableWorkloadResolver>false</MSBuildEnableWorkloadResolver>
   </PropertyGroup>
   <PropertyGroup>
-    <AvaloniaVersion>11.0.0-preview6</AvaloniaVersion>
+    <AvaloniaVersion>11.0.0-preview7</AvaloniaVersion>
   </PropertyGroup>
 </Project>
diff --git a/build/SharedVersion.props b/build/SharedVersion.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Product>Avalonia.Controls.TreeDataGrid</Product>
-    <Version>11.0.0-preview6.1</Version>
+    <Version>11.0.0-preview7</Version>
     <Copyright>Copyright © AvaloniaUI 2022</Copyright>
     <Authors>Steven Kirk</Authors>
     <Company>AvaloniaUI</Company>

diff --git a/samples/TreeDataGridDemo/MainWindow.axaml b/samples/TreeDataGridDemo/MainWindow.axaml
@@ -45,7 +45,7 @@
     <TabItem Header="Files">
       <DockPanel>
         <DockPanel DockPanel.Dock="Top" Margin="0 4">
-          <ComboBox Items="{Binding Files.Drives}"
+          <ComboBox ItemsSource="{Binding Files.Drives}"
                     SelectedItem="{Binding Files.SelectedDrive}"
                     DockPanel.Dock="Left"/>
           <TextBox Text="{Binding Files.SelectedPath, Mode=OneWay}"

diff --git a/tests/Avalonia.Controls.TreeDataGrid.Tests/TestTemplates.cs b/tests/Avalonia.Controls.TreeDataGrid.Tests/TestTemplates.cs
@@ -29,29 +29,19 @@ public static IControlTemplate ScrollViewerTemplate()
                         {
                             Name = "PART_ContentPresenter",
                             [~ContentPresenter.ContentProperty] = x[~ContentControl.ContentProperty],
-                            [~~ScrollContentPresenter.ExtentProperty] = x[~~ScrollViewer.ExtentProperty],
                             [~~ScrollContentPresenter.OffsetProperty] = x[~~ScrollViewer.OffsetProperty],
-                            [~~ScrollContentPresenter.ViewportProperty] = x[~~ScrollViewer.ViewportProperty],
-                            [~ScrollContentPresenter.CanHorizontallyScrollProperty] = x[~ScrollViewer.CanHorizontallyScrollProperty],
-                            [~ScrollContentPresenter.CanVerticallyScrollProperty] = x[~ScrollViewer.CanVerticallyScrollProperty],
                         }.RegisterInNameScope(ns),
                         new ScrollBar
                         {
                             Name = "horizontalScrollBar",
                             Orientation = Orientation.Horizontal,
-                            [~RangeBase.MaximumProperty] = x[~ScrollViewer.HorizontalScrollBarMaximumProperty],
-                            [~~RangeBase.ValueProperty] = x[~~ScrollViewer.HorizontalScrollBarValueProperty],
-                            [~ScrollBar.ViewportSizeProperty] = x[~ScrollViewer.HorizontalScrollBarViewportSizeProperty],
                             [~ScrollBar.VisibilityProperty] = x[~ScrollViewer.HorizontalScrollBarVisibilityProperty],
                             [Grid.RowProperty] = 1,
                         }.RegisterInNameScope(ns),
                         new ScrollBar
                         {
                             Name = "verticalScrollBar",
                             Orientation = Orientation.Vertical,
-                            [~RangeBase.MaximumProperty] = x[~ScrollViewer.VerticalScrollBarMaximumProperty],
-                            [~~RangeBase.ValueProperty] = x[~~ScrollViewer.VerticalScrollBarValueProperty],
-                            [~ScrollBar.ViewportSizeProperty] = x[~ScrollViewer.VerticalScrollBarViewportSizeProperty],
                             [~ScrollBar.VisibilityProperty] = x[~ScrollViewer.VerticalScrollBarVisibilityProperty],
                             [Grid.ColumnProperty] = 1,
                         }.RegisterInNameScope(ns),