Merge branch 'main' into fastpassbugfixes

src/App/ConnectionPage.xaml

@@ -1,4 +1,4 @@
-<Page
+<Page
     x:Class="Microsoft.FactoryOrchestrator.UWP.ConnectionPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -85,7 +85,8 @@
                     </Grid.RowDefinitions>
 
                     <TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="99" x:Uid="AttemptingLocalHost" HorizontalAlignment="Center" VerticalAlignment="Top" Style="{StaticResource SubheaderTextBlockStyle}"/>
-                    <ProgressBar x:Name="ConnectingProgress" Grid.Row="3" Grid.Column="1" IsIndeterminate="True" Visibility="Visible" AllowFocusOnInteraction="False"/>
+                    <ProgressBar x:Name="ConnectingProgress" x:Uid="ConnectingProgress" Grid.Row="3" Grid.Column="1" IsIndeterminate="True" Visibility="Visible" AllowFocusOnInteraction="False"/>
+
                 </Grid>
                 <TextBlock Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="99" x:Uid="RemoteHost" HorizontalAlignment="Center" VerticalAlignment="Center" Style="{StaticResource TitleTextBlockStyle}"/>
                 <ListView Grid.Row="6" x:Name="ResultsListView" BorderBrush="AntiqueWhite" BorderThickness="1"
@@ -113,9 +114,9 @@
                     <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" x:Uid="IpAddress" x:Name="IpText" Visibility="Collapsed"/>
                     <TextBox Grid.Row="2" Grid.Column="1" x:Name="IpTextBox" Margin="5" Width="150"  VerticalAlignment="Center" HorizontalAlignment="Stretch" TextWrapping="NoWrap" TextAlignment="Center" TextChanged="TextBox_TextChanged" InputScope="Number" KeyDown="TextBox_KeyDown" AutomationProperties.LabeledBy="{Binding ElementName=IpText}" Visibility="Collapsed"/>
                     <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Visibility="Collapsed" x:Uid="Port" x:Name="PortText"/>
-                    <TextBox Grid.Row="3" Grid.Column="1" x:Name="PortTextBox" Margin="5" Width="150" VerticalAlignment="Center" HorizontalAlignment="Stretch" TextWrapping="NoWrap" Visibility="Collapsed" TextAlignment="Center" TextChanged="TextBox_TextChanged" InputScope="Number" KeyDown="TextBox_KeyDown" AutomationProperties.LabeledBy="{Binding ElementName=Port}"/>
-                    <Button Grid.Row="4" Grid.Column="1" Visibility="Collapsed" x:Name="ConnectButton" Margin="1" HorizontalAlignment="Center" VerticalAlignment="Center" x:Uid="ConnectButton" Click="ConnectButton_Click" IsEnabled="False"/>
+                    <TextBox Grid.Row="3" Grid.Column="1"   x:Name="PortTextBox" Margin="5" Width="150" VerticalAlignment="Center" HorizontalAlignment="Stretch" TextWrapping="NoWrap" Visibility="Collapsed" TextAlignment="Center" TextChanged="TextBox_TextChanged" InputScope="Number" KeyDown="TextBox_KeyDown" AutomationProperties.LabeledBy="{Binding ElementName=PortText}"/>
                     <Button Grid.Row="4" Grid.Column="0" x:Name="OptionsButton" Margin="1" HorizontalAlignment="Center" VerticalAlignment="Center" x:Uid="AdvancedOptionsButton" Click="OptionsButton_Click" IsEnabled="True"/>
+                    <Button Grid.Row="4" Grid.Column="1" Visibility="Collapsed" x:Name="ConnectButton" Margin="1" HorizontalAlignment="Center" VerticalAlignment="Center" x:Uid="ConnectButton" Click="ConnectButton_Click" IsEnabled="False"/>
                 </Grid>
 
             </Grid>

src/App/Resources/en-US/Resources.resw

@@ -808,4 +808,8 @@ On retry</value>
     <value>to launch WDP in it.</value>
     <comment>Part 3 of 3 part textblock telling user the app cannot fully interact with windows device portal due to webview limitations</comment>
   </data>
+  <data name="ConnectingProgress.AutomationProperties.Name" xml:space="preserve">
+    <value>Progress Bar</value>
+    <comment>Progress bar showing connection to factory orchestrator service progress.</comment>
+  </data>
 </root>