Merge branch 'master' into features/NetAnalyzers/CA1822

build/SharedVersion.props

@@ -8,7 +8,7 @@
     <RepositoryUrl>https://github.com/AvaloniaUI/Avalonia/</RepositoryUrl>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>CS1591</NoWarn>
-    <LangVersion>latest</LangVersion>
+    <LangVersion>preview</LangVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageIcon>Icon.png</PackageIcon>
     <PackageDescription>Avalonia is a cross-platform UI framework for .NET providing a flexible styling system and supporting a wide range of Operating Systems such as Windows, Linux, macOS and with experimental support for Android, iOS and WebAssembly.</PackageDescription>

src/Avalonia.Controls/Viewbox.cs

@@ -42,6 +42,7 @@ namespace Avalonia.Controls
             // can be applied independently of the Viewbox and Child transforms.
             _containerVisual = new ViewboxContainer();
             _containerVisual.RenderTransformOrigin = RelativePoint.TopLeft;
+            ((ISetLogicalParent)_containerVisual).SetParent(this);
             VisualChildren.Add(_containerVisual);
         }
 

src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj

@@ -5,7 +5,6 @@
     <IsPackable>true</IsPackable>
     <PackageId>Avalonia.Markup.Xaml.Loader</PackageId>
     <DefineConstants>$(DefineConstants);XAMLX_INTERNAL</DefineConstants>
-    <LangVersion>11</LangVersion>
   </PropertyGroup>
   <!--Disable Net Perf. analyzer for submodule to avoid commit issue -->
   <PropertyGroup>

src/Markup/Avalonia.Markup/Avalonia.Markup.csproj

@@ -2,7 +2,6 @@
   <PropertyGroup>
     <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
     <RootNamespace>Avalonia</RootNamespace>
-    <LangVersion>11</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Markup\Parsers\Nodes\ExpressionGrammer" />

tests/Avalonia.Controls.UnitTests/ViewboxTests.cs

@@ -1,4 +1,5 @@
 using Avalonia.Controls.Shapes;
+using Avalonia.Data;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
 using Avalonia.UnitTests;
@@ -207,6 +208,26 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(new Size(200, 200), target.DesiredSize);
         }
 
+        [Fact]
+        public void Child_DataContext_Binding_Works()
+        {
+            var data = new
+            {
+                Foo = "foo",
+            };
+
+            var target = new Viewbox()
+            {
+                DataContext = data,
+                Child = new Canvas
+                {
+                    [!Canvas.DataContextProperty] = new Binding("Foo"),
+                },
+            };
+
+            Assert.Equal("foo", target.Child.DataContext);
+        }
+      
         private static bool TryGetScale(Viewbox viewbox, out Vector scale)
         {
             if (viewbox.InternalTransform is null)