Fix "usage of unassigned variable" errors

keveleigh · keveleigh · commit b199b3459298 · 2021-06-07T13:46:38.000-07:00
diff --git a/Assets/MRTK/SDK/Features/UX/Scripts/BoundingBox/BoundingBox.cs b/Assets/MRTK/SDK/Features/UX/Scripts/BoundingBox/BoundingBox.cs
@@ -1869,8 +1869,8 @@ private Bounds GetTargetBounds()
 
         private void ExtractBoundsCorners(Transform childTransform, BoundsCalculationMethod boundsCalculationMethod)
         {
-            KeyValuePair<Transform, Collider> colliderByTransform;
-            KeyValuePair<Transform, Bounds> rendererBoundsByTransform;
+            KeyValuePair<Transform, Collider> colliderByTransform = default;
+            KeyValuePair<Transform, Bounds> rendererBoundsByTransform = default;
 
             if (boundsCalculationMethod != BoundsCalculationMethod.RendererOnly)
             {
diff --git a/Assets/MRTK/SDK/Features/UX/Scripts/BoundsControl/BoundsControl.cs b/Assets/MRTK/SDK/Features/UX/Scripts/BoundsControl/BoundsControl.cs
@@ -902,8 +902,8 @@ private Bounds GetTargetBounds()
 
         private void ExtractBoundsCorners(Transform childTransform, BoundsCalculationMethod boundsCalculationMethod)
         {
-            KeyValuePair<Transform, Collider> colliderByTransform;
-            KeyValuePair<Transform, Bounds> rendererBoundsByTransform;
+            KeyValuePair<Transform, Collider> colliderByTransform = default;
+            KeyValuePair<Transform, Bounds> rendererBoundsByTransform = default;
 
             if (boundsCalculationMethod != BoundsCalculationMethod.RendererOnly)
             {
diff --git a/Assets/MRTK/Tools/MSBuild/Scripts/Utilities.cs b/Assets/MRTK/Tools/MSBuild/Scripts/Utilities.cs
@@ -129,7 +129,7 @@ public static bool TryGetGuidForAsset(FileInfo assetPath, out Guid guid)
                 }
             }
 
-            if (guid != null && Guid.TryParse(guidString, out guid))
+            if (guidString != null && Guid.TryParse(guidString, out guid))
             {
                 return true;
             }

Original file line number	Diff line number	Diff line change
`@@ -1869,8 +1869,8 @@ private Bounds GetTargetBounds()`
`1869`	`1869`
`1870`	`1870`	`private void ExtractBoundsCorners(Transform childTransform, BoundsCalculationMethod boundsCalculationMethod)`
`1871`	`1871`	`{`
`1872`		`- KeyValuePair<Transform, Collider> colliderByTransform;`
`1873`		`- KeyValuePair<Transform, Bounds> rendererBoundsByTransform;`
	`1872`	`+ KeyValuePair<Transform, Collider> colliderByTransform = default;`
	`1873`	`+ KeyValuePair<Transform, Bounds> rendererBoundsByTransform = default;`
`1874`	`1874`
`1875`	`1875`	`if (boundsCalculationMethod != BoundsCalculationMethod.RendererOnly)`
`1876`	`1876`	`{`
Original file line number	Diff line number	Diff line change
`@@ -902,8 +902,8 @@ private Bounds GetTargetBounds()`
`902`	`902`
`903`	`903`	`private void ExtractBoundsCorners(Transform childTransform, BoundsCalculationMethod boundsCalculationMethod)`
`904`	`904`	`{`
`905`		`- KeyValuePair<Transform, Collider> colliderByTransform;`
`906`		`- KeyValuePair<Transform, Bounds> rendererBoundsByTransform;`
	`905`	`+ KeyValuePair<Transform, Collider> colliderByTransform = default;`
	`906`	`+ KeyValuePair<Transform, Bounds> rendererBoundsByTransform = default;`
`907`	`907`
`908`	`908`	`if (boundsCalculationMethod != BoundsCalculationMethod.RendererOnly)`
`909`	`909`	`{`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ public static bool TryGetGuidForAsset(FileInfo assetPath, out Guid guid)`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`
`132`		`- if (guid != null && Guid.TryParse(guidString, out guid))`
	`132`	`+ if (guidString != null && Guid.TryParse(guidString, out guid))`
`133`	`133`	`{`
`134`	`134`	`return true;`
`135`	`135`	`}`