Skip to content

Commit 8941f6c

Browse files
Sergio0694Sergio0694
committed
Fixed more leftover .Extensions references
1 parent 1f3ff5d commit 8941f6c

File tree

73 files changed

+127
-164
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+127
-164
lines changed

‎Microsoft.Toolkit.Mvvm/Messaging/IMessengerExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ static Action<IMessenger, object, TToken> GetRegistrationAction(Type type, Metho
132132
}
133133

134134
// Get or compute the registration methods for the current recipient type.
135-
// As in Microsoft.Toolkit.Extensions.TypeExtensions.ToTypeString, we use a lambda
135+
// As in Microsoft.Toolkit.Diagnostics.TypeExtensions.ToTypeString, we use a lambda
136136
// expression instead of a method group expression to leverage the statically initialized
137137
// delegate and avoid repeated allocations for each invocation of this method.
138138
// For more info on this, see the related issue at https://github.com/dotnet/roslyn/issues/5835.

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Animations/Behaviors/RotateBehaviorXaml.bind

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
xmlns:ani="using:Microsoft.Toolkit.Uwp.UI.Animations"
99
xmlns:behaviors="using:Microsoft.Toolkit.Uwp.UI.Behaviors"
1010
xmlns:core="using:Microsoft.Xaml.Interactions.Core"
11-
xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions"
11+
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
1212
mc:Ignorable="d">
1313

1414
<Button Background="Gray"
1515
Width="200"
1616
Height="200"
1717
HorizontalAlignment="Center"
1818
VerticalAlignment="Center"
19-
ex:VisualExtensions.NormalizedCenterPoint="0.5">
19+
ui:VisualExtensions.NormalizedCenterPoint="0.5">
2020
<ani:Explicit.Animations>
2121
<ani:AnimationSet x:Name="RotateAnimation">
2222
<ani:RotationInDegreesAnimation From="0"

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Animations/Behaviors/ScaleBehaviorXaml.bind

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
xmlns:ani="using:Microsoft.Toolkit.Uwp.UI.Animations"
99
xmlns:behaviors="using:Microsoft.Toolkit.Uwp.UI.Behaviors"
1010
xmlns:core="using:Microsoft.Xaml.Interactions.Core"
11-
xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions"
11+
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
1212
mc:Ignorable="d">
1313

1414
<Button Background="Gray"
1515
Width="200"
1616
Height="200"
1717
HorizontalAlignment="Center"
1818
VerticalAlignment="Center"
19-
ex:VisualExtensions.NormalizedCenterPoint="0.5">
19+
ui:VisualExtensions.NormalizedCenterPoint="0.5">
2020
<ani:Explicit.Animations>
2121
<ani:AnimationSet x:Name="ScaleAnimation">
2222
<ani:ScaleAnimation From="1"

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Animations/Effects/EffectAnimations.bind

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6-
xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
76
xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
87
xmlns:behaviors="using:Microsoft.Toolkit.Uwp.UI.Behaviors"
98
xmlns:media="using:Microsoft.Toolkit.Uwp.UI.Media"

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ClipToBounds/ClipToBoundsCode.bind

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5-
xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
5+
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
66
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
77
mc:Ignorable="d">
88

@@ -12,7 +12,7 @@
1212
BorderThickness="1"
1313
Width="148"
1414
Height="148"
15-
extensions:UIElementExtensions.ClipToBounds="@[Clip to Bounds:Bool:True]">
15+
ui:UIElementExtensions.ClipToBounds="@[Clip to Bounds:Bool:True]">
1616
<!-- We translate the inner rectangles outside of the bounds of the container. -->
1717
<Rectangle Fill="Blue" Width="100" Height="100">
1818
<Rectangle.RenderTransform>

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/EnumValuesExtension/EnumValuesExtensionXaml.bind

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages.EnumValuesExtensionPage"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7-
xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions"
7+
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
88
xmlns:enums="using:Microsoft.Toolkit.Uwp.SampleApp.Enums"
99
xmlns:converters="using:Microsoft.Toolkit.Uwp.SampleApp.Converters"
1010
mc:Ignorable="d">
@@ -19,13 +19,13 @@
1919
<!--Simple selector using the default template. Each item will
2020
simply be displayed as the corresponding enum value name.-->
2121
<TextBlock Text="Select an animal:"/>
22-
<ComboBox ItemsSource="{ex:EnumValues Type=enums:Animal}"
22+
<ComboBox ItemsSource="{ui:EnumValues Type=enums:Animal}"
2323
SelectedIndex="0"/>
2424

2525
<!--We can also use a custom template and some converters.-->
2626
<TextBlock Margin="0,12,0,0"
2727
Text="Pick another animal:"/>
28-
<ComboBox ItemsSource="{ex:EnumValues Type=enums:Animal}"
28+
<ComboBox ItemsSource="{ui:EnumValues Type=enums:Animal}"
2929
SelectedIndex="0">
3030
<ComboBox.ItemTemplate>
3131
<DataTemplate>

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/FrameworkElementExtensions/FrameworkElementExtensionsCode.bind

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:common="using:Microsoft.Toolkit.Uwp.SampleApp.Common"
44
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6-
xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
6+
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
77
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
88
mc:Ignorable="d">
99

@@ -21,7 +21,7 @@
2121

2222
<Rectangle Grid.Column="0"
2323
Grid.Row="0"
24-
extensions:FrameworkElementExtensions.EnableActualSizeBinding="True"
24+
ui:FrameworkElementExtensions.EnableActualSizeBinding="True"
2525
Fill="{StaticResource Brush-Brand-Color}"
2626
Stroke="{ThemeResource Brush-Grey-04}"
2727
x:Name="TargetObject"
@@ -81,8 +81,8 @@
8181

8282
<Rectangle Margin="12,12"
8383
HorizontalAlignment="Left"
84-
Height="{Binding ElementName=TargetObject, Path=(extensions:FrameworkElementExtensions.ActualHeight)}"
85-
Width="{Binding ElementName=TargetObject, Path=(extensions:FrameworkElementExtensions.ActualWidth)}"
84+
Height="{Binding ElementName=TargetObject, Path=(ui:FrameworkElementExtensions.ActualHeight)}"
85+
Width="{Binding ElementName=TargetObject, Path=(ui:FrameworkElementExtensions.ActualWidth)}"
8686
Fill="{ThemeResource Brush-Blue-01}"
8787
Stroke="{ThemeResource Brush-Grey-04}"
8888
StrokeThickness="1" />

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/IconExtensions/IconExtensionsXaml.bind

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages.IconExtensionsPage"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7-
xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions"
7+
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
88
mc:Ignorable="d">
99
<Grid>
1010
<StackPanel Spacing="8"
@@ -16,19 +16,19 @@
1616
Style="{StaticResource BodyTextBlockStyle}"/>
1717

1818
<CommandBar>
19-
<AppBarButton Icon="{ex:FontIcon Glyph=&#xE102;}"/>
20-
<AppBarButton Icon="{ex:FontIcon Glyph=&#xE103;}"/>
21-
<AppBarButton Icon="{ex:FontIcon Glyph=&#xE10F;}"/>
19+
<AppBarButton Icon="{ui:FontIcon Glyph=&#xE102;}"/>
20+
<AppBarButton Icon="{ui:FontIcon Glyph=&#xE103;}"/>
21+
<AppBarButton Icon="{ui:FontIcon Glyph=&#xE10F;}"/>
2222
</CommandBar>
2323

2424
<TextBlock Text="Use the SymbolIcon extension to create FontIcon items from known symbols."
2525
TextWrapping="Wrap"
2626
Style="{StaticResource BodyTextBlockStyle}"/>
2727

2828
<CommandBar>
29-
<AppBarButton Icon="{ex:SymbolIcon Symbol=Play}"/>
30-
<AppBarButton Icon="{ex:SymbolIcon Symbol=Pause}"/>
31-
<AppBarButton Icon="{ex:SymbolIcon Symbol=Home}"/>
29+
<AppBarButton Icon="{ui:SymbolIcon Symbol=Play}"/>
30+
<AppBarButton Icon="{ui:SymbolIcon Symbol=Pause}"/>
31+
<AppBarButton Icon="{ui:SymbolIcon Symbol=Home}"/>
3232
</CommandBar>
3333

3434
<TextBlock Text="Use the FontIconSource extension to create FontIconSource items from custom glyphs."
@@ -40,8 +40,8 @@
4040
Width="300" Margin="12" Height="68">
4141
<SwipeControl.LeftItems>
4242
<SwipeItems Mode="Reveal">
43-
<SwipeItem Text="Accept" IconSource="{ex:FontIconSource Glyph=&#xE10B;}"/>
44-
<SwipeItem Text="Flag" IconSource="{ex:FontIconSource Glyph=&#xE129;}"/>
43+
<SwipeItem Text="Accept" IconSource="{ui:FontIconSource Glyph=&#xE10B;}"/>
44+
<SwipeItem Text="Flag" IconSource="{ui:FontIconSource Glyph=&#xE129;}"/>
4545
</SwipeItems>
4646
</SwipeControl.LeftItems>
4747
<TextBlock Text="Swipe Right"
@@ -58,8 +58,8 @@
5858
Width="300" Margin="12" Height="68">
5959
<SwipeControl.LeftItems>
6060
<SwipeItems Mode="Reveal">
61-
<SwipeItem IconSource="{ex:BitmapIconSource Source=/Assets/ToolkitLogo.png}"/>
62-
<SwipeItem IconSource="{ex:BitmapIconSource Source=/Assets/mslogo.png}"/>
61+
<SwipeItem IconSource="{ui:BitmapIconSource Source=/Assets/ToolkitLogo.png}"/>
62+
<SwipeItem IconSource="{ui:BitmapIconSource Source=/Assets/mslogo.png}"/>
6363
</SwipeItems>
6464
</SwipeControl.LeftItems>
6565
<TextBlock Text="Swipe Right"
@@ -76,8 +76,8 @@
7676
Width="300" Margin="12" Height="68">
7777
<SwipeControl.LeftItems>
7878
<SwipeItems Mode="Reveal">
79-
<SwipeItem Text="Accept" IconSource="{ex:SymbolIconSource Symbol=Accept}"/>
80-
<SwipeItem Text="Flag" IconSource="{ex:SymbolIconSource Symbol=Flag}"/>
79+
<SwipeItem Text="Accept" IconSource="{ui:SymbolIconSource Symbol=Accept}"/>
80+
<SwipeItem Text="Flag" IconSource="{ui:SymbolIconSource Symbol=Flag}"/>
8181
</SwipeItems>
8282
</SwipeControl.LeftItems>
8383
<TextBlock Text="Swipe Right"
@@ -93,9 +93,9 @@
9393
<Button.Flyout>
9494
<MenuFlyout>
9595
<MenuFlyoutItem Text="Toolkit app"
96-
Icon="{ex:BitmapIcon Source=/Assets/ToolkitLogo.png}" />
96+
Icon="{ui:BitmapIcon Source=/Assets/ToolkitLogo.png}" />
9797
<MenuFlyoutItem Text="Microsoft"
98-
Icon="{ex:BitmapIcon Source=/Assets/mslogo.png}" />
98+
Icon="{ui:BitmapIcon Source=/Assets/mslogo.png}" />
9999
</MenuFlyout>
100100
</Button.Flyout>
101101
</Button>

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Implicit Animations/ImplicitAnimationsCode.bind

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6-
xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
6+
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
77
xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
88
mc:Ignorable="d">
99

@@ -16,7 +16,7 @@
1616
Background="Red"
1717
Canvas.Top="100"
1818
Canvas.Left="100"
19-
extensions:VisualExtensions.CenterPoint="50,50,0">
19+
ui:VisualExtensions.CenterPoint="50,50,0">
2020

2121
<animations:Implicit.ShowAnimations>
2222
<animations:TranslationAnimation Duration="0:0:1" From="0, -200, 0" To="0"/>

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsCode.bind

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6-
xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
6+
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
77
mc:Ignorable="d">
88

99
<Page.Resources>
@@ -23,10 +23,10 @@
2323
Margin="12"
2424
ItemTemplate="{StaticResource NormalTemplate}"
2525
IsItemClickEnabled="True"
26-
extensions:ListViewExtensions.Command="{Binding SampleCommand}"
27-
extensions:ListViewExtensions.AlternateColor="#33AAAAAA"
28-
extensions:ListViewExtensions.AlternateItemTemplate="{StaticResource AlternateTemplate}"
29-
extensions:ListViewExtensions.StretchItemContainerDirection="Both">
26+
ui:ListViewExtensions.Command="{Binding SampleCommand}"
27+
ui:ListViewExtensions.AlternateColor="#33AAAAAA"
28+
ui:ListViewExtensions.AlternateItemTemplate="{StaticResource AlternateTemplate}"
29+
ui:ListViewExtensions.StretchItemContainerDirection="Both">
3030
</ListView>
3131
</Grid>
3232
</Page>

0 commit comments

Comments
 (0)