Skip to content

Commit f4502f9

Browse files
StephenHodgsonStephenHodgson
authored
Merge pull request #3034 from StephenHodgson/vNEXT-AsyncUpdate
Updated async utilities to prevent possible deadlocks
2 parents 6d0d1b1 + da059a8 commit f4502f9

23 files changed

+69
-8
lines changed

‎Assets/MixedRealityToolkit-Examples/MixedRealityToolkit.Examples.asmdef‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{
22
"name": "Microsoft.MixedReality.Toolkit.Examples",
33
"references": [
4-
"Microsoft.MixedReality.Toolkit",
5-
"Microsoft.MixedReality.Toolkit.SDK"
4+
"Microsoft.MixedReality.Toolkit",
5+
"Microsoft.MixedReality.Toolkit.SDK",
6+
"Microsoft.MixedReality.Toolkit.Core.Utilities.Async"
67
],
78
"optionalUnityReferences": [],
89
"includePlatforms": [],

‎Assets/MixedRealityToolkit-SDK/MixedRealityToolkit.SDK.asmdef‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"name": "Microsoft.MixedReality.Toolkit.SDK",
33
"references": [
44
"Microsoft.MixedReality.Toolkit",
5-
"Microsoft.MixedReality.Toolkit.InputSystem"
5+
"Microsoft.MixedReality.Toolkit.InputSystem",
6+
"Microsoft.MixedReality.Toolkit.Core.Utilities.Async"
67
],
78
"optionalUnityReferences": [],
89
"includePlatforms": [],

‎Assets/MixedRealityToolkit/MixedRealityToolkit.asmdef‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"references": [
44
"Microsoft.MixedReality.Toolkit.Core.Utilities.Editor",
55
"Microsoft.MixedReality.Toolkit.Core.Definitions.Utilities.Editor",
6-
"Microsoft.MixedReality.Toolkit.Core.Utilities.Editor.Setup"
6+
"Microsoft.MixedReality.Toolkit.Core.Utilities.Editor.Setup",
7+
"Microsoft.MixedReality.Toolkit.Core.Utilities.Async"
78
],
89
"optionalUnityReferences": [],
910
"includePlatforms": [],

‎Assets/MixedRealityToolkit/_Core/Inspectors/MixedRealityToolkit.Core.Inspectors.asmdef‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"Microsoft.MixedReality.Toolkit.Core.Build",
77
"Microsoft.MixedReality.Toolkit.Core.Definitions.Utilities.Editor",
88
"Microsoft.MixedReality.Toolkit.Core.Utilities.Editor",
9-
"Microsoft.MixedReality.Toolkit.Core.Utilities.Editor.Setup"
9+
"Microsoft.MixedReality.Toolkit.Core.Utilities.Editor.Setup",
10+
"Microsoft.MixedReality.Toolkit.Core.Utilities.Async"
1011
],
1112
"optionalUnityReferences": [],
1213
"includePlatforms": [

Assets/MixedRealityToolkit/_Core/Utilities/AsyncUtility.meta renamed to Assets/MixedRealityToolkit/_Core/Utilities/Async.meta

File renamed without changes.

Assets/MixedRealityToolkit/_Core/Utilities/AsyncUtility/AwaitYieldInstructions.meta renamed to Assets/MixedRealityToolkit/_Core/Utilities/Async/AwaitYieldInstructions.meta

File renamed without changes.

Assets/MixedRealityToolkit/_Core/Utilities/AsyncUtility/AwaitYieldInstructions/WaitForBackgroundThread.cs renamed to Assets/MixedRealityToolkit/_Core/Utilities/Async/AwaitYieldInstructions/WaitForBackgroundThread.cs

File renamed without changes.

Assets/MixedRealityToolkit/_Core/Utilities/AsyncUtility/AwaitYieldInstructions/WaitForBackgroundThread.cs.meta renamed to Assets/MixedRealityToolkit/_Core/Utilities/Async/AwaitYieldInstructions/WaitForBackgroundThread.cs.meta

File renamed without changes.

Assets/MixedRealityToolkit/_Core/Utilities/AsyncUtility/AwaitYieldInstructions/WaitForUpdate.cs renamed to Assets/MixedRealityToolkit/_Core/Utilities/Async/AwaitYieldInstructions/WaitForUpdate.cs

File renamed without changes.

Assets/MixedRealityToolkit/_Core/Utilities/AsyncUtility/AwaitYieldInstructions/WaitForUpdate.cs.meta renamed to Assets/MixedRealityToolkit/_Core/Utilities/Async/AwaitYieldInstructions/WaitForUpdate.cs.meta

File renamed without changes.

0 commit comments

Comments
 (0)