Skip to content

Commit 2495716

Browse files
Merge pull request #865 from StephenHodgson/HTK-local
Fixed issue with MS Build version calculation & renamed build folder.
2 parents 8e5ee20 + cc430c3 commit 2495716

26 files changed

+1
-1
lines changed
File renamed without changes.

Assets/HoloToolkit/Build/Editor/BuildDeployPortal.cs renamed to Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployPortal.cs

File renamed without changes.

Assets/HoloToolkit/Build/Editor/BuildDeployPortal.cs.meta renamed to Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployPortal.cs.meta

File renamed without changes.

Assets/HoloToolkit/Build/Editor/BuildDeployPrefs.cs renamed to Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployPrefs.cs

File renamed without changes.

Assets/HoloToolkit/Build/Editor/BuildDeployPrefs.cs.meta renamed to Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployPrefs.cs.meta

File renamed without changes.

Assets/HoloToolkit/Build/Editor/BuildDeployTools.cs renamed to Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployTools.cs

File renamed without changes.

Assets/HoloToolkit/Build/Editor/BuildDeployTools.cs.meta renamed to Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployTools.cs.meta

File renamed without changes.

Assets/HoloToolkit/Build/Editor/BuildDeployWindow.cs renamed to Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployWindow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ private void OnGUI()
285285
string currentSDKVersion = EditorUserBuildSettings.wsaUWPSDK;
286286

287287
int currentSDKVersionIndex = 0;
288-
int defaultMSBuildVersionIndex = 0;
288+
int defaultMSBuildVersionIndex = -1;
289289

290290
for (var i = 0; i < windowsSdkPaths.Length; i++)
291291
{

Assets/HoloToolkit/Build/Editor/BuildDeployWindow.cs.meta renamed to Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployWindow.cs.meta

File renamed without changes.

0 commit comments

Comments
 (0)