Commit 288f318d authored by David Kline's avatar David Kline Committed by GitHub
Browse files

Merge pull request #103 from davidkline-ms/master 

cleanup stale TODOs, SetDeviceName no longer supports implicit reboot
parents 3812cafa f88d4150

WindowsDevicePortalWrapper/TestAppHL.UniversalWindows/App.xaml.cs

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ namespace TestAppHL.UniversalWindows 


                if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)

                {

                    //TODO: Load state from previously suspended application

                    // This application intentionally does not restore state.

                }



                // Place the frame in the current Window
@@ -99,7 +99,7 @@ namespace TestAppHL.UniversalWindows 
        private void OnSuspending(object sender, SuspendingEventArgs e)

        {

            var deferral = e.SuspendingOperation.GetDeferral();

            //TODO: Save application state and stop any background activity

            // This application intentionally does not save state.

            deferral.Complete();

        }

    }

WindowsDevicePortalWrapper/TestAppHL.UniversalWindows/MainPage.xaml

+2 −9
Original line number Diff line number Diff line
@@ -58,17 +58,10 @@ 
        <CheckBox x:Name="photoColor" Content="Color" HorizontalAlignment="Left" Margin="289,343,0,0" VerticalAlignment="Top" Width="64" IsEnabled="False" IsChecked="True"/>

        <Button x:Name="startMrcRecording" Content="Start Recording" HorizontalAlignment="Left" Margin="15,379,0,0" VerticalAlignment="Top" Width="144" Click="StartMrcRecording_Click" IsEnabled="False" Height="32"/>

        <CheckBox x:Name="videoHolograms" Content="Holograms" HorizontalAlignment="Left" Margin="164,379,0,0" VerticalAlignment="Top" IsEnabled="False" IsChecked="True"/>

        <Button x:Name="stopMrcRecording" Content="Stop Recording" HorizontalAlignment="Left" Margin="15,443,0,0" VerticalAlignment="Top" Width="144" Click="StopMrcRecording_Click" IsEnabled="False" Height="32"/>

        <Button x:Name="listMrcFiles" Content="List MRC Files" HorizontalAlignment="Left" Margin="164,443,0,0" VerticalAlignment="Top" Width="144" Click="ListMrcFiles_Click" IsEnabled="False" RenderTransformOrigin="-0.403,2.156"/>

        <Button x:Name="installApplication" Content="Install Application" HorizontalAlignment="Left" Margin="15,481,0,0" VerticalAlignment="Top" Width="144" Click="InstallApplication_Click" IsEnabled="False"/>

        <CheckBox x:Name="uninstallPreviousVersion" Content="Uninstall previous" HorizontalAlignment="Left" Margin="385,481,0,0" VerticalAlignment="Top" IsEnabled="False"/>

        <TextBox x:Name="appNameValue" HorizontalAlignment="Left" Height="32" Margin="164,481,0,0" TextWrapping="Wrap" Text="ApplictionName" VerticalAlignment="Top" Width="216" IsEnabled="False"/>

        <TextBox x:Name="packageNameValue" HorizontalAlignment="Left" Height="20" Margin="15,518,0,0" TextWrapping="Wrap" Text="Package" VerticalAlignment="Top" Width="496" IsEnabled="False"/>

        <Button x:Name="browsePackages" Content="..." HorizontalAlignment="Left" Margin="516,518,0,0" VerticalAlignment="Top" Width="54" Click="BrowsePackages_Click" IsEnabled="False"/>

        <TextBox x:Name="dependencyFolderValue" HorizontalAlignment="Left" Height="20" Margin="15,555,0,0" TextWrapping="Wrap" Text="DependencyFolder" VerticalAlignment="Top" Width="496" IsEnabled="False"/>

        <Button x:Name="browseDependencies" Content="..." HorizontalAlignment="Left" Margin="516,555,0,0" VerticalAlignment="Top" Width="54" Click="BrowseDependencies_Click" IsEnabled="False"/>

        <CheckBox x:Name="videoColor" Content="Color" HorizontalAlignment="Left" Margin="289,374,0,0" VerticalAlignment="Top" IsEnabled="False" IsChecked="True"/>

        <CheckBox x:Name="videoMicrophone" Content="Microphone" HorizontalAlignment="Left" Margin="164,411,0,0" VerticalAlignment="Top" IsEnabled="False" IsChecked="True"/>

        <CheckBox x:Name="videoAudio" Content="App Audio" HorizontalAlignment="Left" Margin="289,411,0,0" VerticalAlignment="Top" IsEnabled="False" IsChecked="True"/>

        <Button x:Name="stopMrcRecording" Content="Stop Recording" HorizontalAlignment="Left" Margin="15,443,0,0" VerticalAlignment="Top" Width="144" Click="StopMrcRecording_Click" IsEnabled="False" Height="32"/>

        <Button x:Name="listMrcFiles" Content="List MRC Files" HorizontalAlignment="Left" Margin="164,443,0,0" VerticalAlignment="Top" Width="144" Click="ListMrcFiles_Click" IsEnabled="False" RenderTransformOrigin="-0.403,2.156"/>

    </Grid>

</Page>

WindowsDevicePortalWrapper/TestAppHL.UniversalWindows/MainPage.xaml.cs

+1 −16
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ namespace TestAppHL.UniversalWindows 


                sb.AppendLine("Setting device name to : " + nameValue.Text);

                sb.AppendLine(" The name change will be reflected after a reboot.");

                await portal.SetDeviceName(nameValue.Text, false);

                await portal.SetDeviceName(nameValue.Text);

            }

            catch(Exception ex)

            {
@@ -593,20 +593,5 @@ namespace TestAppHL.UniversalWindows 


            this.testOutput.Text = sb.ToString();

        }



        private async void InstallApplication_Click(object sender, RoutedEventArgs e)

        {

            throw new NotImplementedException();

        }



        private void BrowsePackages_Click(object sender, RoutedEventArgs e)

        {

            throw new NotImplementedException();

        }



        private void BrowseDependencies_Click(object sender, RoutedEventArgs e)

        {

            throw new NotImplementedException();

        }

    }

}

WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/OsInformation.cs

+1 −12
Original line number Diff line number Diff line
@@ -115,24 +115,13 @@ namespace Microsoft.Tools.WindowsDevicePortal 
        /// Sets the device's name

        /// </summary>

        /// <param name="name">The name to assign to the device.</param>

        /// <param name="reboot">True to reboot the device after setting the name, false otherwise.</param>

        /// <remarks>The new name does not take effect until the device has been restarted.</remarks>

        /// <returns>Task tracking setting the device name completion.</returns>

        public async Task SetDeviceName(

            string name,

            bool reboot = true)

        public async Task SetDeviceName(string name)

        {

            await this.Post(

                MachineNameApi,

                string.Format("name={0}", Utilities.Hex64Encode(name)));



            // Names do not take effect until after a reboot.

            if (reboot)

            {

                await this.Reboot();

            }



            // TODO - wait until device has rebooted then reconnect

        }



        #region Data contract

WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/DevicePortal.cs

+0 −4
Original line number Diff line number Diff line
@@ -242,10 +242,6 @@ namespace Microsoft.Tools.WindowsDevicePortal 


                    // TODO - consider what to do if there is more than one wifi interface on a device

                    await this.ConnectToWifiNetwork(wifiInterfaces.Interfaces[0].Guid, ssid, ssidKey);



                    // TODO - note that in some instances, the hololens was receiving a KeepAlive exception, yet the network connection succeeded. 

                    // this COULD have been an RTM bug that is now fixed, or it could have been the fault of the access point

                    // some investigation and defensive measures should be implemented here to avoid excessive noise / false failures

                }



                // Get the device's IP configuration and update the connection as appropriate.