Responding to PR feedback. (abfa301b) · Commits · for microsoft in general / xbox / tunip3 / WindowsDevicePortalWrapper

WindowsDevicePortalWrapper/MockDataGenerator/Program.cs

+3 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,9 @@ namespace MockDataGenerator

		if (parameters.HasParameter("method"))
		{
		// This is case sensitive. Since it's only used while generating mocks which is a development time action,
		// that seems okay. If we want to revisit I'd prefer keeping the casing of the enum and using a switch or
		// if/else block to manually convert.
		httpMethod = (HttpMethods)Enum.Parse(typeof(HttpMethods), parameters.GetParameterValue("method"));
		}

WindowsDevicePortalWrapper/TestAppXbox/ParameterHelper.cs

+5 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,11 @@ namespace XboxWdpDriver
		/// </summary>
		public static readonly string IpOrHostname = "x";

		/// <summary>
		/// Old Device Identifier identifier string. This allows us to accept both ip or x.
		/// </summary>
		public static readonly string IpOrHostnameOld = "ip";

		/// <summary>
		/// WDP Username identifier string
		/// </summary>

WindowsDevicePortalWrapper/TestAppXbox/Program.cs

+28 −26

Original line number	Diff line number	Diff line
		@@ -114,6 +114,8 @@ namespace XboxWdpDriver
		ParameterHelper parameters = new ParameterHelper();
		Program app = new Program();

		string targetConsole = string.Empty;

		try
		{
		parameters.ParseCommandLine(args);
		@@ -125,9 +127,18 @@ namespace XboxWdpDriver
		operation = OperationStringToEnum(parameters.GetParameterValue("op"));
		}

		if (!parameters.HasParameter(ParameterHelper.IpOrHostname))
		// Allow /ip: to still function, even though we've moved to /x: in the documentation.
		if (parameters.HasParameter(ParameterHelper.IpOrHostnameOld) && !parameters.HasParameter(ParameterHelper.IpOrHostname))
		{
		targetConsole = parameters.GetParameterValue(ParameterHelper.IpOrHostnameOld);
		}
		else if (parameters.HasParameter(ParameterHelper.IpOrHostname))
		{
		targetConsole = parameters.GetParameterValue(ParameterHelper.IpOrHostname);
		}

		if (string.IsNullOrEmpty(targetConsole))
		{
		string defaultConsole = string.Empty;
		object regValue;
		regValue = Microsoft.Win32.Registry.GetValue(DefaultConsoleRegkey, null, null);

		@@ -138,29 +149,12 @@ namespace XboxWdpDriver

		if (regValue is string)
		{
		defaultConsole = regValue as string;
		parameters.AddParameter(ParameterHelper.IpOrHostname, defaultConsole);
		targetConsole = regValue as string;
		}
		else
		{
		throw new Exception("No default console is currently set. Must provide an ip address or hostname to connect to: /x:<ip or hostname>.");
		}

		// If we do a connect operation with no IP specified, that means we want to know
		// what the default is. Print this and return.
		if (operation == OperationType.ConnectOperation)
		{
		if (!string.IsNullOrEmpty(defaultConsole))
		{
		Console.WriteLine(defaultConsole);
		}
		else
		{
		Console.WriteLine("No default console is currently set.");
		}

		return;
		}
		}

		IDevicePortalConnection connection = null;
		@@ -169,11 +163,11 @@ namespace XboxWdpDriver
		{
		if (!parameters.HasParameter(ParameterHelper.WdpUser) \|\| !parameters.HasParameter(ParameterHelper.WdpPassword))
		{
		connection = new DevicePortalConnection(parameters.GetParameterValue(ParameterHelper.IpOrHostname));
		connection = new DevicePortalConnection(targetConsole);
		}
		else
		{
		connection = new DevicePortalConnection(parameters.GetParameterValue(ParameterHelper.IpOrHostname), parameters.GetParameterValue(ParameterHelper.WdpUser), parameters.GetParameterValue(ParameterHelper.WdpPassword));
		connection = new DevicePortalConnection(targetConsole, parameters.GetParameterValue(ParameterHelper.WdpUser), parameters.GetParameterValue(ParameterHelper.WdpPassword));
		}
		}
		catch (TypeLoadException)
		@@ -185,7 +179,7 @@ namespace XboxWdpDriver
		}
		else
		{
		string connectionUri = string.Format("https://{0}:11443", parameters.GetParameterValue(ParameterHelper.IpOrHostname));
		string connectionUri = string.Format("https://{0}:11443", targetConsole);
		connection = new DefaultDevicePortalConnection(connectionUri, parameters.GetParameterValue(ParameterHelper.WdpUser), parameters.GetParameterValue(ParameterHelper.WdpPassword));
		}
		}
		@@ -224,7 +218,7 @@ namespace XboxWdpDriver
		}
		else
		{
		Console.WriteLine("Failed to connect to WDP for unknown reason.\n\nEnsure your address is the system IP or hostname ({0}) and the machine has WDP configured.", parameters.GetParameterValue(ParameterHelper.IpOrHostname));
		Console.WriteLine("Failed to connect to WDP for unknown reason.\n\nEnsure your address is the system IP or hostname ({0}) and the machine has WDP configured.", targetConsole);
		}
		}
		else if (operation == OperationType.InfoOperation)
		@@ -351,8 +345,16 @@ namespace XboxWdpDriver
		}
		else if (operation == OperationType.ConnectOperation)
		{
		Microsoft.Win32.Registry.SetValue(DefaultConsoleRegkey, null, parameters.GetParameterValue(ParameterHelper.IpOrHostname));
		Console.WriteLine("Default console set to {0}", parameters.GetParameterValue(ParameterHelper.IpOrHostname));
		// User provided a new ip or hostname to set as the default.
		if (parameters.HasParameter(ParameterHelper.IpOrHostname) \|\| parameters.HasParameter(ParameterHelper.IpOrHostnameOld))
		{
		Microsoft.Win32.Registry.SetValue(DefaultConsoleRegkey, null, targetConsole);
		Console.WriteLine("Default console set to {0}", targetConsole);
		}
		else
		{
		Console.WriteLine("Connected to Default console: {0}", targetConsole);
		}
		}
		else
		{