From e4bf30b08ebc294a83d453a7f40e47d689158210 Mon Sep 17 00:00:00 2001
From: chingucoding <marcel.alex.wagner@outlook.com>
Date: Fri, 5 Mar 2021 19:31:06 +0100
Subject: [PATCH] Fifth round of changes, switching to fast pass rendering; Fun
 fact: The only holomorphic (complex differentiable) functions with a global
 maximum are constants, all other holomorphic functions have no global maximum
 besides on the domain boundary

---
 dev/CommonStyles/TestUI/CornerRadiusPage.xaml | 28 +++++------
 .../TestUI/DropDownButtonPage.xaml            |  6 +--
 dev/Expander/TestUI/ExpanderPage.xaml         | 16 +++----
 dev/InfoBar/TestUI/InfoBarPage.xaml           |  2 +-
 .../Acrylic/TestUI/AcrylicBrushPage.xaml      |  8 ++--
 .../TestUI/Common/NavigationViewInitPage.xaml |  4 +-
 .../NavigationViewMenuItemStretchPage.xaml    |  8 ++--
 .../TestUI/Common/NavigationViewPage.xaml     | 22 ++++-----
 .../Common/NavigationViewPageDataContext.xaml |  5 +-
 .../Common/NavigationViewStretchPage.xaml     |  2 +-
 ...avigationViewCustomThemeResourcesPage.xaml |  4 +-
 .../NavigationViewItemTemplatePage.xaml       |  4 +-
 ...HierarchicalNavigationViewDataBinding.xaml |  8 ++--
 .../HierarchicalNavigationViewMarkup.xaml     | 12 ++---
 .../TopMode/NavigationViewTopNavOnlyPage.xaml |  2 +-
 .../TopMode/NavigationViewTopNavPage.xaml     |  4 +-
 dev/NumberBox/TestUI/NumberBoxPage.xaml       |  2 +-
 .../TestUI/RadioButtonsFocusPage.xaml         | 32 ++++++-------
 dev/RadioButtons/TestUI/RadioButtonsPage.xaml | 47 ++++++++++---------
 dev/Repeater/TestUI/RepeaterTestUIPage.xaml   |  8 ++--
 .../AnimationSamples/AnimationsDemoPage.xaml  | 14 +++---
 .../ItemTemplateSamples/ItemTemplateDemo.xaml | 10 ++--
 .../CollectionChangeDemo.xaml                 |  8 ++--
 .../Virtual/PinterestLayoutSamplePage.xaml    |  2 +-
 .../VirtualizingStackLayoutSamplePage.xaml    |  2 +-
 ...tualizingUniformStackLayoutSamplePage.xaml |  2 +-
 ...tualizingUniformStackLayoutSamplePage.xaml |  2 +-
 .../SelectionSample/Flat/FlatSample.xaml      |  2 +-
 .../TreeView/TreeViewSample.xaml              |  2 +-
 dev/SplitButton/TestUI/SplitButtonPage.xaml   | 12 ++---
 .../SwipeControlClearPage.xaml                |  2 +-
 .../SwipeControl_TestUI/SwipeControlPage.xaml | 44 ++++++++---------
 dev/TabView/TestUI/TabViewPage.xaml           | 18 +++----
 dev/TabView/TestUI/TabViewSizingPage.xaml     | 32 ++++++-------
 dev/TeachingTip/TestUI/TeachingTipPage.xaml   |  8 ++--
 .../Tests/MetadataProviderTests.cs            |  2 +-
 ...gationViewWithCustomResourcesTestPage.xaml |  4 +-
 .../NugetPackageTestAppCX/MainPage.xaml       |  2 +-
 38 files changed, 196 insertions(+), 196 deletions(-)

diff --git a/dev/CommonStyles/TestUI/CornerRadiusPage.xaml b/dev/CommonStyles/TestUI/CornerRadiusPage.xaml
index b13d1e275e..852a415b3f 100644
--- a/dev/CommonStyles/TestUI/CornerRadiusPage.xaml
+++ b/dev/CommonStyles/TestUI/CornerRadiusPage.xaml
@@ -142,7 +142,7 @@
                         </ListBox>
                     </Grid>
                     <Grid Grid.Row="5" Style="{StaticResource RightColumn}" VerticalAlignment="Center">
-                        <TextBlock VerticalAlignment="Center">N/A</TextBlock>
+                        <TextBlock VerticalAlignment="Center" Text="N/A"/>
                     </Grid>
 
                     <TextBlock Grid.Row="6" Text="ComboBox" Style="{StaticResource SideHeader}"/>
@@ -238,7 +238,7 @@
                         </CommandBar>
                     </Grid>
                     <Grid Grid.Row="11" Style="{StaticResource RightColumn}" VerticalAlignment="Center">
-                        <TextBlock>N/A</TextBlock>
+                        <TextBlock Text="N/A"/>
                     </Grid>
 
                     <TextBlock Grid.Row="12" Text="Flyout" Style="{StaticResource SideHeader}"/>
@@ -422,7 +422,7 @@
                         <ToggleSwitch/>
                     </Grid>
                     <Grid Grid.Row="20" Style="{StaticResource RightColumn}" VerticalAlignment="Center">
-                        <TextBlock>N/A</TextBlock>
+                        <TextBlock Text="N/A"/>
                     </Grid>
 
                     <TextBlock Grid.Row="21" Text="Slider" Style="{StaticResource SideHeader}"/>
@@ -500,7 +500,7 @@
                         </AppBar>
                     </Grid>
                     <Grid Grid.Row="25" Style="{StaticResource RightColumn}" VerticalAlignment="Center">
-                        <TextBlock>N/A</TextBlock>
+                        <TextBlock Text="N/A"/>
                     </Grid>
 
                     <TextBlock Grid.Row="26" Text="MenuBar" Style="{StaticResource SideHeader}"/>
@@ -572,7 +572,7 @@
                         <TextBlock Text="Hello World"/>
                     </Grid>
                     <Grid Grid.Row="32" Style="{StaticResource RightColumn}">
-                        <TextBlock>N/A</TextBlock>
+                        <TextBlock Text="N/A"/>
                     </Grid>
 
                     <TextBlock Grid.Row="33" Text="RichTextBlock" Style="{StaticResource SideHeader}"/>
@@ -584,7 +584,7 @@
                         </RichTextBlock>
                     </Grid>
                     <Grid Grid.Row="33" Style="{StaticResource RightColumn}">
-                        <TextBlock>N/A</TextBlock>
+                        <TextBlock Text="N/A"/>
                     </Grid>
 
                     <TextBlock Grid.Row="34" Text="CheckBox" Style="{StaticResource SideHeader}"/>
@@ -675,7 +675,7 @@
                         </StackPanel>
                     </Grid>
                     <Grid Grid.Row="40" Style="{StaticResource RightColumn}" VerticalAlignment="Center">
-                        <TextBlock>N/A</TextBlock>
+                        <TextBlock Text="N/A"/>
                     </Grid>
 
                     <TextBlock Grid.Row="41" Text="ToggleButton" Style="{StaticResource SideHeader}"/>
@@ -700,7 +700,7 @@
                             <controls:ToggleSplitButton.Flyout>
                                 <Flyout>
                                     <Flyout.Content>
-                                        <TextBlock>Hello World</TextBlock>
+                                        <TextBlock Text="Hello World"/>
                                     </Flyout.Content>
                                 </Flyout>
                             </controls:ToggleSplitButton.Flyout>
@@ -711,7 +711,7 @@
                             <controls:ToggleSplitButton.Flyout>
                                 <Flyout>
                                     <Flyout.Content>
-                                        <TextBlock>Hello World</TextBlock>
+                                        <TextBlock Text="Hello World"/>
                                     </Flyout.Content>
                                 </Flyout>
                             </controls:ToggleSplitButton.Flyout>
@@ -735,7 +735,7 @@
                         <HyperlinkButton Content="Hello World"/>
                     </Grid>
                     <Grid Grid.Row="44" Style="{StaticResource RightColumn}" VerticalAlignment="Center">
-                        <TextBlock>N/A</TextBlock>
+                        <TextBlock Text="N/A"/>
                     </Grid>
 
                     <TextBlock Grid.Row="45" Text="DropDownButton" Style="{StaticResource SideHeader}"/>
@@ -748,7 +748,7 @@
                             <controls:DropDownButton.Flyout>
                                 <Flyout>
                                     <Flyout.Content>
-                                        <TextBlock>Hello World</TextBlock>
+                                        <TextBlock Text="Hello World"/>
                                     </Flyout.Content>
                                 </Flyout>
                             </controls:DropDownButton.Flyout>
@@ -759,7 +759,7 @@
                             <controls:DropDownButton.Flyout>
                                 <Flyout>
                                     <Flyout.Content>
-                                        <TextBlock>Hello World</TextBlock>
+                                        <TextBlock Text="Hello World"/>
                                     </Flyout.Content>
                                 </Flyout>
                             </controls:DropDownButton.Flyout>
@@ -775,7 +775,7 @@
                             <controls:SplitButton.Flyout>
                                 <Flyout>
                                     <Flyout.Content>
-                                        <TextBlock>Hello World</TextBlock>
+                                        <TextBlock Text="Hello World"/>
                                     </Flyout.Content>
                                 </Flyout>
                             </controls:SplitButton.Flyout>
@@ -786,7 +786,7 @@
                             <controls:SplitButton.Flyout>
                                 <Flyout>
                                     <Flyout.Content>
-                                        <TextBlock>Hello World</TextBlock>
+                                        <TextBlock Text="Hello World"/>
                                     </Flyout.Content>
                                 </Flyout>
                             </controls:SplitButton.Flyout>
diff --git a/dev/DropDownButton/TestUI/DropDownButtonPage.xaml b/dev/DropDownButton/TestUI/DropDownButtonPage.xaml
index 8a6c0db308..6e3566fc09 100644
--- a/dev/DropDownButton/TestUI/DropDownButtonPage.xaml
+++ b/dev/DropDownButton/TestUI/DropDownButtonPage.xaml
@@ -58,13 +58,13 @@
                         <RowDefinition />
                     </Grid.RowDefinitions>
 
-                    <TextBlock Grid.Row="0">Click count:</TextBlock>
+                    <TextBlock Grid.Row="0" Text="Click count:"/>
                     <TextBlock x:Name="ClickCountTextBlock" AutomationProperties.Name="ClickCountTextBlock"
                                Margin="4,0,0,0" Text="0" Grid.Row="0" Grid.Column="1"/>
-                    <TextBlock Grid.Row="1">Flyout opened:</TextBlock>
+                    <TextBlock Grid.Row="1" Text="Flyout opened:"/>
                     <TextBlock x:Name="FlyoutOpenedCountTextBlock" AutomationProperties.Name="FlyoutOpenedCountTextBlock"
                                Margin="4,0,0,0" Text="0" Grid.Row="1" Grid.Column="1"/>
-                    <TextBlock Grid.Row="2">Flyout closed:</TextBlock>
+                    <TextBlock Grid.Row="2" Text="Flyout closed:"/>
                     <TextBlock x:Name="FlyoutClosedCountTextBlock" AutomationProperties.Name="FlyoutClosedCountTextBlock"
                                Margin="4,0,0,0" Text="0" Grid.Row="2" Grid.Column="1"/>
                 </Grid>
diff --git a/dev/Expander/TestUI/ExpanderPage.xaml b/dev/Expander/TestUI/ExpanderPage.xaml
index ac293bd24b..b61ec0a77a 100644
--- a/dev/Expander/TestUI/ExpanderPage.xaml
+++ b/dev/Expander/TestUI/ExpanderPage.xaml
@@ -33,7 +33,7 @@
                 <controls:Expander.Header>
                     <TextBlock Text="This expander is collapsed by default. This is a long title to test the header width. ext should be wrapping here." TextWrapping="Wrap" Margin="0,12,0,13"/>
                 </controls:Expander.Header>
-                <TextBlock AutomationProperties.AutomationId="CollapsedExpanderContent">Content</TextBlock>
+                <TextBlock AutomationProperties.AutomationId="CollapsedExpanderContent" Text="Content"/>
             </controls:Expander>
 
             <controls:Expander AutomationProperties.Name="ExpanderWithButtons" IsExpanded="False" Margin="12">
@@ -41,35 +41,35 @@
                     <ToggleButton>This is a toggle button in the header</ToggleButton>
                 </controls:Expander.Header>
                 <StackPanel>
-                    <TextBlock TextWrapping="Wrap">Content. This is long content to test wrapping on the content section, this content should be wrapping.</TextBlock>
+                    <TextBlock TextWrapping="Wrap" Text="Content. This is long content to test wrapping on the content section, this content should be wrapping."/>
                 </StackPanel>
             </controls:Expander>
 
             <controls:Expander AutomationProperties.Name="ExpanderWithUpwardsDirection" ExpandDirection="Up" IsExpanded="False" Margin="12">
                 <controls:Expander.Header>
-                    <TextBlock Margin="0,0,0,1">This expander will expand upwards</TextBlock>
+                    <TextBlock Margin="0,0,0,1" Text="This expander will expand upwards"/>
                 </controls:Expander.Header>
                 <StackPanel>
-                    <TextBlock>Content</TextBlock>
+                    <TextBlock Text="Content"/>
                 </StackPanel>
             </controls:Expander>
 
             <controls:Expander IsEnabled="False" AutomationProperties.Name="ExpanderNotEnabled" ExpandDirection="Down" IsExpanded="False" Margin="12">
                 <controls:Expander.Header>
-                    <TextBlock Margin="0,0,0,1">This expander is not enabled</TextBlock>
+                    <TextBlock Margin="0,0,0,1" Text="This expander is not enabled"/>
                 </controls:Expander.Header>
                 <StackPanel>
-                    <TextBlock>Content</TextBlock>
+                    <TextBlock Text="Content"/>
                 </StackPanel>
             </controls:Expander>
 
             <local:TestControl IsTabStop="True" x:Name="CustomControl" AutomationProperties.Name="CustomControl" Margin="12">
                 <controls:Expander x:Name="ExpanderWithCustomEventsSource" ExpandDirection="Down" IsExpanded="False">
                     <controls:Expander.Header>
-                        <TextBlock Margin="0,0,0,1">This expander has a custom events source</TextBlock>
+                        <TextBlock Margin="0,0,0,1" Text="This expander has a custom events source"/>
                     </controls:Expander.Header>
                     <StackPanel>
-                        <TextBlock>Content</TextBlock>
+                        <TextBlock Text="Content"/>
                     </StackPanel>
                 </controls:Expander>
             </local:TestControl>
diff --git a/dev/InfoBar/TestUI/InfoBarPage.xaml b/dev/InfoBar/TestUI/InfoBarPage.xaml
index f34f9a9607..5dd5c7cb35 100644
--- a/dev/InfoBar/TestUI/InfoBarPage.xaml
+++ b/dev/InfoBar/TestUI/InfoBarPage.xaml
@@ -85,7 +85,7 @@
                 </ScrollViewer>
 
                 <StackPanel Grid.Column="1" Orientation="Vertical" HorizontalAlignment="Left" Margin="20,0,0,0">
-                    <TextBlock>Events:</TextBlock>
+                    <TextBlock Text="Events:"/>
                     <ListBox x:Name="EventListBox" AutomationProperties.Name="EventListBox" MinWidth="150" MaxHeight="380">
                         <ListBox.Resources>
                             <Style TargetType="ListBoxItem">
diff --git a/dev/Materials/Acrylic/TestUI/AcrylicBrushPage.xaml b/dev/Materials/Acrylic/TestUI/AcrylicBrushPage.xaml
index 93efce5b07..fc2c707182 100644
--- a/dev/Materials/Acrylic/TestUI/AcrylicBrushPage.xaml
+++ b/dev/Materials/Acrylic/TestUI/AcrylicBrushPage.xaml
@@ -84,22 +84,22 @@
                     <ToggleButton x:Name="AnimateBackgroundButton" Content="Animate Background" Checked="AnimateBackgroundButton_Checked" Unchecked="AnimateBackgroundButton_Unchecked"/>
 
                 <StackPanel Orientation="Vertical">
-                    <TextBlock VerticalAlignment="Top" FontSize="12">TintOpacity:</TextBlock>
+                    <TextBlock VerticalAlignment="Top" FontSize="12" Text="TintOpacity:"/>
                     <Slider x:Name="TintOpacity" Width="200" Minimum="0.0" Maximum="1.0" StepFrequency="0.05" Value="0.6" HorizontalAlignment="Left" ToolTipService.ToolTip="Adjust Tint Opacity" ValueChanged="TintOpacity_ValueChanged" />
                 </StackPanel>
                 <StackPanel Orientation="Vertical">
-                    <TextBlock VerticalAlignment="Top" FontSize="12">TintLuminosityOpacity:</TextBlock>
+                    <TextBlock VerticalAlignment="Top" FontSize="12" Text="TintLuminosityOpacity:"/>
                     <StackPanel Orientation="Horizontal">
                         <Slider x:Name="TintLuminosityOpacity" Width="200" Minimum="0.0" Maximum="2.0" StepFrequency="0.01" Value="0.9" HorizontalAlignment="Left" ToolTipService.ToolTip="Adjust Luminosity Blend Opacity" ValueChanged="TintLuminosityOpacity_ValueChanged" />
                         <CheckBox x:Name="AutoTintLuminosityOpacity" Content="Auto" Margin="10,0,0,0" Checked="AutoTintLuminosityOpacity_IsCheckedChanged" Unchecked="AutoTintLuminosityOpacity_IsCheckedChanged" />
                     </StackPanel>
                 </StackPanel>
                 <StackPanel Orientation="Vertical">
-                    <TextBlock VerticalAlignment="Top" FontSize="12">Rectangle Size:</TextBlock>
+                    <TextBlock VerticalAlignment="Top" FontSize="12" Text="Rectangle Size:"/>
                     <Slider x:Name="SizeSlider" Width="200" Minimum="1" Maximum="800" StepFrequency="10" Value="300" HorizontalAlignment="Left" ToolTipService.ToolTip="Adjust Rectangle Size"/>
                 </StackPanel>
                 <StackPanel Orientation="Vertical">
-                    <TextBlock VerticalAlignment="Top" FontSize="12">ScaleTransform:</TextBlock>
+                    <TextBlock VerticalAlignment="Top" FontSize="12" Text="ScaleTransform:"/>
                     <Slider x:Name="ScaleTransformSlider" Width="200" Minimum="0.1" Maximum="3" StepFrequency="0.1" Value="1" HorizontalAlignment="Left" ToolTipService.ToolTip="Adjust Rectangle ScaleTransform"/>
                 </StackPanel>
                 <Viewbox x:Name="Viewbox"/>
diff --git a/dev/NavigationView/TestUI/Common/NavigationViewInitPage.xaml b/dev/NavigationView/TestUI/Common/NavigationViewInitPage.xaml
index b8525f0ef5..e12d174a56 100644
--- a/dev/NavigationView/TestUI/Common/NavigationViewInitPage.xaml
+++ b/dev/NavigationView/TestUI/Common/NavigationViewInitPage.xaml
@@ -49,12 +49,12 @@
 
                     <StackPanel Orientation="Vertical">
                         <StackPanel Orientation="Horizontal">
-                            <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center">ItemInvoked Arguments (InvokedItem | InvokedItemContainer):</TextBlock>
+                            <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center" Text="ItemInvoked Arguments (InvokedItem | InvokedItemContainer):"/>
                             <TextBox Margin="42,0,0,0" x:Name="ItemInvokedItemType" AutomationProperties.Name="ItemInvokedItemType" Text="N/A"/>
                             <TextBox x:Name="ItemInvokedItemContainerType" AutomationProperties.Name="ItemInvokedItemContainerType" Text="N/A"/>
                         </StackPanel>
                         <StackPanel Orientation="Horizontal">
-                            <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center">SelectionChanged Arguments (SelectedItem | SelectedItemContainer):</TextBlock>
+                            <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center" Text="SelectionChanged Arguments (SelectedItem | SelectedItemContainer):"/>
                             <TextBox x:Name="SelectionChangedItemType" AutomationProperties.Name="SelectionChangedItemType" Text="N/A"/>
                             <TextBox x:Name="SelectionChangedItemContainerType" AutomationProperties.Name="SelectionChangedItemContainerType" Text="N/A"/>
                         </StackPanel>
diff --git a/dev/NavigationView/TestUI/Common/NavigationViewMenuItemStretchPage.xaml b/dev/NavigationView/TestUI/Common/NavigationViewMenuItemStretchPage.xaml
index 93e2d8abae..f4328ac4b7 100644
--- a/dev/NavigationView/TestUI/Common/NavigationViewMenuItemStretchPage.xaml
+++ b/dev/NavigationView/TestUI/Common/NavigationViewMenuItemStretchPage.xaml
@@ -15,22 +15,22 @@
             <muxcontrols:NavigationView.MenuItems>
                 <muxcontrols:NavigationViewItem HorizontalContentAlignment="Center" Icon="Find" Tag="find" IsSelected="True">
                     <Border Background="Red">
-                        <TextBlock>Center</TextBlock>
+                        <TextBlock Text="Center"/>
                     </Border>
                 </muxcontrols:NavigationViewItem>
                 <muxcontrols:NavigationViewItem HorizontalContentAlignment="Left" Icon="Find" Tag="find" IsSelected="True">
                     <Border Background="Red">
-                        <TextBlock>Left</TextBlock>
+                        <TextBlock Text="Left"/>
                     </Border>
                 </muxcontrols:NavigationViewItem>
                 <muxcontrols:NavigationViewItem HorizontalContentAlignment="Right" Icon="Find" Tag="find" IsSelected="True">
                     <Border Background="Red">
-                        <TextBlock>Right</TextBlock>
+                        <TextBlock Text="Right"/>
                     </Border>
                 </muxcontrols:NavigationViewItem>
                 <muxcontrols:NavigationViewItem HorizontalContentAlignment="Stretch" Icon="Find" Tag="find" IsSelected="True">
                     <Border Background="Red">
-                        <TextBlock>Stretch</TextBlock>
+                        <TextBlock Text="Stretch"/>
                     </Border>
                 </muxcontrols:NavigationViewItem>
 
diff --git a/dev/NavigationView/TestUI/Common/NavigationViewPage.xaml b/dev/NavigationView/TestUI/Common/NavigationViewPage.xaml
index 96cd1812e8..278974363c 100644
--- a/dev/NavigationView/TestUI/Common/NavigationViewPage.xaml
+++ b/dev/NavigationView/TestUI/Common/NavigationViewPage.xaml
@@ -189,7 +189,7 @@
                             <ComboBoxItem Content="LeftMinimal" Tag="LeftMinimal"/>
                         </ComboBox>
                         <Button x:Name="ClearSelectionChangeIndicatorButton" AutomationProperties.Name="ClearSelectionChangeIndicatorButton"  Click="ClearSelectionChangeBlock">Clear selection changed indicator</Button>
-                        <TextBlock VerticalAlignment="Center">Selection was raised:  </TextBlock>
+                        <TextBlock VerticalAlignment="Center" Text="Selection was raised:"/>
                         <TextBlock VerticalAlignment="Center" x:Name="SelectionChangedRaised" AutomationProperties.Name="SelectionChangedRaised"/>
                     </StackPanel>
 
@@ -234,16 +234,16 @@
 
                     <StackPanel Orientation="Horizontal">
                         <Button x:Name="ReadSettingsSelected" AutomationProperties.Name="ReadSettingsSelected" Content="ReadSettingsSelected" Click="ReadSettingsSelected_Click"/>
-                        <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center">SettingsSelectionState: </TextBlock>
-                        <TextBlock x:Name="SettingsSelectedState" AutomationProperties.Name="SettingsSelectedState" HorizontalAlignment="Center" VerticalAlignment="Center">False</TextBlock>
+                        <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center" Text="SettingsSelectionState:"/>
+                        <TextBlock x:Name="SettingsSelectedState" AutomationProperties.Name="SettingsSelectedState" HorizontalAlignment="Center" VerticalAlignment="Center" Text="False"/>
                     </StackPanel>
 
                     <StackPanel Orientation="Horizontal" Margin="0 5">
                         <Button x:Name="GetHeaderContentMargin" AutomationProperties.Name="GetHeaderContentMargin" Content="GetHeaderContentMargin" Click="GetHeaderContentMargin_Click"/>
-                        <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center">HeaderContent.Margin: </TextBlock>
+                        <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center" Text="HeaderContent.Margin: "/>
                         <TextBlock x:Name="HeaderContentMarginResult" AutomationProperties.Name="HeaderContentMarginResult" VerticalAlignment="Center"/>
                         <Button x:Name="GetNavViewActiveVisualStates" AutomationProperties.Name="GetNavViewActiveVisualStates" Content="GetNavViewActiveVisualStates" Click="GetNavViewActiveVisualStates_Click"/>
-                        <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center">NavView Active VisualStates: </TextBlock>
+                        <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center" Text="NavView Active VisualStates: "/>
                         <TextBlock x:Name="NavViewActiveVisualStatesResult" AutomationProperties.Name="NavViewActiveVisualStatesResult" VerticalAlignment="Center"/>
                     </StackPanel>
                     
@@ -251,26 +251,26 @@
                         <Button x:Name="ChangePaneHeader" AutomationProperties.Name="ChangePaneHeader" Content="ChangePaneHeader" Margin="0,0,2,0" Click="ChangePaneHeader_Click"/>
                         <Button x:Name="ChangeFocusVisualKind" AutomationProperties.Name="ChangeFocusVisualKind" Content="ChangeFocusVisualKind" Margin="0,0,2,0" Click="ChangeFocusVisualKind_Click"/>
                         <Button x:Name="GetHomeItemRevealVisualState" AutomationProperties.Name="GetHomeItemRevealVisualState" Click="GetHomeItemRevealVisualState_Click" Content="Get HomeItem Reveal VisualState"/>
-                        <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center">LeftNavigationReveal?: </TextBlock>
+                        <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center" Text="LeftNavigationReveal?: "/>
                         <TextBlock x:Name="OnLeftNavigationRevealVisualState" AutomationProperties.Name="OnLeftNavigationRevealVisualState" Text="False" VerticalAlignment="Center"/>
                     </StackPanel>
 
                     <StackPanel Orientation="Horizontal" Margin="0 5">
                         <Button x:Name="ResetEventCounters" AutomationProperties.Name="ResetEventCounters" Content="Reset Event Counters" Margin="0,0,2,0" Click="ResetEventCounters_Click"/>
-                        <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center">Number_of_ItemInvoked_events_raised:</TextBlock>
+                        <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center" Text="Number_of_ItemInvoked_events_raised:"/>
                         <TextBlock x:Name="NumberOfItemInvokedEventsRaisedTextBlock" AutomationProperties.Name="NumberOfItemInvokedEventsRaisedTextBlock" Text="0" VerticalAlignment="Center"/>
-                        <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center">Number_of_SelectionChanged_events_raised:</TextBlock>
+                        <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center" Text="Number_of_SelectionChanged_events_raised:"/>
                         <TextBlock x:Name="NumberOfSelectionChangedEventsRaisedTextBlock" AutomationProperties.Name="NumberOfSelectionChangedEventsRaisedTextBlock" Text="0" VerticalAlignment="Center"/>
                     </StackPanel>
 
                     <StackPanel Orientation="Vertical">
                         <StackPanel Orientation="Horizontal">
-                            <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center">ItemInvoked Arguments (InvokedItem | InvokedItemContainer): </TextBlock>
+                            <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center" Text="ItemInvoked Arguments (InvokedItem | InvokedItemContainer): "/>
                             <TextBox Margin="42,0,0,0" x:Name="ItemInvokedItemType" AutomationProperties.Name="ItemInvokedItemType" Text="N/A"/>
                             <TextBox x:Name="ItemInvokedItemContainerType" AutomationProperties.Name="ItemInvokedItemContainerType" Text="N/A"/>
                         </StackPanel>
                         <StackPanel Orientation="Horizontal">
-                            <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center">SelectionChanged Arguments (SelectedItem | SelectedItemContainer):</TextBlock>
+                            <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center" Text="SelectionChanged Arguments (SelectedItem | SelectedItemContainer):"/>
                             <TextBox x:Name="SelectionChangedItemType" AutomationProperties.Name="SelectionChangedItemType" Text="N/A"/>
                             <TextBox x:Name="SelectionChangedItemContainerType" AutomationProperties.Name="SelectionChangedItemContainerType" Text="N/A"/>
                         </StackPanel>
@@ -299,7 +299,7 @@
                                 Content="GetTopLevelNavViewItemContentPresenterMargin" Margin="0,0,5,0" Click="GetTopLevelNavViewItemContentPresenterMarginButton_Click"/>
                         <Button x:Name="GetChildNavViewItemContentPresenterMarginButton" AutomationProperties.Name="GetChildNavViewItemContentPresenterMarginButton"
                                 Content="GetChildNavViewItemContentPresenterMargin" Margin="0,0,2,0" Click="GetChildNavViewItemContentPresenterMarginButton_Click" />
-                        <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center">NavViewItemContentPresenter.Margin:</TextBlock>
+                        <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center" Text="NavViewItemContentPresenter.Margin:"/>
                         <TextBlock x:Name="NavViewItemContentPresenterMarginTextBlock" AutomationProperties.Name="NavViewItemContentPresenterMarginTextBlock" VerticalAlignment="Center"/>
                     </StackPanel>
 
diff --git a/dev/NavigationView/TestUI/Common/NavigationViewPageDataContext.xaml b/dev/NavigationView/TestUI/Common/NavigationViewPageDataContext.xaml
index 21e58e0da2..5e31164762 100644
--- a/dev/NavigationView/TestUI/Common/NavigationViewPageDataContext.xaml
+++ b/dev/NavigationView/TestUI/Common/NavigationViewPageDataContext.xaml
@@ -10,7 +10,6 @@
     mc:Ignorable="d">
 
     <StackPanel Orientation="Horizontal">
-       
         <muxcontrols:NavigationView
             x:Name="NavView"
             AutomationProperties.Name="NavView"
@@ -19,12 +18,12 @@
             PaneDisplayMode="Left">
             <StackPanel>
                 <StackPanel Orientation="Horizontal" Margin="0 5">
-                    <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center">DataContext of SelectedItem:</TextBlock>
+                    <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center" Text="DataContext of SelectedItem:"/>
                     <TextBlock x:Name="NavViewSelectedDataContext" AutomationProperties.Name="NavViewSelectedDataContext" VerticalAlignment="Center"/>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal" Margin="0 5">
                     <Button x:Name="GetNavViewActiveVisualStates" AutomationProperties.Name="GetNavViewActiveVisualStates" Content="GetNavViewActiveVisualStates" Click="GetNavViewActiveVisualStates_Click"/>
-                    <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center">NavView Active VisualStates:</TextBlock>
+                    <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center" Text="NavView Active VisualStates:"/>
                     <TextBlock x:Name="NavViewActiveVisualStatesResult" AutomationProperties.Name="NavViewActiveVisualStatesResult" VerticalAlignment="Center"/>
                 </StackPanel>
             </StackPanel>
diff --git a/dev/NavigationView/TestUI/Common/NavigationViewStretchPage.xaml b/dev/NavigationView/TestUI/Common/NavigationViewStretchPage.xaml
index 54463fe99b..2fec71adc1 100644
--- a/dev/NavigationView/TestUI/Common/NavigationViewStretchPage.xaml
+++ b/dev/NavigationView/TestUI/Common/NavigationViewStretchPage.xaml
@@ -32,7 +32,7 @@
                 <Button x:Name="PaneCustomContent" Content="PaneCustomContent" HorizontalAlignment="Stretch" IsTabStop="False" />
             </muxcontrols:NavigationView.PaneCustomContent>
             <StackPanel Padding="10">
-                <TextBlock>This is content</TextBlock>
+                <TextBlock Text="This is content"/>
             </StackPanel>
         </muxcontrols:NavigationView>
     </Grid>
diff --git a/dev/NavigationView/TestUI/CustomResources/NavigationViewCustomThemeResourcesPage.xaml b/dev/NavigationView/TestUI/CustomResources/NavigationViewCustomThemeResourcesPage.xaml
index 5c52eb6811..bbfe503879 100644
--- a/dev/NavigationView/TestUI/CustomResources/NavigationViewCustomThemeResourcesPage.xaml
+++ b/dev/NavigationView/TestUI/CustomResources/NavigationViewCustomThemeResourcesPage.xaml
@@ -157,10 +157,10 @@
 
                     <StackPanel Orientation="Horizontal" Margin="0 5">
                         <Button x:Name="GetHeaderContentMargin" AutomationProperties.Name="GetHeaderContentMargin" Content="GetHeaderContentMargin" Click="GetHeaderContentMargin_Click"/>
-                        <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center">HeaderContent.Margin: </TextBlock>
+                        <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center" Text="HeaderContent.Margin: "/>
                         <TextBlock x:Name="HeaderContentMarginResult" AutomationProperties.Name="HeaderContentMarginResult" VerticalAlignment="Center"/>
                         <Button x:Name="GetNavViewActiveVisualStates" AutomationProperties.Name="GetNavViewActiveVisualStates" Content="GetNavViewActiveVisualStates" Click="GetNavViewActiveVisualStates_Click"/>
-                        <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center">NavView Active VisualStates: </TextBlock>
+                        <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center" Text=">NavView Active VisualStates: "/>
                         <TextBlock x:Name="NavViewActiveVisualStatesResult" AutomationProperties.Name="NavViewActiveVisualStatesResult" VerticalAlignment="Center"/>
                     </StackPanel>
                     
diff --git a/dev/NavigationView/TestUI/CustomResources/NavigationViewItemTemplatePage.xaml b/dev/NavigationView/TestUI/CustomResources/NavigationViewItemTemplatePage.xaml
index 949f83a780..e4073bff96 100644
--- a/dev/NavigationView/TestUI/CustomResources/NavigationViewItemTemplatePage.xaml
+++ b/dev/NavigationView/TestUI/CustomResources/NavigationViewItemTemplatePage.xaml
@@ -41,12 +41,12 @@
                 <TextBlock x:Name="SelectionEventResult" AutomationProperties.Name="SelectionEventResult"/>
                 <StackPanel Orientation="Vertical" contract5Present:Spacing="5">
                     <StackPanel Orientation="Horizontal" contract5Present:Spacing="5">
-                        <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center">ItemInvoked Arguments (InvokedItem | InvokedItemContainer):</TextBlock>
+                        <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center" Text="ItemInvoked Arguments (InvokedItem | InvokedItemContainer):"/>
                         <TextBox Margin="42,0,0,0" x:Name="ItemInvokedItemType" AutomationProperties.Name="ItemInvokedItemType" Text="N/A"/>
                         <TextBox x:Name="ItemInvokedItemContainerType" AutomationProperties.Name="ItemInvokedItemContainerType" Text="N/A"/>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" contract5Present:Spacing="5">
-                        <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center">SelectionChanged Arguments (SelectedItem | SelectedItemContainer):</TextBlock>
+                        <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center" Text="SelectionChanged Arguments (SelectedItem | SelectedItemContainer):"/>
                         <TextBox x:Name="SelectionChangedItemType" AutomationProperties.Name="SelectionChangedItemType" Text="N/A"/>
                         <TextBox x:Name="SelectionChangedItemContainerType" AutomationProperties.Name="SelectionChangedItemContainerType" Text="N/A"/>
                     </StackPanel>
diff --git a/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewDataBinding.xaml b/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewDataBinding.xaml
index 4008169953..769eb32597 100644
--- a/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewDataBinding.xaml
+++ b/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewDataBinding.xaml
@@ -36,9 +36,9 @@
                             <ColumnDefinition Width="Auto"/>
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
-                        <TextBlock Grid.Column="0" Margin="0,0,5,0" VerticalAlignment="Center">Last Expanding:</TextBlock>
+                        <TextBlock Grid.Column="0" Margin="0,0,5,0" VerticalAlignment="Center" Text="Last Expanding:"/>
                         <TextBlock Grid.Column="1" Margin="0,0,10,0" x:Name="TextBlockExpandingItem"  AutomationProperties.Name="TextBlockExpandingItem" Text="N/A"/>
-                        <TextBlock Grid.Column="2" Margin="0,0,5,0" VerticalAlignment="Center">Expanding Item and Container match:</TextBlock>
+                        <TextBlock Grid.Column="2" Margin="0,0,5,0" VerticalAlignment="Center" Text="Expanding Item and Container match:"/>
                         <TextBlock Grid.Column="3" x:Name="TextblockExpandingItemAndContainerMatch"  AutomationProperties.Name="TextblockExpandingItemAndContainerMatch" Text="N/A"/>
                     </Grid>
                     <Grid x:Name="CollapsedEventStates">
@@ -48,9 +48,9 @@
                             <ColumnDefinition Width="Auto"/>
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
-                        <TextBlock Grid.Column="0" Margin="0,0,5,0" VerticalAlignment="Center">Last Collapsed:</TextBlock>
+                        <TextBlock Grid.Column="0" Margin="0,0,5,0" VerticalAlignment="Center" Text="Last Collapsed:"/>
                         <TextBlock Grid.Column="1" Margin="0,0,10,0" x:Name="TextBlockCollapsedItem" AutomationProperties.Name="TextBlockCollapsedItem" Text="N/A"/>
-                        <TextBlock Grid.Column="2" Margin="0,0,5,0"  VerticalAlignment="Center">Collapsed Item and Container match:</TextBlock>
+                        <TextBlock Grid.Column="2" Margin="0,0,5,0"  VerticalAlignment="Center" Text="Collapsed Item and Container match:"/>
                         <TextBlock Grid.Column="3" x:Name="TextblockCollapsedItemAndContainerMatch" AutomationProperties.Name="TextblockCollapsedItemAndContainerMatch" Text="N/A"/>
                     </Grid>
                 </StackPanel>
diff --git a/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewMarkup.xaml b/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewMarkup.xaml
index 828282af09..531ac6115e 100644
--- a/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewMarkup.xaml
+++ b/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewMarkup.xaml
@@ -98,9 +98,9 @@
                             <ColumnDefinition Width="Auto"/>
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
-                        <TextBlock Grid.Column="0" Margin="0,0,5,0" VerticalAlignment="Center">Last Expanding:</TextBlock>
+                        <TextBlock Grid.Column="0" Margin="0,0,5,0" VerticalAlignment="Center" Text="Last Expanding:"/>
                         <TextBlock Grid.Column="1" Margin="0,0,10,0" x:Name="TextBlockExpandingItem"  AutomationProperties.Name="TextBlockExpandingItem" Text="N/A"/>
-                        <TextBlock Grid.Column="2" Margin="0,0,5,0" VerticalAlignment="Center">Expanding Item and Container match:</TextBlock>
+                        <TextBlock Grid.Column="2" Margin="0,0,5,0" VerticalAlignment="Center" Text=">Expanding Item and Container match:"/>
                         <TextBlock Grid.Column="3" x:Name="TextblockExpandingItemAndContainerMatch"  AutomationProperties.Name="TextblockExpandingItemAndContainerMatch" Text="N/A"/>
                     </Grid>
                     <Grid x:Name="CollapsedEventStates">
@@ -110,9 +110,9 @@
                             <ColumnDefinition Width="Auto"/>
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
-                        <TextBlock Grid.Column="0" Margin="0,0,5,0" VerticalAlignment="Center">Last Collapsed:</TextBlock>
+                        <TextBlock Grid.Column="0" Margin="0,0,5,0" VerticalAlignment="Center" Text="Last Collapsed:"/>
                         <TextBlock Grid.Column="1" Margin="0,0,10,0" x:Name="TextBlockCollapsedItem" AutomationProperties.Name="TextBlockCollapsedItem" Text="N/A"/>
-                        <TextBlock Grid.Column="2" Margin="0,0,5,0"  VerticalAlignment="Center">Collapsed Item and Container match:</TextBlock>
+                        <TextBlock Grid.Column="2" Margin="0,0,5,0"  VerticalAlignment="Center" Text="Collapsed Item and Container match:"/>
                         <TextBlock Grid.Column="3" x:Name="TextblockCollapsedItemAndContainerMatch" AutomationProperties.Name="TextblockCollapsedItemAndContainerMatch" Text="N/A"/>
                     </Grid>
                 </StackPanel>
@@ -122,8 +122,8 @@
                     <StackPanel Orientation="Horizontal">
                         <Button x:Name="GetMenuItem1ChildrenFlyoutCornerRadiusButton" AutomationProperties.Name="GetMenuItem1ChildrenFlyoutCornerRadiusButton" Content="GetMenuItem1ChildrenFlyoutCornerRadius"
                                 Click="GetMenuItem1ChildrenFlyoutCornerRadiusButton_Click"/>
-                        <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center">CornerRadius:</TextBlock>
-                        <TextBlock x:Name="MenuItem1ChildrenFlyoutCornerRadiusTextBlock" AutomationProperties.Name="MenuItem1ChildrenFlyoutCornerRadiusTextBlock" HorizontalAlignment="Center" VerticalAlignment="Center">-</TextBlock>
+                        <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center" Text="CornerRadius:"/>
+                        <TextBlock x:Name="MenuItem1ChildrenFlyoutCornerRadiusTextBlock" AutomationProperties.Name="MenuItem1ChildrenFlyoutCornerRadiusTextBlock" HorizontalAlignment="Center" VerticalAlignment="Center" Text="-"/>
                     </StackPanel>
                 </StackPanel>
 
diff --git a/dev/NavigationView/TestUI/TopMode/NavigationViewTopNavOnlyPage.xaml b/dev/NavigationView/TestUI/TopMode/NavigationViewTopNavOnlyPage.xaml
index 7f3cebf237..37b05bf85f 100644
--- a/dev/NavigationView/TestUI/TopMode/NavigationViewTopNavOnlyPage.xaml
+++ b/dev/NavigationView/TestUI/TopMode/NavigationViewTopNavOnlyPage.xaml
@@ -55,7 +55,7 @@
                                 IsChecked="{Binding IsPaneOpen, ElementName=NavView, Mode=TwoWay}"
                                 Margin="5" />
                         <CheckBox x:Name="BackButtonVisibilityCheckbox" AutomationProperties.Name="BackButtonVisibilityCheckbox" Content="Back Visible" Checked="BackButtonVisibilityCheckbox_Checked" Unchecked="BackButtonVisibilityCheckbox_Unchecked" IsChecked="True" Margin="5"/>
-                        <TextBlock VerticalAlignment="Center">BackButtonHolder width:</TextBlock>
+                        <TextBlock VerticalAlignment="Center" Text="BackButtonHolder width:"/>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <ComboBox x:Name="PaneDisplayModeCombobox"
diff --git a/dev/NavigationView/TestUI/TopMode/NavigationViewTopNavPage.xaml b/dev/NavigationView/TestUI/TopMode/NavigationViewTopNavPage.xaml
index a2acd3c306..dc252abb51 100644
--- a/dev/NavigationView/TestUI/TopMode/NavigationViewTopNavPage.xaml
+++ b/dev/NavigationView/TestUI/TopMode/NavigationViewTopNavPage.xaml
@@ -206,8 +206,8 @@
                     <StackPanel Orientation="Horizontal">
                         <Button x:Name="GetOverflowMenuCornerRadiusButton" AutomationProperties.Name="GetOverflowMenuCornerRadiusButton" Content="GetOverflowMenuCornerRadius"
                                 Margin="0,0,2,0" Click="GetOverflowMenuCornerRadiusButton_Click"/>
-                        <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center">CornerRadius:</TextBlock>
-                        <TextBlock x:Name="OverflowMenuCornerRadiusTextBlock" AutomationProperties.Name="OverflowMenuCornerRadiusTextBlock" HorizontalAlignment="Center" VerticalAlignment="Center">-</TextBlock>
+                        <TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center" Text="CornerRadius:"/>
+                        <TextBlock x:Name="OverflowMenuCornerRadiusTextBlock" AutomationProperties.Name="OverflowMenuCornerRadiusTextBlock" HorizontalAlignment="Center" VerticalAlignment="Center" Text="-"/>
                     </StackPanel>
 
                     <TextBlock TextWrapping="Wrap" Grid.Row="1" Margin="5">
diff --git a/dev/NumberBox/TestUI/NumberBoxPage.xaml b/dev/NumberBox/TestUI/NumberBoxPage.xaml
index 5765e442df..94eea84a77 100644
--- a/dev/NumberBox/TestUI/NumberBoxPage.xaml
+++ b/dev/NumberBox/TestUI/NumberBoxPage.xaml
@@ -121,7 +121,7 @@
 
                 <!-- NumberBox for nested scrolling bug(s)-->
                 <StackPanel Margin="30,0,0,0">
-                    <TextBlock>NumberBox inside ScrollViewer test</TextBlock>
+                    <TextBlock Text="NumberBox inside ScrollViewer test"/>
                     <ScrollViewer x:Name="ScrollviewerWithScroll" Height="50"
                                   Width="200"
                             ViewChanged="ScrollviewerWithScroll_ViewChanged">
diff --git a/dev/RadioButtons/TestUI/RadioButtonsFocusPage.xaml b/dev/RadioButtons/TestUI/RadioButtonsFocusPage.xaml
index 179de7ac60..d97e156fdf 100644
--- a/dev/RadioButtons/TestUI/RadioButtonsFocusPage.xaml
+++ b/dev/RadioButtons/TestUI/RadioButtonsFocusPage.xaml
@@ -45,15 +45,15 @@
                 <ColumnDefinition Width="*"/>
             </Grid.ColumnDefinitions>
 
-            <TextBlock Grid.Row="0" Grid.Column="0">Selected Index:</TextBlock>
-            <TextBlock x:Name="SelectedIndexTextBlock1" AutomationProperties.Name="SelectedIndexTextBlock1" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left">-1</TextBlock>
-            <TextBlock Grid.Row="1" Grid.Column="0">Selected Item:</TextBlock>
-            <TextBlock x:Name="SelectedItemTextBlock1" AutomationProperties.Name="SelectedItemTextBlock1" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left">null</TextBlock>
+            <TextBlock Grid.Row="0" Grid.Column="0" Text="Selected Index:"/>
+            <TextBlock x:Name="SelectedIndexTextBlock1" AutomationProperties.Name="SelectedIndexTextBlock1" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" Text="-1"/>
+            <TextBlock Grid.Row="1" Grid.Column="0" Text="Selected Item:"/>
+            <TextBlock x:Name="SelectedItemTextBlock1" AutomationProperties.Name="SelectedItemTextBlock1" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left" Text="null"/>
 
-            <TextBlock Grid.Row="2" Grid.Column="0">Focused Index:</TextBlock>
-            <TextBlock x:Name="FocusedIndexTextBlock1" AutomationProperties.Name="FocusedIndexTextBlock1" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left">-1</TextBlock>
+            <TextBlock Grid.Row="2" Grid.Column="0" Text="Focused Index:"/>
+            <TextBlock x:Name="FocusedIndexTextBlock1" AutomationProperties.Name="FocusedIndexTextBlock1" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" Text="-1"/>
 
-            <TextBlock Grid.Row="3" Grid.Column="0">Has Focus:</TextBlock>
+            <TextBlock Grid.Row="3" Grid.Column="0" Text="Has Focus:"/>
             <CheckBox x:Name="TestRadioButtons1HasFocusCheckBox" AutomationProperties.Name="TestRadioButtons1HasFocusCheckBox" Grid.Row="3" Grid.Column="1" IsTabStop="False"/>
         </Grid>
 
@@ -64,7 +64,7 @@
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
-            <TextBlock Grid.Column="0">Index to select:</TextBlock>
+            <TextBlock Grid.Column="0" Text="Index to select:"/>
             <TextBox x:Name="IndexToSelectTextBox1" AutomationProperties.Name="IndexToSelectTextBox1" Grid.Column="1" Text="-1" Margin="5,0,0,0" VerticalAlignment="Top"
                      IsTabStop="False"/>
             <Button x:Name="SelectByIndexButton1" AutomationProperties.Name="SelectByIndexButton1" Grid.Column="2" IsTabStop="False" Click="SelectByIndexButton1_Click"
@@ -95,15 +95,15 @@
                 <ColumnDefinition Width="*"/>
             </Grid.ColumnDefinitions>
 
-            <TextBlock Grid.Row="0" Grid.Column="0">Selected Index:</TextBlock>
-            <TextBlock x:Name="SelectedIndexTextBlock2" AutomationProperties.Name="SelectedIndexTextBlock2" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left">-1</TextBlock>
-            <TextBlock Grid.Row="1" Grid.Column="0">Selected Item:</TextBlock>
-            <TextBlock x:Name="SelectedItemTextBlock2" AutomationProperties.Name="SelectedItemTextBlock2" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left">null</TextBlock>
+            <TextBlock Grid.Row="0" Grid.Column="0" Text="Selected Index:"/>
+            <TextBlock x:Name="SelectedIndexTextBlock2" AutomationProperties.Name="SelectedIndexTextBlock2" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" Text="-1"/>
+            <TextBlock Grid.Row="1" Grid.Column="0" Text="Selected Item:"/>
+            <TextBlock x:Name="SelectedItemTextBlock2" AutomationProperties.Name="SelectedItemTextBlock2" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left" Text="null"/>
 
-            <TextBlock Grid.Row="2" Grid.Column="0">Focused Index:</TextBlock>
-            <TextBlock x:Name="FocusedIndexTextBlock2" AutomationProperties.Name="FocusedIndexTextBlock2" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left">-1</TextBlock>
+            <TextBlock Grid.Row="2" Grid.Column="0" Text="Focused Index:"/>
+            <TextBlock x:Name="FocusedIndexTextBlock2" AutomationProperties.Name="FocusedIndexTextBlock2" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" Text="-1"/>
 
-            <TextBlock Grid.Row="3" Grid.Column="0">Has Focus:</TextBlock>
+            <TextBlock Grid.Row="3" Grid.Column="0" Text="Has Focus:"/>
             <CheckBox x:Name="TestRadioButtons2HasFocusCheckBox" AutomationProperties.Name="TestRadioButtons2HasFocusCheckBox" Grid.Row="3" Grid.Column="1" IsTabStop="False"/>
         </Grid>
 
@@ -114,7 +114,7 @@
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
-            <TextBlock Grid.Column="0">Index to select:</TextBlock>
+            <TextBlock Grid.Column="0" Text="Index to select:"/>
             <TextBox x:Name="IndexToSelectTextBox2" AutomationProperties.Name="IndexToSelectTextBox2" Grid.Column="1" Margin="5,0,0,0" VerticalAlignment="Top" Text="-1"
                      IsTabStop="False"/>
             <Button x:Name="SelectByIndexButton2" AutomationProperties.Name="SelectByIndexButton2" Grid.Column="2" IsTabStop="False" Click="SelectByIndexButton2_Click"
diff --git a/dev/RadioButtons/TestUI/RadioButtonsPage.xaml b/dev/RadioButtons/TestUI/RadioButtonsPage.xaml
index ee5cc3d442..956c0be889 100644
--- a/dev/RadioButtons/TestUI/RadioButtonsPage.xaml
+++ b/dev/RadioButtons/TestUI/RadioButtonsPage.xaml
@@ -30,7 +30,8 @@
                             <x:String>I'm just a string</x:String>
                             <Button>And I'm a Button!</Button>
                         </controls:RadioButtons>
-                        <TextBlock MaxWidth="300" x:Name="ReproTextBlock" AutomationProperties.Name="ReproTextBlock" TextWrapping="WrapWholeWords">Click me to have Scroll Viewer place focus on the first radio button. Selection shouldn't change but down will move selection and focus to the second radio button.</TextBlock>
+                        <TextBlock MaxWidth="300" x:Name="ReproTextBlock" AutomationProperties.Name="ReproTextBlock" TextWrapping="WrapWholeWords"
+                            Text="Click me to have Scroll Viewer place focus on the first radio button. Selection shouldn't change but down will move selection and focus to the second radio button."/>
                         <controls:RadioButtons Header="A Third Radio Buttons, 1 selected" SelectedIndex="1">
                             <x:Double>0.0</x:Double>
                             <x:Double>1.0</x:Double>
@@ -146,29 +147,29 @@
                                 <ColumnDefinition Width="*"/>
                             </Grid.ColumnDefinitions>
 
-                            <TextBlock Foreground="Red" HorizontalAlignment="Center" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="0">RadioButtons Outputs</TextBlock>
-                            <TextBlock Grid.Column="0" Grid.Row="1">Selected Index:</TextBlock>
-                            <TextBlock x:Name="SelectedIndexTextBlock" AutomationProperties.Name="SelectedIndexTextBlock" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left">-1</TextBlock>
-                            <TextBlock Grid.Column="0" Grid.Row="2">Selected Item:</TextBlock>
-                            <TextBlock x:Name="SelectedItemTextBlock" AutomationProperties.Name="SelectedItemTextBlock" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left">null</TextBlock>
-                            <TextBlock Grid.Column="0" Grid.Row="3">Selected PositionInSet:</TextBlock>
-                            <TextBlock x:Name="SelectedPositionInSetTextBlock" AutomationProperties.Name="SelectedPositionInSetTextBlock" Grid.Row="3" Grid.Column="1" HorizontalAlignment="Left">-1</TextBlock>
-                            <TextBlock Grid.Column="0" Grid.Row="4">Selected SizeOfSet:</TextBlock>
-                            <TextBlock x:Name="SelectedSizeOfSetTextBlock" AutomationProperties.Name="SelectedSizeOfSetTextBlock" Grid.Row="4" Grid.Column="1" HorizontalAlignment="Left">-1</TextBlock>
-                            <TextBlock Grid.Column="0" Grid.Row="5">Has Focus:</TextBlock>
+                            <TextBlock Foreground="Red" HorizontalAlignment="Center" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="0" Text="RadioButtons Outputs"/>
+                            <TextBlock Grid.Column="0" Grid.Row="1" Text="Selected Index:"/>
+                            <TextBlock x:Name="SelectedIndexTextBlock" AutomationProperties.Name="SelectedIndexTextBlock" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left" Text="-1"/>
+                            <TextBlock Grid.Column="0" Grid.Row="2" Text="Selected Item:"/>
+                            <TextBlock x:Name="SelectedItemTextBlock" AutomationProperties.Name="SelectedItemTextBlock" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" Text="null"/>
+                            <TextBlock Grid.Column="0" Grid.Row="3" Text="Selected PositionInSet:"/>
+                            <TextBlock x:Name="SelectedPositionInSetTextBlock" AutomationProperties.Name="SelectedPositionInSetTextBlock" Grid.Row="3" Grid.Column="1" HorizontalAlignment="Left" Text="-1"/>
+                            <TextBlock Grid.Column="0" Grid.Row="4" Text="Selected SizeOfSet:"/>
+                            <TextBlock x:Name="SelectedSizeOfSetTextBlock" AutomationProperties.Name="SelectedSizeOfSetTextBlock" Grid.Row="4" Grid.Column="1" HorizontalAlignment="Left" Text="-1"/>
+                            <TextBlock Grid.Column="0" Grid.Row="5" Text="Has Focus:"/>
                             <CheckBox x:Name="RadioButtonsHasFocusCheckBox" AutomationProperties.Name="SelectedItemTextBlock" IsEnabled="false" Grid.Column="1" Grid.Row="5"/>
-                            <TextBlock Foreground="Red" HorizontalAlignment="Center" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="6">Focus Outputs</TextBlock>
-                            <TextBlock Grid.Column="0" Grid.Row="7">Focused Index:</TextBlock>
-                            <TextBlock x:Name="FocusedIndexTextBlock" AutomationProperties.Name="FocusedIndexTextBlock" Grid.Row="7" Grid.Column="1" HorizontalAlignment="Left">-1</TextBlock>
-                            <TextBlock Grid.Column="0" Grid.Row="8">Focused Item:</TextBlock>
-                            <TextBlock x:Name="FocusedItemTextBlock" AutomationProperties.Name="FocusedItemTextBlock" Grid.Row="8" Grid.Column="1" HorizontalAlignment="Left">null</TextBlock>
-                            <TextBlock Foreground="Red" HorizontalAlignment="Center" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="9">Layout Outputs</TextBlock>
-                            <TextBlock Grid.Column="0" Grid.Row="10"># of Rows:</TextBlock>
-                            <TextBlock x:Name="LayoutNumberOfRowsTextBlock" AutomationProperties.Name="LayoutNumberOfRowsTextBlock" Grid.Row="10" Grid.Column="1" HorizontalAlignment="Left">10</TextBlock>
-                            <TextBlock Grid.Column="0" Grid.Row="11"># of Columns:</TextBlock>
-                            <TextBlock x:Name="LayoutNumberOfColumnsTextBlock" AutomationProperties.Name="LayoutNumberOfColumnsTextBlock" Grid.Row="11" Grid.Column="1" HorizontalAlignment="Left">1</TextBlock>
-                            <TextBlock Grid.Column="0" Grid.Row="12"># of larger Columns:</TextBlock>
-                            <TextBlock x:Name="LayoutNumberOfLargerColumnsTextBlock" AutomationProperties.Name="LayoutNumberOfLargerColumnsTextBlock" Grid.Row="12" Grid.Column="1" HorizontalAlignment="Left">0</TextBlock>
+                            <TextBlock Foreground="Red" HorizontalAlignment="Center" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="6" Text="Focus Outputs"/>
+                            <TextBlock Grid.Column="0" Grid.Row="7" Text="Focused Index:"/>
+                            <TextBlock x:Name="FocusedIndexTextBlock" AutomationProperties.Name="FocusedIndexTextBlock" Grid.Row="7" Grid.Column="1" HorizontalAlignment="Left" Text="-1"/>
+                            <TextBlock Grid.Column="0" Grid.Row="8" Text="Focused Item:"/>
+                            <TextBlock x:Name="FocusedItemTextBlock" AutomationProperties.Name="FocusedItemTextBlock" Grid.Row="8" Grid.Column="1" HorizontalAlignment="Left" Text="null"/>
+                            <TextBlock Foreground="Red" HorizontalAlignment="Center" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="9" Text="Layout Outputs"/>
+                            <TextBlock Grid.Column="0" Grid.Row="10" Text="# of Rows:"/>
+                            <TextBlock x:Name="LayoutNumberOfRowsTextBlock" AutomationProperties.Name="LayoutNumberOfRowsTextBlock" Grid.Row="10" Grid.Column="1" HorizontalAlignment="Left" Text="10"/>
+                            <TextBlock Grid.Column="0" Grid.Row="11" Text="# of Columns:"/>
+                            <TextBlock x:Name="LayoutNumberOfColumnsTextBlock" AutomationProperties.Name="LayoutNumberOfColumnsTextBlock" Grid.Row="11" Grid.Column="1" HorizontalAlignment="Left" Text="1"/>
+                            <TextBlock Grid.Column="0" Grid.Row="12" Text="# of larger Columns:"/>
+                            <TextBlock x:Name="LayoutNumberOfLargerColumnsTextBlock" AutomationProperties.Name="LayoutNumberOfLargerColumnsTextBlock" Grid.Row="12" Grid.Column="1" HorizontalAlignment="Left" Text="0"/>
                         </Grid>
 
                     </ScrollViewer>
diff --git a/dev/Repeater/TestUI/RepeaterTestUIPage.xaml b/dev/Repeater/TestUI/RepeaterTestUIPage.xaml
index 5da78a7d15..3df25ae40a 100644
--- a/dev/Repeater/TestUI/RepeaterTestUIPage.xaml
+++ b/dev/Repeater/TestUI/RepeaterTestUIPage.xaml
@@ -43,12 +43,12 @@
             <StackPanel>
                 <TextBlock Text="Built in layouts" Style="{StaticResource SubheaderTextBlockStyle}" />
                 <StackPanel>
-                    <TextBlock>ItemSpacing</TextBlock>
+                    <TextBlock Text="ItemSpacing"/>
                     <TextBox x:Name="itemSpacing" Text="10"></TextBox>
-                    <TextBlock>MinColumnSpacing</TextBlock>
+                    <TextBlock Text="MinColumnSpacing"/>
                     <TextBox x:Name="lineSpacing" Text="10"></TextBox>
-                    <TextBlock>LineAlignment</TextBlock>
-                    <TextBlock>(Start/Center/End/SpaceEvenly/SpaceAround/SpaceBetween)</TextBlock>
+                    <TextBlock Text="LineAlignment"/>
+                    <TextBlock Text="(Start/Center/End/SpaceEvenly/SpaceAround/SpaceBetween)"/>
                     <TextBox x:Name="lineAlingment" Text="Start"></TextBox>
                     <ToggleSwitch x:Name="orientation" OnContent="Horizontal" OffContent="Vertical">Scroll Orientation</ToggleSwitch>
                 </StackPanel>
diff --git a/dev/Repeater/TestUI/Samples/AnimationSamples/AnimationsDemoPage.xaml b/dev/Repeater/TestUI/Samples/AnimationSamples/AnimationsDemoPage.xaml
index 111daf044a..bd61d73861 100644
--- a/dev/Repeater/TestUI/Samples/AnimationSamples/AnimationsDemoPage.xaml
+++ b/dev/Repeater/TestUI/Samples/AnimationSamples/AnimationsDemoPage.xaml
@@ -43,38 +43,38 @@
                 <StackPanel Margin="10">
                     <Button x:Name="goBack" Margin="0 0 0 25">Back</Button>
                     
-                    <TextBlock>Commands:</TextBlock>
+                    <TextBlock Text="Commands:"/>
                     <TextBox x:Name="commands" Height="75" Margin="0 0 0 25"></TextBox>
                     
-                    <TextBlock>ItemsRepeater Alignment:</TextBlock>
+                    <TextBlock Text="ItemsRepeater Alignment:"/>
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center"  Margin="0 0 0 25">
                         <RadioButton>Top</RadioButton>
                         <RadioButton>Center</RadioButton>
                         <RadioButton>Bottom</RadioButton>
                     </StackPanel>
                     
-                    <TextBlock>Tracked edge:</TextBlock>
+                    <TextBlock Text="Tracked edge:"/>
                     <Slider x:Name="trackedEdge" Maximum="1" StepFrequency="0.5" TickFrequency="0.5" Margin="25 0 25 25" />
                     
-                    <TextBlock>Layout:</TextBlock>
+                    <TextBlock Text="Layout:"/>
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center"  Margin="0 0 0 25">
                         <RadioButton x:Name="stackLayout" IsChecked="True" GroupName="FlowLayout">Stack</RadioButton>
                         <RadioButton x:Name="gridLayout" GroupName="FlowLayout">Grid</RadioButton>
                     </StackPanel>
                     
-                    <TextBlock>Reset:</TextBlock>
+                    <TextBlock Text="Reset:"/>
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0 0 0 25">
                         <RadioButton x:Name="withUniqueId" GroupName="UniqueId" IsChecked="True">With Unique Id</RadioButton>
                         <RadioButton x:Name="withoutUniqueId" GroupName="UniqueId" Margin="0 0 25 0">Without Unique Id</RadioButton>
                     </StackPanel>
                     
-                    <TextBlock>Animator:</TextBlock>
+                    <TextBlock Text="Animator:"/>
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0 0 0 25">
                         <RadioButton>Default</RadioButton>
                         <RadioButton>Custom</RadioButton>
                     </StackPanel>
 
-                    <TextBlock>Animation Slowdown Factor:</TextBlock>
+                    <TextBlock Text="Animation Slowdown Factor:"/>
                     <Slider x:Name="animationSlowdown" Minimum="1" Maximum="10" StepFrequency="1" TickFrequency="1" Value="1" Margin="25 0 25 25" />
                     
                 </StackPanel>
diff --git a/dev/Repeater/TestUI/Samples/ItemTemplateSamples/ItemTemplateDemo.xaml b/dev/Repeater/TestUI/Samples/ItemTemplateSamples/ItemTemplateDemo.xaml
index 0ddafb2f64..41a873d542 100644
--- a/dev/Repeater/TestUI/Samples/ItemTemplateSamples/ItemTemplateDemo.xaml
+++ b/dev/Repeater/TestUI/Samples/ItemTemplateSamples/ItemTemplateDemo.xaml
@@ -19,7 +19,7 @@
             <ColumnDefinition Width="auto" />
         </Grid.ColumnDefinitions>
         <StackPanel>
-            <TextBlock>DataTemplate Sample:</TextBlock>
+            <TextBlock Text="DataTemplate Sample:"/>
             <controls:ItemsRepeaterScrollHost Height="400" Width="150">
                 <ScrollViewer>
                     <controls:ItemsRepeater x:Name="repeater0"
@@ -35,7 +35,7 @@
             </controls:ItemsRepeaterScrollHost>
         </StackPanel>
         <StackPanel Grid.Column="1">
-            <TextBlock>DataTemplateSelector Sample:</TextBlock>
+            <TextBlock Text="DataTemplateSelector Sample:"/>
             <controls:ItemsRepeaterScrollHost Height="400" Width="150">
                 <ScrollViewer>
                     <controls:ItemsRepeater x:Name="repeater1" 
@@ -60,7 +60,7 @@
             </controls:ItemsRepeaterScrollHost>
         </StackPanel>
         <StackPanel Grid.Column="2">
-            <TextBlock>ElementFactory Single Template Sample:</TextBlock>
+            <TextBlock Text="ElementFactory Single Template Sample:"/>
             <controls:ItemsRepeaterScrollHost Height="400" Width="150">
                 <ScrollViewer>
                     <controls:ItemsRepeater x:Name="repeater2" 
@@ -78,7 +78,7 @@
             </controls:ItemsRepeaterScrollHost>
         </StackPanel>
         <StackPanel Grid.Column="3">
-            <TextBlock>ElementFactory Multiple Template Sample:</TextBlock>
+            <TextBlock Text="ElementFactory Multiple Template Sample:"/>
             <controls:ItemsRepeaterScrollHost Height="400" Width="150">
                 <ScrollViewer>
                     <controls:ItemsRepeater x:Name="repeater4" 
@@ -101,7 +101,7 @@
             </controls:ItemsRepeaterScrollHost>
         </StackPanel>
         <StackPanel Grid.Column="4">
-            <TextBlock>DataTemplate clear count checking:</TextBlock>
+            <TextBlock Text="DataTemplate clear count checking:"/>
             <controls:ItemsRepeaterScrollHost Height="400" Width="150">
                 <ScrollViewer>
                     <controls:ItemsRepeater x:Name="repeater3" 
diff --git a/dev/Repeater/TestUI/Samples/ItemsSourceSamples/CollectionChangeDemo.xaml b/dev/Repeater/TestUI/Samples/ItemsSourceSamples/CollectionChangeDemo.xaml
index bd72a2ba65..614c6aa0ed 100644
--- a/dev/Repeater/TestUI/Samples/ItemsSourceSamples/CollectionChangeDemo.xaml
+++ b/dev/Repeater/TestUI/Samples/ItemsSourceSamples/CollectionChangeDemo.xaml
@@ -31,13 +31,13 @@
                 <Button x:Name="goBackButton">Back</Button>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
-                <TextBlock>OldStartingIndex:</TextBlock>
+                <TextBlock Text="OldStartingIndex:"/>
                 <TextBox x:Name="oldStartIndex" Text="0" />
-                <TextBlock>OldCount:</TextBlock>
+                <TextBlock Text="OldCount:"/>
                 <TextBox x:Name="oldCount" Text="0" />
-                <TextBlock>NewStartingIndex:</TextBlock>
+                <TextBlock Text="NewStartingIndex:"/>
                 <TextBox x:Name="newStartIndex" Text="0" />
-                <TextBlock>NewCount:</TextBlock>
+                <TextBlock Text="NewCount:"/>
                 <TextBox x:Name="newCount" Text="0" />
             </StackPanel>
             <StackPanel Orientation="Horizontal">
diff --git a/dev/Repeater/TestUI/Samples/LayoutSamplePages/Virtual/PinterestLayoutSamplePage.xaml b/dev/Repeater/TestUI/Samples/LayoutSamplePages/Virtual/PinterestLayoutSamplePage.xaml
index bcbae1bf6d..a3efd600f7 100644
--- a/dev/Repeater/TestUI/Samples/LayoutSamplePages/Virtual/PinterestLayoutSamplePage.xaml
+++ b/dev/Repeater/TestUI/Samples/LayoutSamplePages/Virtual/PinterestLayoutSamplePage.xaml
@@ -33,7 +33,7 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <StackPanel>
-            <TextBlock x:Name="tb">10</TextBlock>
+            <TextBlock x:Name="tb" Text="10"/>
             <Button Content="BringIntoView" x:Name="bringIntoView"/>
         </StackPanel>
         <controls:ItemsRepeaterScrollHost x:Name="tracker" Grid.Row="1" >
diff --git a/dev/Repeater/TestUI/Samples/LayoutSamplePages/Virtual/VirtualizingStackLayoutSamplePage.xaml b/dev/Repeater/TestUI/Samples/LayoutSamplePages/Virtual/VirtualizingStackLayoutSamplePage.xaml
index 6bc898b8c3..17a34b58a4 100644
--- a/dev/Repeater/TestUI/Samples/LayoutSamplePages/Virtual/VirtualizingStackLayoutSamplePage.xaml
+++ b/dev/Repeater/TestUI/Samples/LayoutSamplePages/Virtual/VirtualizingStackLayoutSamplePage.xaml
@@ -33,7 +33,7 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <StackPanel>
-            <TextBlock x:Name="tb">10</TextBlock>
+            <TextBlock x:Name="tb" Text="10"/>
             <Button Content="BringIntoView" x:Name="bringIntoView"/>
         </StackPanel>
         <controls:ItemsRepeaterScrollHost x:Name="tracker" Grid.Row="1" >
diff --git a/dev/Repeater/TestUI/Samples/LayoutSamplePages/Virtual/VirtualizingUniformStackLayoutSamplePage.xaml b/dev/Repeater/TestUI/Samples/LayoutSamplePages/Virtual/VirtualizingUniformStackLayoutSamplePage.xaml
index 5478d4a36f..2f4af3a7be 100644
--- a/dev/Repeater/TestUI/Samples/LayoutSamplePages/Virtual/VirtualizingUniformStackLayoutSamplePage.xaml
+++ b/dev/Repeater/TestUI/Samples/LayoutSamplePages/Virtual/VirtualizingUniformStackLayoutSamplePage.xaml
@@ -31,7 +31,7 @@
                 </ScrollViewer>
             </controls:ItemsRepeaterScrollHost>
             <StackPanel Grid.Column="2">
-                <TextBlock x:Name="tb">10</TextBlock>
+                <TextBlock x:Name="tb" Text="10"/>
                 <Button Content="BringIntoView" x:Name="bringIntoView"/>
                 <TextBox x:Name="indexTb" Text="0" />
                 <TextBox x:Name="countTb" Text="3" />
diff --git a/dev/Repeater/TestUI/Samples/LayoutSamples/VirtualLayoutPages/VirtualizingUniformStackLayoutSamplePage.xaml b/dev/Repeater/TestUI/Samples/LayoutSamples/VirtualLayoutPages/VirtualizingUniformStackLayoutSamplePage.xaml
index 02586821e1..0d8acb54c2 100644
--- a/dev/Repeater/TestUI/Samples/LayoutSamples/VirtualLayoutPages/VirtualizingUniformStackLayoutSamplePage.xaml
+++ b/dev/Repeater/TestUI/Samples/LayoutSamples/VirtualLayoutPages/VirtualizingUniformStackLayoutSamplePage.xaml
@@ -30,7 +30,7 @@
                 </ScrollViewer>
             </controls:ItemsRepeaterScrollHost>
             <StackPanel Grid.Column="2">
-                <TextBlock x:Name="tb">10</TextBlock>
+                <TextBlock x:Name="tb" Text="10"/>
                 <Button Content="BringIntoView" x:Name="bringIntoView"/>
                 <TextBox x:Name="indexTb" Text="0" />
                 <TextBox x:Name="countTb" Text="3" />
diff --git a/dev/Repeater/TestUI/Samples/SelectionSample/Flat/FlatSample.xaml b/dev/Repeater/TestUI/Samples/SelectionSample/Flat/FlatSample.xaml
index c54cdadaf1..343df8ed14 100644
--- a/dev/Repeater/TestUI/Samples/SelectionSample/Flat/FlatSample.xaml
+++ b/dev/Repeater/TestUI/Samples/SelectionSample/Flat/FlatSample.xaml
@@ -57,7 +57,7 @@
             <TextBlock Text="{Binding ElementName=selectionModel, Path=SelectedItem}"  Margin="0,0,10,0"/>
             <!--<TextBlock Text="{x:Bind selectionModel.SelectedItem, Mode=OneWay}" />-->
             <StackPanel>
-                <TextBlock>Collection Changes</TextBlock>
+                <TextBlock Text="Collection Changes"/>
                 <TextBox x:Name="indexPath" Text="1.2.3" />
                 <Button x:Name="insert" Click="insert_Click" Content="Insert" />
                 <Button x:Name="remove" Click="remove_Click" Content="Remove" />
diff --git a/dev/Repeater/TestUI/Samples/SelectionSample/TreeView/TreeViewSample.xaml b/dev/Repeater/TestUI/Samples/SelectionSample/TreeView/TreeViewSample.xaml
index d87f917610..d4ecc3c935 100644
--- a/dev/Repeater/TestUI/Samples/SelectionSample/TreeView/TreeViewSample.xaml
+++ b/dev/Repeater/TestUI/Samples/SelectionSample/TreeView/TreeViewSample.xaml
@@ -72,7 +72,7 @@
             <Button Content="Back" Click="OnBackClicked" />
             <Button Content="Debug" Click="Button_Click" />
             <StackPanel>
-                <TextBlock>Collection Changes</TextBlock>
+                <TextBlock Text="Collection Changes"/>
                 <TextBox x:Name="indexPath" Text="0.0.0.0" />
                 <Button x:Name="insert" Click="insert_Click" Content="Insert" />
                 <Button x:Name="remove" Click="remove_Click" Content="Remove" />
diff --git a/dev/SplitButton/TestUI/SplitButtonPage.xaml b/dev/SplitButton/TestUI/SplitButtonPage.xaml
index 105f5c5eb6..a11da1c219 100644
--- a/dev/SplitButton/TestUI/SplitButtonPage.xaml
+++ b/dev/SplitButton/TestUI/SplitButtonPage.xaml
@@ -30,15 +30,15 @@
                               Content="Simulate Touch" Checked="SimulateTouchCheckBox_Checked" Unchecked="SimulateTouchCheckBox_Unchecked"/>
                     <TextBlock Text="Status" FontSize="22"/>
                     <StackPanel Orientation="Horizontal">
-                        <TextBlock>Click count:</TextBlock>
+                        <TextBlock Text="Click count:"/>
                         <TextBlock x:Name="ClickCountTextBlock" AutomationProperties.Name="ClickCountTextBlock" Margin="4,0,0,0" Text="0"/>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
-                        <TextBlock>Flyout opened:</TextBlock>
+                        <TextBlock Text="Flyout opened:"/>
                         <TextBlock x:Name="FlyoutOpenedCountTextBlock" AutomationProperties.Name="FlyoutOpenedCountTextBlock" Margin="4,0,0,0" Text="0"/>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
-                        <TextBlock>Flyout closed:</TextBlock>
+                        <TextBlock Text="Flyout closed:"/>
                         <TextBlock x:Name="FlyoutClosedCountTextBlock" AutomationProperties.Name="FlyoutClosedCountTextBlock" Margin="4,0,0,0" Text="0"/>
                     </StackPanel>
 
@@ -129,11 +129,11 @@
                 <ToggleButton Content="For Comparison" Margin="6,0,0,0"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
-                <TextBlock>Toggle State:</TextBlock>
+                <TextBlock Text="Toggle State:"/>
                 <TextBlock x:Name="ToggleStateTextBlock" AutomationProperties.Name="ToggleStateTextBlock" Margin="4,0,0,0" Text="Unchecked"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
-                <TextBlock>Toggle State on Click:</TextBlock>
+                <TextBlock Text="Toggle State on Click:"/>
                 <TextBlock x:Name="ToggleStateOnClickTextBlock" AutomationProperties.Name="ToggleStateOnClickTextBlock" Margin="4,0,0,0" Text="Unchecked"/>
             </StackPanel>
 
@@ -154,7 +154,7 @@
                 <CheckBox x:Name="CanExecuteCheckBox" AutomationProperties.Name="CanExecuteCheckBox" Content="CanExecute" Checked="CanExecuteCheckBox_Checked" Unchecked="CanExecuteCheckBox_Unchecked" IsChecked="True" Margin="12,0,0,0"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
-                <TextBlock>Execute Count:</TextBlock>
+                <TextBlock Text="Execute Count:"/>
                 <TextBlock x:Name="ExecuteCountTextBlock" AutomationProperties.Name="ExecuteCountTextBlock" Margin="4,0,0,0" Text="0"/>
             </StackPanel>
 
diff --git a/dev/SwipeControl/SwipeControl_TestUI/SwipeControlClearPage.xaml b/dev/SwipeControl/SwipeControl_TestUI/SwipeControlClearPage.xaml
index d0169adf80..8ed3861986 100644
--- a/dev/SwipeControl/SwipeControl_TestUI/SwipeControlClearPage.xaml
+++ b/dev/SwipeControl/SwipeControl_TestUI/SwipeControlClearPage.xaml
@@ -87,7 +87,7 @@
         <StackPanel Grid.Row="0" Grid.Column="1">
             <Button Click="AddSwipeItemsButton_Click" x:Name="AddItemsButton" AutomationProperties.Name="AddItemsButton" Margin="0,0,0,8">Add SwipeItems</Button>
             <Button Click="ClearSwipeItemsButton_Click" x:Name="ClearItemsButton" AutomationProperties.Name="ClearItemsButton" Margin="0,0,0,8">Clear SwipeItems</Button>
-            <TextBlock x:Name="SwipeItemsChildSum" AutomationProperties.Name="SwipeItemsChildSum" ></TextBlock>
+            <TextBlock x:Name="SwipeItemsChildSum" AutomationProperties.Name="SwipeItemsChildSum"/>
         </StackPanel>
         
     </Grid>
diff --git a/dev/SwipeControl/SwipeControl_TestUI/SwipeControlPage.xaml b/dev/SwipeControl/SwipeControl_TestUI/SwipeControlPage.xaml
index 1a052696fb..53f8cd328b 100644
--- a/dev/SwipeControl/SwipeControl_TestUI/SwipeControlPage.xaml
+++ b/dev/SwipeControl/SwipeControl_TestUI/SwipeControlPage.xaml
@@ -97,15 +97,15 @@
             </StackPanel>
             <StackPanel Orientation="Horizontal">
                 <StackPanel Orientation="Vertical" Width="118">
-                    <TextBlock VerticalAlignment="Center">O:</TextBlock>
+                    <TextBlock VerticalAlignment="Center" Text="O:"/>
                     <CheckBox x:Name="SwipeItem8OpenCheckBox" AutomationProperties.Name="SwipeItem8OpenCheckBox" IsChecked="false" IsEnabled="false" Width="40"/>
-                    <TextBlock VerticalAlignment="Center">I:</TextBlock>
+                    <TextBlock VerticalAlignment="Center" Text="I:"/>
                     <CheckBox x:Name="SwipeItem8IdleCheckBox" AutomationProperties.Name="SwipeItem8IdleCheckBox" IsChecked="true" IsEnabled="false"/>
                 </StackPanel>
                 <StackPanel Orientation="Vertical" Width="118">
-                    <TextBlock VerticalAlignment="Center">O:</TextBlock>
+                    <TextBlock VerticalAlignment="Center" Text="O:"/>
                     <CheckBox x:Name="SwipeItem9OpenCheckBox" AutomationProperties.Name="SwipeItem9OpenCheckBox" IsChecked="false" IsEnabled="false"/>
-                    <TextBlock VerticalAlignment="Center">I:</TextBlock>
+                    <TextBlock VerticalAlignment="Center" Text="I:"/>
                     <CheckBox x:Name="SwipeItem9IdleCheckBox" AutomationProperties.Name="SwipeItem9IdleCheckBox" IsChecked="true" IsEnabled="false"/>
                 </StackPanel>
             </StackPanel>
@@ -186,57 +186,57 @@
                 </StackPanel>
                 <StackPanel>
                     <StackPanel Orientation="Horizontal" Height="40">
-                        <TextBlock VerticalAlignment="Center">O:</TextBlock>
+                        <TextBlock VerticalAlignment="Center" Text="O:"/>
                         <CheckBox x:Name="SwipeItem1OpenCheckBox" AutomationProperties.Name="SwipeItem1OpenCheckBox" IsChecked="false" IsEnabled="false"/>
-                        <TextBlock VerticalAlignment="Center">I:</TextBlock>
+                        <TextBlock VerticalAlignment="Center" Text="I:"/>
                         <CheckBox x:Name="SwipeItem1IdleCheckBox" AutomationProperties.Name="SwipeItem1IdleCheckBox" IsChecked="true" IsEnabled="false"/>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" Height="40">
-                        <TextBlock VerticalAlignment="Center">O:</TextBlock>
+                        <TextBlock VerticalAlignment="Center" Text="O:"/>
                         <CheckBox x:Name="SwipeItem2OpenCheckBox" AutomationProperties.Name="SwipeItem2OpenCheckBox" IsChecked="false" IsEnabled="false"/>
-                        <TextBlock VerticalAlignment="Center">I:</TextBlock>
+                        <TextBlock VerticalAlignment="Center" Text="I:"/>
                         <CheckBox x:Name="SwipeItem2IdleCheckBox" AutomationProperties.Name="SwipeItem2IdleCheckBox" IsChecked="true" IsEnabled="false"/>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" Height="44">
-                        <TextBlock VerticalAlignment="Center">O:</TextBlock>
+                        <TextBlock VerticalAlignment="Center" Text="O:"/>
                         <CheckBox x:Name="SwipeItem3OpenCheckBox" AutomationProperties.Name="SwipeItem3OpenCheckBox" IsChecked="false" IsEnabled="false"/>
-                        <TextBlock VerticalAlignment="Center">I:</TextBlock>
+                        <TextBlock VerticalAlignment="Center" Text="I:"/>
                         <CheckBox x:Name="SwipeItem3IdleCheckBox" AutomationProperties.Name="SwipeItem3IdleCheckBox" IsChecked="true" IsEnabled="false"/>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" Height="40">
-                        <TextBlock VerticalAlignment="Center">O:</TextBlock>
+                        <TextBlock VerticalAlignment="Center" Text="O:"/>
                         <CheckBox x:Name="SwipeItem4OpenCheckBox" AutomationProperties.Name="SwipeItem4OpenCheckBox" IsChecked="false" IsEnabled="false"/>
-                        <TextBlock VerticalAlignment="Center">I:</TextBlock>
+                        <TextBlock VerticalAlignment="Center" Text="I:"/>
                         <CheckBox x:Name="SwipeItem4IdleCheckBox" AutomationProperties.Name="SwipeItem4IdleCheckBox" IsChecked="true" IsEnabled="false"/>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" Height="40">
-                        <TextBlock VerticalAlignment="Center">O:</TextBlock>
+                        <TextBlock VerticalAlignment="Center" Text="O:"/>
                         <CheckBox x:Name="SwipeItem5OpenCheckBox" AutomationProperties.Name="SwipeItem5OpenCheckBox" IsChecked="false" IsEnabled="false"/>
-                        <TextBlock VerticalAlignment="Center">I:</TextBlock>
+                        <TextBlock VerticalAlignment="Center" Text="I:"/>
                         <CheckBox x:Name="SwipeItem5IdleCheckBox" AutomationProperties.Name="SwipeItem5IdleCheckBox" IsChecked="true" IsEnabled="false"/>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" Height="40">
-                        <TextBlock VerticalAlignment="Center">O:</TextBlock>
+                        <TextBlock VerticalAlignment="Center" Text="O:"/>
                         <CheckBox x:Name="SwipeItem10OpenCheckBox" AutomationProperties.Name="SwipeItem10OpenCheckBox" IsChecked="false" IsEnabled="false"/>
-                        <TextBlock VerticalAlignment="Center">I:</TextBlock>
+                        <TextBlock VerticalAlignment="Center" Text="I:"/>
                         <CheckBox x:Name="SwipeItem10IdleCheckBox" AutomationProperties.Name="SwipeItem10IdleCheckBox" IsChecked="true" IsEnabled="false"/>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" Height="40">
-                        <TextBlock VerticalAlignment="Center">O:</TextBlock>
+                        <TextBlock VerticalAlignment="Center" Text="O:"/>
                         <CheckBox x:Name="SwipeItem11OpenCheckBox" AutomationProperties.Name="SwipeItem11OpenCheckBox" IsChecked="false" IsEnabled="false"/>
-                        <TextBlock VerticalAlignment="Center">I:</TextBlock>
+                        <TextBlock VerticalAlignment="Center" Text="I:"/>
                         <CheckBox x:Name="SwipeItem11IdleCheckBox" AutomationProperties.Name="SwipeItem11IdleCheckBox" IsChecked="true" IsEnabled="false"/>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" Height="60">
-                        <TextBlock VerticalAlignment="Center">O:</TextBlock>
+                        <TextBlock VerticalAlignment="Center" Text="O:"/>
                         <CheckBox x:Name="SwipeItem6OpenCheckBox" AutomationProperties.Name="SwipeItem6OpenCheckBox" IsChecked="false" IsEnabled="false"/>
-                        <TextBlock VerticalAlignment="Center">I:</TextBlock>
+                        <TextBlock VerticalAlignment="Center" Text="I:"/>
                         <CheckBox x:Name="SwipeItem6IdleCheckBox" AutomationProperties.Name="SwipeItem6IdleCheckBox" IsChecked="true" IsEnabled="false"/>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" Height="60">
-                        <TextBlock VerticalAlignment="Center">O:</TextBlock>
+                        <TextBlock VerticalAlignment="Center" Text="O:"/>
                         <CheckBox x:Name="SwipeItem7OpenCheckBox" AutomationProperties.Name="SwipeItem7OpenCheckBox" IsChecked="false" IsEnabled="false"/>
-                        <TextBlock VerticalAlignment="Center">I:</TextBlock>
+                        <TextBlock VerticalAlignment="Center" Text="I:"/>
                         <CheckBox x:Name="SwipeItem7IdleCheckBox" AutomationProperties.Name="SwipeItem7IdleCheckBox" IsChecked="true" IsEnabled="false"/>
                     </StackPanel>
                 </StackPanel>
diff --git a/dev/TabView/TestUI/TabViewPage.xaml b/dev/TabView/TestUI/TabViewPage.xaml
index a6a2e35ba3..054a306b8f 100644
--- a/dev/TabView/TestUI/TabViewPage.xaml
+++ b/dev/TabView/TestUI/TabViewPage.xaml
@@ -26,7 +26,7 @@
                     <CheckBox x:Name="IsAddButtonVisibleCheckBox" AutomationProperties.Name="IsAddButtonVisibleCheckBox" Content="Add button visible" IsChecked="{x:Bind Tabs.IsAddTabButtonVisible, Mode=TwoWay}"/>
                     <CheckBox x:Name="IsDisabledTabVisibleCheckBox" AutomationProperties.Name="IsDisabledTabVisibleCheckBox" Checked="IsDisabledTabVisibleCheckBox_CheckChanged" Unchecked="IsDisabledTabVisibleCheckBox_CheckChanged" Content="Disabled tab visible" IsChecked="True"/>
                     <StackPanel Orientation="Horizontal" Margin="0,0,0,8">
-                        <TextBlock VerticalAlignment="Center">Tab Width:</TextBlock>
+                        <TextBlock VerticalAlignment="Center" Text="Tab Width:"/>
                         <ComboBox x:Name="TabWidthComboBox" AutomationProperties.Name="TabWidthComboBox" Margin="4,0,0,0" SelectedIndex="0" SelectionChanged="TabWidthComboBox_SelectionChanged">
                             <ComboBoxItem Content="Equal"/>
                             <ComboBoxItem Content="SizeToContent"/>
@@ -77,12 +77,12 @@
                     </StackPanel>
 
                     <StackPanel Orientation="Horizontal" Margin="0,0,0,8">
-                        <TextBlock>Selected Index:</TextBlock>
+                        <TextBlock Text="Selected Index:"/>
                         <TextBlock x:Name="SelectedIndexTextBlock" AutomationProperties.Name="SelectedIndexTextBlock" Margin="4,0,0,0" Text="0"/>
                     </StackPanel>
 
                     <StackPanel Orientation="Horizontal" Margin="0,0,0,8">
-                        <TextBlock>Tab dropped out:</TextBlock>
+                        <TextBlock Text="Tab dropped out:"/>
                         <TextBlock x:Name="TabDroppedOutsideTextBlock" AutomationProperties.Name="TabDroppedOutsideTextBlock" Margin="4,0,0,0" Text=""/>
                     </StackPanel>
 
@@ -179,14 +179,14 @@
                         </controls:TabViewItem.IconSource>
 
                         <StackPanel Padding="16">
-                            <TextBlock>Shop text</TextBlock>
+                            <TextBlock Text="Shop text"/>
                             <Button Content="SecondTabButton" AutomationProperties.Name="SecondTabButton"/>
                         </StackPanel>
                     </controls:TabViewItem>
 
                     <controls:TabViewItem x:Name="LongHeaderTab" AutomationProperties.Name="LongHeaderTab" Header="Long Header No Icon">
                         <StackPanel Padding="16">
-                            <TextBlock >Emoji text</TextBlock>
+                            <TextBlock Text="Emoji text"/>
                             <Button Content="Button 3"/>
                         </StackPanel>
                     </controls:TabViewItem>
@@ -197,7 +197,7 @@
                         </controls:TabViewItem.IconSource>
 
                         <StackPanel>
-                            <TextBlock Padding="16">This tab can't be closed.</TextBlock>
+                            <TextBlock Padding="16" Text="This tab can't be closed."/>
                         </StackPanel>
                     </controls:TabViewItem>
 
@@ -207,7 +207,7 @@
                         </controls:TabViewItem.IconSource>
 
                         <StackPanel>
-                            <TextBlock Padding="16">This tab can't be selected.</TextBlock>
+                            <TextBlock Padding="16" Text="This tab can't be selected."/>
                         </StackPanel>
                     </controls:TabViewItem>
 
@@ -216,7 +216,7 @@
                             <controls:SymbolIconSource Symbol="Contact"/>
                         </controls:TabViewItem.IconSource>
 
-                        <TextBlock x:Name="LastTabContent" AutomationProperties.Name="LastTabContent" Padding="16">Contact text</TextBlock>
+                        <TextBlock x:Name="LastTabContent" AutomationProperties.Name="LastTabContent" Padding="16" Text="Contact text"/>
                     </controls:TabViewItem>
 
                 </controls:TabView>
@@ -267,7 +267,7 @@
                                     <controls:SymbolIconSource Symbol="Placeholder"/>
                                 </controls:TabViewItem.IconSource>
 
-                                <TextBlock Padding="16">Content</TextBlock>
+                                <TextBlock Padding="16" Text="Content"/>
                             </controls:TabViewItem>
 
                         </controls:TabView.TabItems>
diff --git a/dev/TabView/TestUI/TabViewSizingPage.xaml b/dev/TabView/TestUI/TabViewSizingPage.xaml
index fe2da69246..df07508012 100644
--- a/dev/TabView/TestUI/TabViewSizingPage.xaml
+++ b/dev/TabView/TestUI/TabViewSizingPage.xaml
@@ -37,10 +37,10 @@
                 <controls:TabView TabWidthMode="SizeToContent" TabCloseRequested="Tabs_TabCloseRequested" AddTabButtonClick="Tabview_AddTabButtonClick" >
                     <controls:TabView.TabItems>
                         <controls:TabViewItem Header="Tab A">
-                            <TextBlock>TabA</TextBlock>
+                            <TextBlock Text="TabA"/>
                         </controls:TabViewItem>
                         <controls:TabViewItem Header="Tab B">
-                            <TextBlock>TabB</TextBlock>
+                            <TextBlock Text="TabB"/>
                         </controls:TabViewItem>
                     </controls:TabView.TabItems>
                     <controls:TabView.TabStripFooter>
@@ -67,10 +67,10 @@
                 <controls:TabView TabWidthMode="Equal" TabCloseRequested="Tabs_TabCloseRequested" AddTabButtonClick="Tabview_AddTabButtonClick" >
                     <controls:TabView.TabItems>
                         <controls:TabViewItem Header="Tab A">
-                            <TextBlock>TabA</TextBlock>
+                            <TextBlock Text="TabA"/>
                         </controls:TabViewItem>
                         <controls:TabViewItem Header="Tab B">
-                            <TextBlock>TabB</TextBlock>
+                            <TextBlock Text="TabB"/>
                         </controls:TabViewItem>
                     </controls:TabView.TabItems>
                     <controls:TabView.TabStripFooter>
@@ -96,10 +96,10 @@
                 <controls:TabView TabWidthMode="SizeToContent" TabCloseRequested="Tabs_TabCloseRequested" AddTabButtonClick="Tabview_AddTabButtonClick" >
                     <controls:TabView.TabItems>
                         <controls:TabViewItem Header="Tab A">
-                            <TextBlock>TabA</TextBlock>
+                            <TextBlock Text="TabA"/>
                         </controls:TabViewItem>
                         <controls:TabViewItem Header="Tab B">
-                            <TextBlock>TabB</TextBlock>
+                            <TextBlock Text="TabB"/>
                         </controls:TabViewItem>
                     </controls:TabView.TabItems>
                     <controls:TabView.TabStripFooter>
@@ -124,10 +124,10 @@
                 <controls:TabView TabWidthMode="Equal" TabCloseRequested="Tabs_TabCloseRequested" AddTabButtonClick="Tabview_AddTabButtonClick" >
                     <controls:TabView.TabItems>
                         <controls:TabViewItem Header="Tab A">
-                            <TextBlock>TabA</TextBlock>
+                            <TextBlock Text="TabA"/>
                         </controls:TabViewItem>
                         <controls:TabViewItem Header="Tab B">
-                            <TextBlock>TabB</TextBlock>
+                            <TextBlock Text="TabB"/>
                         </controls:TabViewItem>
                     </controls:TabView.TabItems>
                     <controls:TabView.TabStripFooter>
@@ -152,16 +152,16 @@
                 <controls:TabView x:Name="TabViewEqual" AutomationProperties.Name="TabViewEqual" HorizontalAlignment="Left" TabWidthMode="Equal" TabCloseRequested="Tabs_TabCloseRequested" AddTabButtonClick="Tabview_AddTabButtonClick" >
                     <controls:TabView.TabItems>
                         <controls:TabViewItem Header="Tab A">
-                            <TextBlock>TabA</TextBlock>
+                            <TextBlock Text="TabA"/>
                         </controls:TabViewItem>
                         <controls:TabViewItem Header="Tab B">
-                            <TextBlock>TabB</TextBlock>
+                            <TextBlock Text="TabB"/>
                         </controls:TabViewItem>
                         <controls:TabViewItem Header="Tab C">
-                            <TextBlock>TabC</TextBlock>
+                            <TextBlock Text="TabC"/>
                         </controls:TabViewItem>
                         <controls:TabViewItem Header="Tab D">
-                            <TextBlock>TabD</TextBlock>
+                            <TextBlock Text="TabD"/>
                         </controls:TabViewItem>
                     </controls:TabView.TabItems>
                     <controls:TabView.TabStripFooter>
@@ -186,16 +186,16 @@
                 <controls:TabView x:Name="TabViewSizeToContent" AutomationProperties.Name="TabViewSizeToContent" HorizontalAlignment="Left" TabWidthMode="SizeToContent" TabCloseRequested="Tabs_TabCloseRequested" AddTabButtonClick="Tabview_AddTabButtonClick" >
                     <controls:TabView.TabItems>
                         <controls:TabViewItem Header="Tab A Long Name">
-                            <TextBlock>TabA</TextBlock>
+                            <TextBlock Text="TabA"/>
                         </controls:TabViewItem>
                         <controls:TabViewItem Header="Tab B Even Longer Name">
-                            <TextBlock>TabB</TextBlock>
+                            <TextBlock Text="TabB"/>
                         </controls:TabViewItem>
                         <controls:TabViewItem Header="Tab C Super Super Long Name">
-                            <TextBlock>TabC</TextBlock>
+                            <TextBlock Text="TabC"/>
                         </controls:TabViewItem>
                         <controls:TabViewItem Header="Tab D Reasonably Long Too">
-                            <TextBlock>TabD</TextBlock>
+                            <TextBlock Text="TabD"/>
                         </controls:TabViewItem>
                     </controls:TabView.TabItems>
                     <controls:TabView.TabStripFooter>
diff --git a/dev/TeachingTip/TestUI/TeachingTipPage.xaml b/dev/TeachingTip/TestUI/TeachingTipPage.xaml
index 5df8c5a870..defeceedde 100644
--- a/dev/TeachingTip/TestUI/TeachingTipPage.xaml
+++ b/dev/TeachingTip/TestUI/TeachingTipPage.xaml
@@ -39,7 +39,7 @@
                         </muxc:TeachingTip.HeroContent>
                         <muxc:TeachingTip.Content>
                             <StackPanel Orientation="Horizontal">
-                                <TextBlock VerticalAlignment="Center"  x:Name="TeachingTipContentTextBlock" Unloaded="RemoveTeachingTipTextBlockContent_Unloaded">Cancel closes:</TextBlock>
+                                <TextBlock VerticalAlignment="Center"  x:Name="TeachingTipContentTextBlock" Unloaded="RemoveTeachingTipTextBlockContent_Unloaded" Text="Cancel closes:"/>
                                 <CheckBox x:Name="CancelClosesCheckBoxInVisualTree" IsChecked="False" VerticalAlignment="Center"/>
                             </StackPanel>
                         </muxc:TeachingTip.Content>
@@ -63,7 +63,7 @@
                                 </muxc:TeachingTip.HeroContent>
                                 <muxc:TeachingTip.Content>
                                     <StackPanel Orientation="Horizontal"   >
-                                        <TextBlock VerticalAlignment="Center">Cancel closes:</TextBlock>
+                                        <TextBlock VerticalAlignment="Center" Text="Cancel closes:"/>
                                         <CheckBox x:Name="CancelClosesCheckBoxInResources" IsChecked="False" VerticalAlignment="Center"/>
                                     </StackPanel>
                                 </muxc:TeachingTip.Content>
@@ -556,7 +556,7 @@
                         <StackPanel Grid.Row="50" Orientation="Horizontal">
                             <Button x:Name="GetEdgeTeachingTipOffset" Click="GetEdgeTeachingTipOffset_Clicked"
                                     AutomationProperties.Name="GetEdgeTeachingTipOffset">Get TeachingTip on edge offset</Button>
-                            <TextBlock x:Name="EdgeTeachingTipOffset" AutomationProperties.Name="EdgeTeachingTipOffset">0;0</TextBlock>
+                            <TextBlock x:Name="EdgeTeachingTipOffset" AutomationProperties.Name="EdgeTeachingTipOffset" Text="0;0"/>
                         </StackPanel>
                     </Grid>
                 </ScrollViewer>
@@ -603,7 +603,7 @@
                         </muxc:TeachingTip.HeroContent>
                         <muxc:TeachingTip.Content>
                             <StackPanel Orientation="Horizontal"   >
-                                <TextBlock>Just some demo text</TextBlock>
+                                <TextBlock Text="Just some demo text"/>
                             </StackPanel>
                         </muxc:TeachingTip.Content>
                     </muxc:TeachingTip>
diff --git a/test/IXMPTestApp/Tests/MetadataProviderTests.cs b/test/IXMPTestApp/Tests/MetadataProviderTests.cs
index fe43734e15..bc644da986 100644
--- a/test/IXMPTestApp/Tests/MetadataProviderTests.cs
+++ b/test/IXMPTestApp/Tests/MetadataProviderTests.cs
@@ -158,7 +158,7 @@ public void CanLoadXamlFragments()
                             <controls:NavigationViewItem x:Name='MoviesItem' Content='Movies' Icon='Video' />
                             <controls:NavigationViewItem x:Name='TVItem' Content='TV' Icon='Slideshow' />
                         </controls:NavigationView.MenuItems>
-                        <TextBlock HorizontalAlignment='Center' VerticalAlignment='Center'>Content</TextBlock>
+                        <TextBlock HorizontalAlignment='Center' VerticalAlignment='Center' Text='Content'/>
                     </controls:NavigationView>");
 
                 Log.Comment("Loading PersonPicture...");
diff --git a/test/MUXControlsReleaseTest/NugetPackageTestApp/TestPages/NavigationViewWithCustomResourcesTestPage.xaml b/test/MUXControlsReleaseTest/NugetPackageTestApp/TestPages/NavigationViewWithCustomResourcesTestPage.xaml
index 04f88ab52b..1ff0754420 100644
--- a/test/MUXControlsReleaseTest/NugetPackageTestApp/TestPages/NavigationViewWithCustomResourcesTestPage.xaml
+++ b/test/MUXControlsReleaseTest/NugetPackageTestApp/TestPages/NavigationViewWithCustomResourcesTestPage.xaml
@@ -27,9 +27,9 @@
 
         <StackPanel Orientation="Horizontal" Margin="2" Grid.ColumnSpan="2">
             <Button x:Name="btnGetHeaderContentMargins" AutomationProperties.Name="btnGetHeaderContentMargins" Margin="2" Content="Get HeaderContent Margins" Click="BtnGetHeaderContentMargins_Click"/>
-            <TextBlock Margin="2" VerticalAlignment="Center">Top HeaderContent.Margin:</TextBlock>
+            <TextBlock Margin="2" VerticalAlignment="Center" Text="Top HeaderContent.Margin:"/>
             <TextBlock x:Name="tblTopHeaderContentMarginResult" AutomationProperties.Name="tblTopHeaderContentMarginResult" Margin="2" VerticalAlignment="Center"/>
-            <TextBlock Margin="2" VerticalAlignment="Center">LeftMinimal HeaderContent.Margin:</TextBlock>
+            <TextBlock Margin="2" VerticalAlignment="Center" Text="LeftMinimal HeaderContent.Margin:"/>
             <TextBlock x:Name="tblLeftMinimalHeaderContentMarginResult" AutomationProperties.Name="tblLeftMinimalHeaderContentMarginResult" VerticalAlignment="Center"/>
         </StackPanel>
 
diff --git a/test/MUXControlsReleaseTest/NugetPackageTestAppCX/MainPage.xaml b/test/MUXControlsReleaseTest/NugetPackageTestAppCX/MainPage.xaml
index e7ba25e389..3124c49b54 100644
--- a/test/MUXControlsReleaseTest/NugetPackageTestAppCX/MainPage.xaml
+++ b/test/MUXControlsReleaseTest/NugetPackageTestAppCX/MainPage.xaml
@@ -53,7 +53,7 @@
             <StackPanel Grid.Row="1" Orientation="Horizontal">
                 <CheckBox x:Name="TestCheckBox" AutomationProperties.Name="TestCheckBox" Content="CheckBox" />
                 <Button x:Name="GetCheckBoxRectangleCornerRadiusValue" Content="GetCheckBoxRectangleCornerRadiusValue" AutomationProperties.Name="GetCheckBoxRectangleCornerRadiusValue"  Click="GetCheckBoxRectangleCornerRadiusValue_Click"/>
-                <TextBlock x:Name="CheckBoxRectangleCornerRadiusValueTextBlock" AutomationProperties.Name="CheckBoxRectangleCornerRadiusValueTextBlock"></TextBlock>
+                <TextBlock x:Name="CheckBoxRectangleCornerRadiusValueTextBlock" AutomationProperties.Name="CheckBoxRectangleCornerRadiusValueTextBlock"/>
             </StackPanel>
             <controls:TreeView Grid.Row="2">
                 <controls:TreeView.RootNodes>