Merge

.github/PULL_REQUEST_TEMPLATE.md

@@ -31,6 +31,7 @@ Please check if your PR fulfills the following requirements:
 - [ ] Sample in sample app has been added / updated (for bug fixes / features)
     - [ ] Icon has been created (if new sample) following the [Thumbnail Style Guide and templates](https://github.com/Microsoft/UWPCommunityToolkit-design-assets)
 - [ ] Tests for the changes have been added (for bug fixes / features) (if applicable)
+- [ ] Header has been added to all new source files (run *build/UpdateHeaders.bat*)
 - [ ] Contains **NO** breaking changes
 
 

Directory.Build.props

@@ -69,26 +69,16 @@
   </Choose>
 
   <PropertyGroup>
-    <NerdbankGitVersioningVersion>2.0.37-beta</NerdbankGitVersioningVersion>
+    <NerdbankGitVersioningVersion>2.1.23</NerdbankGitVersioningVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.37-beta" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version=" 2.1.23" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
     <AdditionalFiles Include="..\stylecop.json">
       <Link>stylecop.json</Link>
     </AdditionalFiles>
   </ItemGroup>
-
-  <!-- https://github.com/NuGet/Home/issues/4337 -->
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' == 'true' ">
-    <Import Project="$(UserProfile)\.nuget\packages\nerdbank.gitversioning\$(NerdbankGitVersioningVersion)\buildCrossTargeting\Nerdbank.GitVersioning.targets"
-            Condition="Exists('$(UserProfile)\.nuget\packages\nerdbank.gitversioning\$(NerdbankGitVersioningVersion)\buildCrossTargeting\Nerdbank.GitVersioning.targets')" />
-  </ImportGroup>
-  <Target Name="FixUpVersion"
-          BeforeTargets="_GenerateRestoreProjectSpec"
-          DependsOnTargets="GetBuildVersion"
-          Condition=" '$(NerdbankGitVersioningTasksPath)' != '' " />
 </Project>

Microsoft.Toolkit.Services/Services/Bing/BingLanguage.cs

@@ -661,12 +661,6 @@ public enum BingLanguage
         [StringValue("mn")]
         Mongolian,
 
-        /// <summary>
-        /// Moldavian
-        /// </summary>
-        [StringValue("mo")]
-        Moldavian,
-
         /// <summary>
         /// Marathi
         /// </summary>
@@ -1141,4 +1135,4 @@ public enum BingLanguage
         [StringValue("zu")]
         Zulu
     }
-}
+}

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RangeSelector/RangeSelectorCode.bind

@@ -27,7 +27,7 @@
                               Grid.Column="1"                              
                               Minimum="@[Minimum:Slider:0:0-100]@"
                               Maximum="@[Maximum:Slider:100:0-100]@"
-                              StepFrequency="@[StepFrequency:DoubleSlider:1.0:0.25-10.0]@"/>
+                              StepFrequency="@[StepFrequency:Slider:1:1-10]@"/>
       <TextBlock Grid.Column="2"
                  HorizontalAlignment="Right"
                  VerticalAlignment="Center"

Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/ConnectedAnimationHelper.cs

@@ -66,7 +66,14 @@ private void Frame_Navigating(object sender, Windows.UI.Xaml.Navigation.Navigati
                         if (listAnimProperty.ListViewBase.ItemsSource is IEnumerable<object> items &&
                             items.Contains(e.Parameter))
                         {
-                            listAnimProperty.ListViewBase.PrepareConnectedAnimation(props.Key, e.Parameter, listAnimProperty.ElementName);
+                            try
+                            {
+                                listAnimProperty.ListViewBase.PrepareConnectedAnimation(props.Key, e.Parameter, listAnimProperty.ElementName);
+                            }
+                            catch
+                            {
+                                // Ignore
+                            }
                         }
                     }
                 }

Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.cs

@@ -512,7 +512,6 @@ protected override void PrepareContainerForItemOverride(DependencyObject element
             var compositeTransform = new CompositeTransform();
             compositeTransform.CenterX = 0.5;
             compositeTransform.CenterY = 0.5;
-            compositeTransform.CenterY = 0.5;
 
             carouselItem.Projection = planeProjection;
             carouselItem.RenderTransform = compositeTransform;

Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Properties.cs

@@ -19,18 +19,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     /// </summary>
     public partial class Expander
     {
-        /// <summary>
-        /// Identifies the <see cref="Header"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty HeaderProperty =
-            DependencyProperty.Register(nameof(Header), typeof(string), typeof(Expander), new PropertyMetadata(null));
-
-        /// <summary>
-        /// Identifies the <see cref="HeaderTemplate"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty HeaderTemplateProperty =
-            DependencyProperty.Register(nameof(HeaderTemplate), typeof(DataTemplate), typeof(Expander), new PropertyMetadata(null));
-
         /// <summary>
         /// Identifies the <see cref="IsExpanded"/> dependency property.
         /// </summary>
@@ -50,22 +38,10 @@ public partial class Expander
             DependencyProperty.Register(nameof(ContentOverlay), typeof(UIElement), typeof(Expander), new PropertyMetadata(default(UIElement)));
 
         /// <summary>
-        /// Gets or sets a value indicating whether the Header of the control.
-        /// </summary>
-        public string Header
-        {
-            get { return (string)GetValue(HeaderProperty); }
-            set { SetValue(HeaderProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the HeaderTemplate of the control.
+        /// Identifies the <see cref="HeaderStyle"/> dependency property.
         /// </summary>
-        public DataTemplate HeaderTemplate
-        {
-            get { return (DataTemplate)GetValue(HeaderTemplateProperty); }
-            set { SetValue(HeaderTemplateProperty, value); }
-        }
+        public static readonly DependencyProperty HeaderStyleProperty =
+            DependencyProperty.Register(nameof(HeaderStyle), typeof(Style), typeof(Expander), new PropertyMetadata(default(Style)));
 
         /// <summary>
         /// Gets or sets a value indicating whether the content of the control is opened/visible or closed/hidden.
@@ -94,6 +70,15 @@ public UIElement ContentOverlay
             set { SetValue(ContentOverlayProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets a value for the style to use for the Header of the Expander.
+        /// </summary>
+        public Style HeaderStyle
+        {
+            get { return (Style)GetValue(HeaderStyleProperty);  }
+            set { SetValue(HeaderStyleProperty, value);  }
+        }
+
         private static void OnIsExpandedPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             var expander = d as Expander;

Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.cs

@@ -40,7 +40,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     [TemplatePart(Name = LayoutTransformerPart, Type = typeof(LayoutTransformControl))]
     [TemplatePart(Name = ContentOverlayPart, Type = typeof(ContentPresenter))]
     [ContentProperty(Name = "Content")]
-    public partial class Expander : ContentControl
+    public partial class Expander : HeaderedContentControl
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="Expander"/> class.

Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.xaml

@@ -11,9 +11,11 @@
         <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
         <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundTransparentBrush}" />
         <Setter Property="BorderThickness" Value="{ThemeResource ToggleButtonBorderThemeThickness}" />
+        <Setter Property="Height" Value="40" />
         <Setter Property="Padding" Value="8,4,8,4" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
         <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
@@ -251,10 +253,11 @@
                                           ContentTemplate="{TemplateBinding ContentTemplate}"
                                           ContentTransitions="{TemplateBinding ContentTransitions}"
                                           Content="{TemplateBinding Content}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                           Padding="{TemplateBinding Padding}"
+                                          VerticalAlignment="{TemplateBinding VerticalAlignment}"
                                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          HorizontalAlignment="Left"
                                           RenderTransformOrigin="0.5,0.5" />
                     </Grid>
                 </ControlTemplate>
@@ -265,6 +268,7 @@
     <Style TargetType="controls:Expander">
         <Setter Property="Header" Value="Header" />
         <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="HeaderStyle" Value="{StaticResource HeaderToggleButtonStyle}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:Expander">
@@ -580,11 +584,9 @@
                                     <RotateTransform x:Name="RotateLayoutTransform" Angle="0" />
                                 </controls:LayoutTransformControl.Transform>
                                 <ToggleButton x:Name="PART_ExpanderToggleButton" 
-                                              Height="40"
                                               TabIndex="0"
                                               AutomationProperties.Name="Expand"
-                                              Style="{StaticResource HeaderToggleButtonStyle}" 
-                                              VerticalAlignment="Bottom" HorizontalAlignment="Stretch" 
+                                              Style="{TemplateBinding HeaderStyle}" 
                                               Foreground="{TemplateBinding Foreground}"
                                               ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}"
                                               IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" />

Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.cs

@@ -332,31 +332,26 @@ private void SetDetailsContent()
 
         private void OnMasterCommandBarChanged()
         {
-            var panel = GetTemplateChild("DetailsCommandBarPanel") as Panel;
-            if (panel == null)
-            {
-                return;
-            }
-
-            panel.Children.Clear();
-            if (DetailsCommandBar != null)
-            {
-                panel.Children.Add(DetailsCommandBar);
-            }
+            OnCommandBarChanged("MasterCommandBarPanel", MasterCommandBar);
         }
 
         private void OnDetailsCommandBarChanged()
         {
-            var panel = GetTemplateChild("MasterCommandBarPanel") as Panel;
+            OnCommandBarChanged("DetailsCommandBarPanel", DetailsCommandBar);
+        }
+
+        private void OnCommandBarChanged(string panelName, CommandBar commandbar)
+        {
+            var panel = GetTemplateChild(panelName) as Panel;
             if (panel == null)
             {
                 return;
             }
 
             panel.Children.Clear();
-            if (MasterCommandBar != null)
+            if (commandbar != null)
             {
-                panel.Children.Add(MasterCommandBar);
+                panel.Children.Add(commandbar);
             }
         }
     }

Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.xaml

@@ -40,6 +40,7 @@
                                           Grid.Row="1"
                                           IsTabStop="False"
                                           ItemContainerStyle="{TemplateBinding ItemContainerStyle}"
+                                          ItemContainerStyleSelector="{TemplateBinding ItemContainerStyleSelector}"
                                           ItemTemplate="{TemplateBinding ItemTemplate}"
                                           ItemTemplateSelector="{TemplateBinding ItemTemplateSelector}"
                                           ItemsSource="{TemplateBinding ItemsSource}"

Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs

@@ -38,7 +38,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     public class RangeSelector : Control
     {
         private const double Epsilon = 0.01;
-        private const double DefaultStepFrequency = 0.01;
+        private const double DefaultStepFrequency = 1;
 
         /// <summary>
         /// Identifies the Minimum dependency property.

Microsoft.Toolkit.Uwp.UI/AdvancedCollectionView/AdvancedCollectionView.cs

@@ -534,16 +534,19 @@ private void HandleSortChanged()
 
         private void HandleFilterChanged()
         {
-            for (var index = 0; index < _view.Count; index++)
+            if (_filter != null)
             {
-                var item = _view.ElementAt(index);
-                if (_filter(item))
+                for (var index = 0; index < _view.Count; index++)
                 {
-                    continue;
-                }
+                    var item = _view.ElementAt(index);
+                    if (_filter(item))
+                    {
+                        continue;
+                    }
 
-                RemoveFromView(index, item);
-                index--;
+                    RemoveFromView(index, item);
+                    index--;
+                }
             }
 
             var viewHash = new HashSet<object>(_view);