Merge branch 'master' into improveparsing

src/Avalonia.Input/FocusManager.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using Avalonia.Interactivity;
 using Avalonia.VisualTree;
 
@@ -17,8 +18,8 @@ namespace Avalonia.Input
         /// <summary>
         /// The focus scopes in which the focus is currently defined.
         /// </summary>
-        private readonly Dictionary<IFocusScope, IInputElement> _focusScopes =
-            new Dictionary<IFocusScope, IInputElement>();
+        private readonly ConditionalWeakTable<IFocusScope, IInputElement> _focusScopes =
+            new ConditionalWeakTable<IFocusScope, IInputElement>();
 
         /// <summary>
         /// Initializes a new instance of the <see cref="FocusManager"/> class.
@@ -110,7 +111,18 @@ namespace Avalonia.Input
         {
             Contract.Requires<ArgumentNullException>(scope != null);
 
-            _focusScopes[scope] = element;
+            if (_focusScopes.TryGetValue(scope, out IInputElement existingElement))
+            {
+                if (element != existingElement)
+                {
+                    _focusScopes.Remove(scope);
+                    _focusScopes.Add(scope, element);
+                }
+            }
+            else
+            {
+                _focusScopes.Add(scope, element);
+            }
 
             if (Scope == scope)
             {

src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplateTargetTypeMetadataTransformer.cs

@@ -25,7 +25,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             
             if ((tt?.Values.FirstOrDefault() is XamlIlTypeExtensionNode tn))
             {
-                targetType = tn.Type;
+                targetType = tn.Value;
             }
             else
             {

src/Markup/Avalonia.Markup.Xaml/XamlIl/xamlil.github

@@ -1 +1 @@
-Subproject commit ad9915e19398a49c5a11b66000c361659ca692b3
+Subproject commit 4c4b6cf8ff0894c925d87b27d4fc7a064440c218

tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs

@@ -307,6 +307,23 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             Assert.Equal("child", child.Name);
         }
 
+        [Fact]
+        public void ControlTemplate_With_TargetType_Is_Operational()
+        {
+            var xaml = @"
+<ControlTemplate xmlns='https://github.com/avaloniaui' 
+                 xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+                 TargetType='{x:Type ContentControl}'>
+    <ContentPresenter Content='{TemplateBinding Content}' />
+</ControlTemplate>
+";
+            var template = AvaloniaXamlLoader.Parse<ControlTemplate>(xaml);
+
+            Assert.Equal(typeof(ContentControl), template.TargetType);
+
+            Assert.IsType(typeof(ContentPresenter), template.Build(new ContentControl()).Control);
+        }
+
         [Fact]
         public void ControlTemplate_With_Panel_Children_Are_Added()
         {
@@ -704,11 +721,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             }
         }
 
-
-        [Fact(Skip =
-@"Doesn't work with Portable.xaml, it's working in different creation order -
-Handled in test 'Control_Is_Added_To_Parent_Before_Final_EndInit'
-do we need it?")]
+        [Fact]
         public void Control_Is_Added_To_Parent_Before_Properties_Are_Set()
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))

tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs

@@ -5,6 +5,7 @@ using System.Xml;
 using Avalonia.Controls;
 using Avalonia.Markup.Data;
 using Avalonia.Markup.Xaml.Styling;
+using Avalonia.Markup.Xaml.Templates;
 using Avalonia.Media;
 using Avalonia.Styling;
 using Avalonia.UnitTests;
@@ -38,6 +39,57 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             }
         }
 
+        [Fact]
+        public void DataTemplate_Can_Be_Added_To_Style_Resources()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformWrapper))
+            {
+                var xaml = @"
+<UserControl xmlns='https://github.com/avaloniaui'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <UserControl.Styles>
+        <Style>
+            <Style.Resources>
+                <DataTemplate x:Key='dataTemplate'><TextBlock/></DataTemplate>
+            </Style.Resources>
+        </Style>
+    </UserControl.Styles>
+</UserControl>";
+                var loader = new AvaloniaXamlLoader();
+                var userControl = (UserControl)loader.Load(xaml);
+                var dataTemplate = (DataTemplate)((Style)userControl.Styles[0]).Resources["dataTemplate"];
+
+                Assert.NotNull(dataTemplate);
+            }
+        }
+
+        [Fact]
+        public void ControlTemplate_Can_Be_Added_To_Style_Resources()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformWrapper))
+            {
+                var xaml = @"
+<UserControl xmlns='https://github.com/avaloniaui'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <UserControl.Styles>
+        <Style>
+            <Style.Resources>
+                 <ControlTemplate x:Key='controlTemplate' TargetType='{x:Type Button}'>
+                    <ContentPresenter Content='{TemplateBinding Content}'/>
+                 </ControlTemplate>
+            </Style.Resources>
+        </Style>
+    </UserControl.Styles>
+</UserControl>";
+                var loader = new AvaloniaXamlLoader();
+                var userControl = (UserControl)loader.Load(xaml);
+                var controlTemplate = (ControlTemplate)((Style)userControl.Styles[0]).Resources["controlTemplate"];
+
+                Assert.NotNull(controlTemplate);
+                Assert.Equal(typeof(Button), controlTemplate.TargetType);
+            }
+        }
+
         [Fact]
         public void SolidColorBrush_Can_Be_Added_To_Style_Resources()
         {