Skip to content

Commit 188791b

Browse files
authored
Merge branch 'master' into feature/new-bithelper-apis
2 parents a235cd8 + 5003f31 commit 188791b

File tree

7 files changed

+18
-19
lines changed

7 files changed

+18
-19
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
1717
/// <summary>
1818
/// The UniformGrid control presents information within a Grid with even spacing.
1919
/// </summary>
20-
[Bindable]
2120
public partial class UniformGrid : Grid
2221
{
2322
// Guard for 15063 as Grid Spacing only works on 16299+.

Microsoft.Toolkit.Uwp.UI/Converters/DoubleToObjectConverter.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Converters
1515
/// Otherwise the logic looks for the value to be GreaterThan or LessThan the specified value.
1616
/// The ConverterParameter can be used to invert the logic.
1717
/// </summary>
18-
[Bindable]
1918
public class DoubleToObjectConverter : DependencyObject, IValueConverter
2019
{
2120
/// <summary>

Microsoft.Toolkit.Uwp.UI/Converters/DoubleToVisibilityConverter.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Converters
1010
/// <summary>
1111
/// This class converts a double value into a Visibility enumeration.
1212
/// </summary>
13-
[Bindable]
1413
public class DoubleToVisibilityConverter : DoubleToObjectConverter
1514
{
1615
/// <summary>

Microsoft.Toolkit.Uwp.UI/Extensions/Markup/NullableBool.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Extensions
1111
/// Custom <see cref="MarkupExtension"/> which can provide nullable bool values.
1212
/// See https://wpdev.uservoice.com/forums/110705-universal-windows-platform/suggestions/17767198-nullable-dependency-properties.
1313
/// </summary>
14-
[Bindable]
1514
[MarkupExtensionReturnType(ReturnType = typeof(bool?))]
1615
public class NullableBool : MarkupExtension
1716
{

Microsoft.Toolkit.Uwp.UI/Extensions/Markup/OnDevice.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Extensions.Markup
1818
/// xmlns:helpers="using:Microsoft.Toolkit.Uwp.UI.Extensions.Markup" />
1919
/// </code>
2020
/// </example>
21-
[Bindable]
2221
public class OnDevice : MarkupExtension
2322
{
2423
/// <summary>

UnitTests/UnitTests.UWP/Extensions/Helpers/ObjectWithNullableBoolProperty.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
namespace UnitTests.Extensions.Helpers
99
{
10-
[Bindable]
1110
public class ObjectWithNullableBoolProperty : DependencyObject
1211
{
1312
public bool? NullableBool
Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,31 @@
11
<Application x:Class="UnitTests.App"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
45
xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
6+
xmlns:helpers="using:UnitTests.Extensions.Helpers"
57
xmlns:unitTestExtensions="using:UnitTests.Extensions"
6-
RequestedTheme="Light" >
8+
RequestedTheme="Light">
79
<Application.Resources>
810

11+
<!-- Workarounds for .NET Native issue in unit tests -->
912
<extensions:EnumValuesExtension x:Key="DummyExtension"/>
1013

1114
<unitTestExtensions:Animal x:Key="Animal">Cat</unitTestExtensions:Animal>
1215

13-
<!-- Workarounds for .NET Native issue in unit tests -->
1416
<CommandBar x:Key="DummyCommandBar">
15-
<AppBarButton Icon="{extensions:FontIcon Glyph=&#xE102;}"/>
16-
<AppBarButton Icon="{extensions:SymbolIcon Symbol=Play}"/>
17+
<AppBarButton Icon="{extensions:FontIcon Glyph=&#xE102;}" />
18+
<AppBarButton Icon="{extensions:SymbolIcon Symbol=Play}" />
1719
</CommandBar>
1820

19-
<unitTestExtensions:MockSwipeItem
20-
x:Key="DummySwipeControl1"
21-
IconSource="{extensions:FontIconSource Glyph=&#xE10B;}"/>
21+
<unitTestExtensions:MockSwipeItem x:Key="DummySwipeControl1"
22+
IconSource="{extensions:FontIconSource Glyph=&#xE10B;}" />
2223

23-
<unitTestExtensions:MockSwipeItem
24-
x:Key="DummySwipeControl2"
25-
IconSource="{extensions:SymbolIconSource Symbol=Play}"/>
24+
<unitTestExtensions:MockSwipeItem x:Key="DummySwipeControl2"
25+
IconSource="{extensions:SymbolIconSource Symbol=Play}" />
2626

27-
<unitTestExtensions:MockSwipeItem
28-
x:Key="DummySwipeControl3"
29-
IconSource="{extensions:BitmapIconSource Source=/Assets/StoreLogo.png}"/>
27+
<unitTestExtensions:MockSwipeItem x:Key="DummySwipeControl3"
28+
IconSource="{extensions:BitmapIconSource Source=/Assets/StoreLogo.png}" />
3029

3130
<Button x:Key="DummyButton">
3231
<Button.Flyout>
@@ -35,5 +34,11 @@
3534
</MenuFlyout>
3635
</Button.Flyout>
3736
</Button>
37+
38+
<Style TargetType="controls:UniformGrid" />
39+
<extensions:NullableBool x:Key="nullableBool" />
40+
41+
<helpers:ObjectWithNullableBoolProperty x:Key="objectWithNullableBoolProperty" />
42+
3843
</Application.Resources>
3944
</Application>

0 commit comments

Comments
 (0)