Skip to content

Commit e69aa95

Browse files
hpsinhpsin
authored
v0.9.4.1 Beta Release - re-add CSRF handling, formatting fixes (#241)
* Update content for WER * Update docs for XML. * Update Copyright to 2017 :)
1 parent 904195d commit e69aa95

File tree

32 files changed

+324
-215
lines changed

32 files changed

+324
-215
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ For documentation on the WDP REST endpoints which the project wraps, see the fol
2828

2929
### HoloLens specific methods
3030

31-
[HoloLens Device Portal API reference](https://developer.microsoft.com/en-us/windows/holographic/device_portal_api_reference)
31+
[HoloLens Device Portal API reference](https://developer.microsoft.com/en-us/windows/mixed-reality/device_portal_api_reference)
3232

3333
---
3434

‎Samples/XboxWdpDriver/Program.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,8 +338,11 @@ public static void Main(string[] args)
338338
break;
339339

340340
case OperationType.InstallOperation:
341-
// Ensure we have an IP since SMB might need it for path generation.
342-
parameters.AddParameter(ParameterHelper.IpOrHostname, targetConsole);
341+
if (!parameters.HasParameter(ParameterHelper.IpOrHostname))
342+
{
343+
// Ensure we have an IP since SMB might need it for path generation.
344+
parameters.AddParameter(ParameterHelper.IpOrHostname, targetConsole);
345+
}
343346

344347
InstallOperation.HandleOperation(portal, parameters);
345348
break;

‎WindowsDevicePortalWrapper/UnitTestProject/Core/EtwTests.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ public void GetEtwProvidersTest()
5252
ValidateEtwProviders(getEtwProvidersTask.Result);
5353
}
5454

55+
/// <summary>
56+
/// Basic test of Get methof for getting ETW events.
57+
/// </summary>
5558
[TestMethod]
5659
public void GetEtwEventsTest()
5760
{
@@ -61,7 +64,7 @@ public void GetEtwEventsTest()
6164
EtwEvents etwEvents = null;
6265

6366
WindowsDevicePortal.WebSocketMessageReceivedEventHandler<EtwEvents> etwEventsReceivedHandler =
64-
delegate (DevicePortal sender, WebSocketMessageReceivedEventArgs<EtwEvents> args)
67+
delegate(DevicePortal sender, WebSocketMessageReceivedEventArgs<EtwEvents> args)
6568
{
6669
if (args.Message != null)
6770
{

‎WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/IoT/IoT_rs1_release.cs‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
// </copyright>
55
//----------------------------------------------------------------------------------------------
66

7-
using Microsoft.VisualStudio.TestTools.UnitTesting;
87
using System.Linq;
98
using System.Net;
109
using System.Net.Http;
1110
using System.Threading.Tasks;
11+
using Microsoft.VisualStudio.TestTools.UnitTesting;
1212
using static Microsoft.Tools.WindowsDevicePortal.DevicePortal;
1313

1414
namespace Microsoft.Tools.WindowsDevicePortal.Tests
@@ -307,7 +307,6 @@ public void GetUpdateInstallTime_IoT()
307307

308308
// Check some known things about this response.
309309
Assert.AreEqual(0, installTime.RebootScheduled);
310-
311310
}
312311

313312
/// <summary>
@@ -396,21 +395,20 @@ public void SetDeviceNameTest_IoT()
396395
Assert.AreEqual(TaskStatus.RanToCompletion, setIoTDeviceName.Status);
397396
}
398397

399-
400398
/// <summary>
401399
/// Simple test to set SoftAp Settings
402400
/// </summary>
403401
[TestMethod]
404402
public void SetSoftApSettingsTest_IoT()
405403
{
406-
string SoftApEnabled = "true";
407-
string SoftApSsid = "SoftAPSsid";
408-
string SoftApPassword = "p@ssw0rd";
404+
string softApEnabled = "true";
405+
string softApSsid = "SoftAPSsid";
406+
string softApPassword = "p@ssw0rd";
409407

410408
HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.NoContent);
411409
TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.SoftAPSettingsApi, response, HttpMethods.Post);
412410

413-
Task setSoftApSettings = TestHelpers.Portal.SetSoftApSettingsAsync(SoftApEnabled, SoftApSsid, SoftApPassword);
411+
Task setSoftApSettings = TestHelpers.Portal.SetSoftApSettingsAsync(softApEnabled, softApSsid, softApPassword);
414412
setSoftApSettings.Wait();
415413

416414
Assert.AreEqual(TaskStatus.RanToCompletion, setSoftApSettings.Status);
@@ -495,7 +493,7 @@ public void SetControllersDriversTest_IoT()
495493
setIoTControllersDrivers.Wait();
496494

497495
Assert.AreEqual(TaskStatus.RanToCompletion, setIoTControllersDrivers.Status);
498-
Assert.AreEqual(requestReboot, setIoTControllersDrivers.Result.RequestReboot );
496+
Assert.AreEqual(requestReboot, setIoTControllersDrivers.Result.RequestReboot);
499497
}
500498

501499
/// <summary>
@@ -694,10 +692,10 @@ public void SetRenderVolumeTest_IoT()
694692
HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.NoContent);
695693
TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.SetRenderVolumeApi, response, HttpMethods.Post);
696694

697-
Task RenderVolume = TestHelpers.Portal.SetRenderVolumeAsync(renderVolume);
698-
RenderVolume.Wait();
695+
Task renderVolumeTask = TestHelpers.Portal.SetRenderVolumeAsync(renderVolume);
696+
renderVolumeTask.Wait();
699697

700-
Assert.AreEqual(TaskStatus.RanToCompletion, RenderVolume.Status);
698+
Assert.AreEqual(TaskStatus.RanToCompletion, renderVolumeTask.Status);
701699
}
702700

703701
/// <summary>
@@ -711,10 +709,10 @@ public void SetCaptureVolumeTest_IoT()
711709
HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.NoContent);
712710
TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.SetCaptureVolumeApi, response, HttpMethods.Post);
713711

714-
Task CaptureVolume = TestHelpers.Portal.SetCaptureVolumeAsync(captureVolume);
715-
CaptureVolume.Wait();
712+
Task captureVolumeTask = TestHelpers.Portal.SetCaptureVolumeAsync(captureVolume);
713+
captureVolumeTask.Wait();
716714

717-
Assert.AreEqual(TaskStatus.RanToCompletion, CaptureVolume.Status);
715+
Assert.AreEqual(TaskStatus.RanToCompletion, captureVolumeTask.Status);
718716
}
719717

720718
/// <summary>
@@ -729,10 +727,10 @@ public void IcSharingStartTest_IoT()
729727
HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.NoContent);
730728
TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.IcSharingApi, response, HttpMethods.Post);
731729

732-
Task IcsStart = TestHelpers.Portal.IcSharingStartAsync(privateInterfaceIndex, publicInterfaceIndex);
733-
IcsStart.Wait();
730+
Task icsStart = TestHelpers.Portal.IcSharingStartAsync(privateInterfaceIndex, publicInterfaceIndex);
731+
icsStart.Wait();
734732

735-
Assert.AreEqual(TaskStatus.RanToCompletion, IcsStart.Status);
733+
Assert.AreEqual(TaskStatus.RanToCompletion, icsStart.Status);
736734
}
737735

738736
/// <summary>
@@ -747,10 +745,10 @@ public void IcSharingStopTest_IoT()
747745
HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.NoContent);
748746
TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.IcSharingApi, response, HttpMethods.Delete);
749747

750-
Task IcsStop = TestHelpers.Portal.IcSharingStopAsync(privateInterfaceIndex, publicInterfaceIndex);
751-
IcsStop.Wait();
748+
Task icsStop = TestHelpers.Portal.IcSharingStopAsync(privateInterfaceIndex, publicInterfaceIndex);
749+
icsStop.Wait();
752750

753-
Assert.AreEqual(TaskStatus.RanToCompletion, IcsStop.Status);
751+
Assert.AreEqual(TaskStatus.RanToCompletion, icsStop.Status);
754752
}
755753

756754
/// <summary>
@@ -966,8 +964,8 @@ public void SetTpmAcpiTablesTest_IoT()
966964
public void SetTpmLogicalDeviceSettingsTest_IoT()
967965
{
968966
int logicalDeviceId = 1;
969-
string azureUri = "";
970-
string azureKey = "";
967+
string azureUri = string.Empty;
968+
string azureKey = string.Empty;
971969

972970
HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.NoContent);
973971
TestHelpers.MockHttpResponder.AddMockResponse(string.Format("{0}/{1}", DevicePortal.TpmSettingsApi, logicalDeviceId), response, HttpMethods.Post);
@@ -1005,7 +1003,7 @@ public void GetTpmAzureTokenInfo_IoT()
10051003
string validity = "18000";
10061004

10071005
TestHelpers.MockHttpResponder.AddMockResponse(
1008-
string.Format("{0}/{1}", TpmAzureTokenApi, logicalDeviceId),
1006+
string.Format("{0}/{1}", DevicePortal.TpmAzureTokenApi, logicalDeviceId),
10091007
this.PlatformType,
10101008
this.FriendlyOperatingSystemVersion,
10111009
HttpMethods.Get);

‎WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/WebSocket.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ private async Task ConnectInternalAsync(Uri endpoint)
6464
{
6565
await Task.Run(() =>
6666
{
67-
webSocketTask = TestHelpers.MockHttpResponder.WebSocketAsync(endpoint);
67+
this.webSocketTask = TestHelpers.MockHttpResponder.WebSocketAsync(endpoint);
6868
this.IsConnected = true;
6969
});
7070
}
@@ -77,8 +77,8 @@ private async Task CloseInternalAsync()
7777
{
7878
await Task.Run(() =>
7979
{
80-
webSocketTask.Dispose();
81-
webSocketTask = null;
80+
this.webSocketTask.Dispose();
81+
this.webSocketTask = null;
8282
this.IsConnected = false;
8383
});
8484
}
@@ -115,9 +115,9 @@ private async Task StartListeningForMessagesInternalAsync()
115115
{
116116
while (this.keepListeningForMessages)
117117
{
118-
await webSocketTask.ConfigureAwait(false);
118+
await this.webSocketTask.ConfigureAwait(false);
119119

120-
using (HttpResponseMessage response = webSocketTask.Result)
120+
using (HttpResponseMessage response = this.webSocketTask.Result)
121121
{
122122
if (!response.IsSuccessStatusCode)
123123
{
@@ -155,10 +155,10 @@ private async Task StartListeningForMessagesInternalAsync()
155155
/// <returns>The task of sending the message to the websocket</returns>
156156
private async Task SendMessageInternalAsync(string message)
157157
{
158-
await webSocketTask.ConfigureAwait(false);
159-
webSocketTask.Wait();
158+
await this.webSocketTask.ConfigureAwait(false);
159+
this.webSocketTask.Wait();
160160

161-
using (HttpResponseMessage response = webSocketTask.Result)
161+
using (HttpResponseMessage response = this.webSocketTask.Result)
162162
{
163163
if (!response.IsSuccessStatusCode)
164164
{

‎WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppDeployment.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ public class PackageInfo
385385
/// <returns> True if the package is sideloaded. </returns>
386386
public bool IsSideloaded()
387387
{
388-
return (this.PackageOrigin == 4 || this.PackageOrigin == 5);
388+
return this.PackageOrigin == 4 || this.PackageOrigin == 5;
389389
}
390390

391391
/// <summary>

‎WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppFileExplorer.cs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,10 +311,16 @@ public class FileOrFolderInformation
311311
public long SizeInBytes { get; private set; }
312312

313313
/// <summary>
314-
/// Gets whether the current item is a folder by checking for FILE_ATTRIBUTE_DIRECTORY
314+
/// Gets a value indicating whether the current item is a folder by checking for FILE_ATTRIBUTE_DIRECTORY
315315
/// See https://msdn.microsoft.com/en-us/library/windows/desktop/gg258117(v=vs.85).aspx
316316
/// </summary>
317-
public bool IsFolder { get { return (this.Type & 0x10) == 0x10; } }
317+
public bool IsFolder
318+
{
319+
get
320+
{
321+
return (this.Type & 0x10) == 0x10;
322+
}
323+
}
318324

319325
/// <summary>
320326
/// Overridden ToString method providing a user readable

0 commit comments

Comments
 (0)