Skip to content

Commit 6501908

Browse files
author
David Kline
authored
Merge pull request #2765 from StephenHodgson/vNEXT-PreBetaChanges
Just a few obsolete things we can take care of before 2018.3 beta
2 parents c3b493b + 4731905 commit 6501908

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

Assets/MixedRealityToolkit/_Core/Utilities/AsyncUtility/AwaiterExtensions.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,6 @@ public static SimpleCoroutineAwaiter<Object> GetAwaiter(this ResourceRequest ins
9191
return awaiter;
9292
}
9393

94-
public static SimpleCoroutineAwaiter<WWW> GetAwaiter(this WWW instruction)
95-
{
96-
return GetAwaiterReturnSelf(instruction);
97-
}
98-
9994
public static SimpleCoroutineAwaiter<AssetBundle> GetAwaiter(this AssetBundleCreateRequest instruction)
10095
{
10196
var awaiter = new SimpleCoroutineAwaiter<AssetBundle>();
@@ -328,7 +323,7 @@ private static string GenerateObjectTraceMessage(List<Type> objTrace)
328323
}
329324

330325
result.AppendLine();
331-
return "Unity Coroutine Object Trace: " + result;
326+
return $"Unity Coroutine Object Trace: {result}";
332327
}
333328

334329
private static List<Type> GenerateObjectTrace(IEnumerable<IEnumerator> enumerators)

Assets/MixedRealityToolkit/_Core/Utilities/WindowsDevicePortal/DevicePortal.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ public static async Task<bool> InstallAppAsync(string appFullPath, DeviceInfo ta
411411
}
412412

413413
// Query
414-
string query = $"{string.Format(InstallQuery, FinalizeUrl(targetDevice.IP))}?package={WWW.EscapeURL(fileName)}";
414+
string query = $"{string.Format(InstallQuery, FinalizeUrl(targetDevice.IP))}?package={UnityWebRequest.EscapeURL(fileName)}";
415415

416416
var response = await Rest.PostAsync(query, form, targetDevice.Authorization);
417417

@@ -497,7 +497,7 @@ public static async Task<bool> UninstallAppAsync(string packageName, DeviceInfo
497497
return false;
498498
}
499499

500-
string query = $"{string.Format(InstallQuery, FinalizeUrl(targetDevice.IP))}?package={WWW.EscapeURL(appInfo.PackageFullName)}";
500+
string query = $"{string.Format(InstallQuery, FinalizeUrl(targetDevice.IP))}?package={UnityWebRequest.EscapeURL(appInfo.PackageFullName)}";
501501
var response = await Rest.DeleteAsync(query, targetDevice.Authorization);
502502

503503
if (response.Successful)
@@ -542,7 +542,7 @@ public static async Task<bool> LaunchAppAsync(string packageName, DeviceInfo tar
542542
return false;
543543
}
544544

545-
string query = $"{string.Format(AppQuery, FinalizeUrl(targetDevice.IP))}?appid={WWW.EscapeURL(appInfo.PackageRelativeId.EncodeTo64())}&package={WWW.EscapeURL(appInfo.PackageFullName)}";
545+
string query = $"{string.Format(AppQuery, FinalizeUrl(targetDevice.IP))}?appid={UnityWebRequest.EscapeURL(appInfo.PackageRelativeId.EncodeTo64())}&package={UnityWebRequest.EscapeURL(appInfo.PackageFullName)}";
546546
var response = await Rest.PostAsync(query, targetDevice.Authorization);
547547

548548
if (!response.Successful)
@@ -586,7 +586,7 @@ public static async Task<bool> StopAppAsync(string packageName, DeviceInfo targe
586586
return false;
587587
}
588588

589-
string query = $"{string.Format(AppQuery, FinalizeUrl(targetDevice.IP))}?package={WWW.EscapeURL(appInfo.PackageFullName.EncodeTo64())}";
589+
string query = $"{string.Format(AppQuery, FinalizeUrl(targetDevice.IP))}?package={UnityWebRequest.EscapeURL(appInfo.PackageFullName.EncodeTo64())}";
590590
Response response = await Rest.DeleteAsync(query, targetDevice.Authorization);
591591

592592
if (!response.Successful)

0 commit comments

Comments
 (0)