Merge pull request #2127 from StephenHodgson/MRTK-May18-BuildPort

Ported some build fixes from dev branch

Author: David Kline

Assets/HoloToolkit-Examples/SharingWithUNET/Scripts/GenericNetworkTransmitter.cs

@@ -1,12 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using HoloToolkit.Unity;
 using System;
 using System.Collections.Generic;
 using UnityEngine;
 
-#if !UNITY_EDITOR && UNITY_WSA
+#if !UNITY_EDITOR && UNITY_WSA && (!ENABLE_IL2CPP && NET_STANDARD_2_0)
 using Windows.Networking.Sockets;
 using Windows.Storage.Streams;
 using Windows.Networking;
@@ -30,10 +29,6 @@ public class GenericNetworkTransmitter : Singleton<GenericNetworkTransmitter>
         /// <param name="data">The data that arrived.</param>
         public delegate void OnDataReady(byte[] data);
 
-#if UNITY_WSA
-        public event OnDataReady DataReadyEvent;
-#endif
-
         /// <summary>
         /// The server to connect to when data is needed.
         /// </summary>
@@ -49,7 +44,7 @@ public class GenericNetworkTransmitter : Singleton<GenericNetworkTransmitter>
         /// </summary>
         private byte[] mostRecentDataBuffer;
 
-#if !UNITY_EDITOR && UNITY_WSA
+#if !UNITY_EDITOR && UNITY_WSA && (!ENABLE_IL2CPP && NET_STANDARD_2_0)
         /// <summary>
         /// Tracks the network connection to the remote machine we are sending meshes to.
         /// </summary>
@@ -64,6 +59,8 @@ public class GenericNetworkTransmitter : Singleton<GenericNetworkTransmitter>
         /// If we cannot connect to the server, this is how long we will wait before retrying.
         /// </summary>
         private float timeToDeferFailedConnections = 10.0f;
+
+        public event OnDataReady DataReadyEvent;
 #endif
 
         /// <summary>
@@ -107,7 +104,7 @@ private void Update()
         }
 
         // A lot of the work done in this class can only be done in UWP. The editor is not a UWP app.
-#if !UNITY_EDITOR && UNITY_WSA
+#if !UNITY_EDITOR && UNITY_WSA && (!ENABLE_IL2CPP && NET_STANDARD_2_0)
         private void RequestDataRetry()
         {
             if (!RequestAndGetData())
@@ -122,7 +119,7 @@ private void RequestDataRetry()
         /// </summary>
         public void ConfigureAsServer()
         {
-#if !UNITY_EDITOR && UNITY_WSA
+#if !UNITY_EDITOR && UNITY_WSA && (!ENABLE_IL2CPP && NET_STANDARD_2_0)
             Task t = new Task(() =>
             {
                 networkListener = new StreamSocketListener();
@@ -143,7 +140,7 @@ public void ConfigureAsServer()
         /// </summary>
         private bool ConnectListener()
         {
-#if !UNITY_EDITOR && UNITY_WSA
+#if !UNITY_EDITOR && UNITY_WSA && (!ENABLE_IL2CPP && NET_STANDARD_2_0)
             if (waitingForConnection)
             {
                 Debug.Log("Not a good time to connect listener");
@@ -165,7 +162,7 @@ private bool ConnectListener()
 #endif
         }
 
-#if !UNITY_EDITOR && UNITY_WSA
+#if !UNITY_EDITOR && UNITY_WSA && (!ENABLE_IL2CPP && NET_STANDARD_2_0)
         /// <summary>
         /// When a connection is made to us, this call back gets called and
         /// we send our data.

Assets/HoloToolkit-Examples/SharingWithUNET/Scripts/UNetAnchorManager.cs

@@ -187,7 +187,7 @@ private void Start()
                 return;
             }
 
-#if UNITY_WSA
+#if UNITY_WSA && (!ENABLE_IL2CPP && NET_STANDARD_2_0)
 #if UNITY_2017_2_OR_NEWER
             if (HolographicSettings.IsDisplayOpaque)
 #else

Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployTools.cs

@@ -85,12 +85,21 @@ public static bool BuildSLN(string buildDirectory, bool showDialog = true)
                 WSAUwpSdk = EditorUserBuildSettings.wsaUWPSDK,
 
                 // Configure a post build action that will compile the generated solution
+#if UNITY_2018_1_OR_NEWER
+                PostBuildAction = (innerBuildInfo, buildReport) =>
+                {
+                    if (buildReport.summary.result != UnityEditor.Build.Reporting.BuildResult.Succeeded)
+                    {
+                        EditorUtility.DisplayDialog(string.Format("{0} WindowsStoreApp Build {1}!", PlayerSettings.productName, buildReport.summary.result), "See console for details", "OK");
+                    }
+#else
                 PostBuildAction = (innerBuildInfo, buildError) =>
                 {
                     if (!string.IsNullOrEmpty(buildError))
                     {
-                        EditorUtility.DisplayDialog(PlayerSettings.productName + " WindowsStoreApp Build Failed!", buildError, "OK");
+                        EditorUtility.DisplayDialog(string.Format("{0} WindowsStoreApp Build Failed!", PlayerSettings.productName), buildError, "OK");
                     }
+#endif
                     else
                     {
                         if (showDialog)
@@ -223,7 +232,7 @@ public static bool BuildAppxFromSLN(string productName, string msBuildVersion, b
 
             if (!File.Exists(msBuildPath))
             {
-                Debug.LogErrorFormat("MSBuild.exe is missing or invalid (path={0}).", msBuildPath);
+                Debug.LogErrorFormat("MSBuild.exe is missing or invalid:\n{0}.", msBuildPath);
                 EditorUtility.ClearProgressBar();
                 return false;
             }
@@ -240,13 +249,12 @@ public static bool BuildAppxFromSLN(string productName, string msBuildVersion, b
                 File.Copy(unity + @"\Data\PlaybackEngines\MetroSupport\Tools\project.json", storePath + "\\project.json");
             }
 
-            string nugetPath = Path.Combine(unity, @"Data\PlaybackEngines\MetroSupport\Tools\NuGet.exe");
-            string assemblyCSharp = storePath + "/GeneratedProjects/UWP/Assembly-CSharp";
-            string assemblyCSharpFirstPass = storePath + "/GeneratedProjects/UWP/Assembly-CSharp-firstpass";
+            string assemblyCSharp = string.Format("{0}/GeneratedProjects/UWP/Assembly-CSharp", storePath);
+            string assemblyCSharpFirstPass = string.Format("{0}/GeneratedProjects/UWP/Assembly-CSharp-firstpass", storePath);
             bool restoreFirstPass = Directory.Exists(assemblyCSharpFirstPass);
+            string nugetPath = Path.Combine(unity, @"Data\PlaybackEngines\MetroSupport\Tools\NuGet.exe");
 
-            // Before building, need to run a nuget restore to generate a json.lock file. Failing to do
-            // this breaks the build in VS RTM
+            // Before building, need to run a nuget restore to generate a json.lock file. Failing to do this breaks the build in VS RTM
             if (PlayerSettings.GetScriptingBackend(BuildTargetGroup.WSA) == ScriptingImplementation.WinRTDotNET &&
                 (!RestoreNugetPackages(nugetPath, storePath) ||
                  !RestoreNugetPackages(nugetPath, storePath + "\\" + productName) ||
@@ -260,63 +268,92 @@ public static bool BuildAppxFromSLN(string productName, string msBuildVersion, b
 
             EditorUtility.DisplayProgressBar("Build AppX", "Building AppX Package...", 25);
 
-            // Ensure that the generated .appx version increments by modifying
-            // Package.appxmanifest
-            if (incrementVersion)
+            // Ensure that the generated .appx version increments by modifying Package.appxmanifest
+            if (!SetPackageVersion(incrementVersion))
             {
-                IncrementPackageVersion();
+                Debug.LogError("Failed to increment package version!");
+                EditorUtility.ClearProgressBar();
+                return false;
             }
 
             // Now do the actual build
             var pInfo = new ProcessStartInfo
             {
                 FileName = msBuildPath,
-                CreateNoWindow = false,
+                CreateNoWindow = true,
+                UseShellExecute = false,
+                RedirectStandardOutput = true,
+                RedirectStandardError = true,
                 Arguments = string.Format("\"{0}\" /t:{1} /p:Configuration={2} /p:Platform={3} /verbosity:m",
                     solutionProjectPath,
                     forceRebuildAppx ? "Rebuild" : "Build",
                     buildConfig,
                     buildPlatform)
             };
 
-            // Uncomment out to debug by copying into command window
-            //Debug.Log("\"" + vs + "\"" + " " + pInfo.Arguments);
-
-            var process = new Process { StartInfo = pInfo };
+            var process = new Process
+            {
+                StartInfo = pInfo,
+                EnableRaisingEvents = true
+            };
 
             try
             {
+                process.ErrorDataReceived += (sender, args) =>
+                {
+                    if (!string.IsNullOrEmpty(args.Data))
+                    {
+                        Debug.LogError(args.Data);
+                    }
+                };
+
+                process.OutputDataReceived += (sender, args) =>
+                {
+                    if (!string.IsNullOrEmpty(args.Data))
+                    {
+                        Debug.Log(args.Data);
+                    }
+                };
+
                 if (!process.Start())
                 {
-                    Debug.LogError("Failed to start Cmd process!");
+                    Debug.LogError("Failed to start process!");
                     EditorUtility.ClearProgressBar();
+                    process.Close();
+                    process.Dispose();
                     return false;
                 }
 
+                process.BeginOutputReadLine();
+                process.BeginErrorReadLine();
                 process.WaitForExit();
 
                 EditorUtility.ClearProgressBar();
 
-                if (process.ExitCode == 0 &&
-                    showDialog &&
+                if (process.ExitCode == 0 && showDialog &&
                     !EditorUtility.DisplayDialog("Build AppX", "AppX Build Successful!", "OK", "Open AppX Folder"))
                 {
-                    Process.Start("explorer.exe", "/f /open," + Path.GetFullPath(BuildDeployPrefs.BuildDirectory + "/" + PlayerSettings.productName + "/AppPackages"));
+                    Process.Start("explorer.exe", string.Format("/f /open,{0}/{1}/AppPackages", Path.GetFullPath(BuildDeployPrefs.BuildDirectory), PlayerSettings.productName));
                 }
 
                 if (process.ExitCode != 0)
                 {
-                    Debug.LogError("MSBuild error (code = " + process.ExitCode + ")");
+                    Debug.LogError(string.Format("MSBuild error (code = {0})", process.ExitCode));
+                    EditorUtility.ClearProgressBar();
                     EditorUtility.DisplayDialog(PlayerSettings.productName + " build Failed!", "Failed to build appx from solution. Error code: " + process.ExitCode, "OK");
+
+                    process.Close();
+                    process.Dispose();
                     return false;
                 }
 
                 process.Close();
                 process.Dispose();
-
             }
             catch (Exception e)
             {
+                process.Close();
+                process.Dispose();
                 Debug.LogError("Cmd Process EXCEPTION: " + e);
                 EditorUtility.ClearProgressBar();
                 return false;
@@ -325,15 +362,15 @@ public static bool BuildAppxFromSLN(string productName, string msBuildVersion, b
             return true;
         }
 
-        private static void IncrementPackageVersion()
+        private static bool SetPackageVersion(bool increment)
         {
             // Find the manifest, assume the one we want is the first one
             string[] manifests = Directory.GetFiles(BuildDeployPrefs.AbsoluteBuildDirectory, "Package.appxmanifest", SearchOption.AllDirectories);
 
             if (manifests.Length == 0)
             {
-                Debug.LogError("Unable to find Package.appxmanifest file for build (in path - " + BuildDeployPrefs.AbsoluteBuildDirectory + ")");
-                return;
+                Debug.LogError(string.Format("Unable to find Package.appxmanifest file for build (in path - {0})", BuildDeployPrefs.AbsoluteBuildDirectory));
+                return false;
             }
 
             string manifest = manifests[0];
@@ -342,8 +379,8 @@ private static void IncrementPackageVersion()
 
             if (identityNode == null)
             {
-                Debug.LogError("Package.appxmanifest for build (in path - " + BuildDeployPrefs.AbsoluteBuildDirectory + ") is missing an <Identity /> node");
-                return;
+                Debug.LogError(string.Format("Package.appxmanifest for build (in path - {0}) is missing an <Identity /> node", BuildDeployPrefs.AbsoluteBuildDirectory));
+                return false;
             }
 
             // We use XName.Get instead of string -> XName implicit conversion because
@@ -353,20 +390,21 @@ private static void IncrementPackageVersion()
 
             if (versionAttr == null)
             {
-                Debug.LogError("Package.appxmanifest for build (in path - " + BuildDeployPrefs.AbsoluteBuildDirectory + ") is missing a version attribute in the <Identity /> node.");
-                return;
+                Debug.LogError(string.Format("Package.appxmanifest for build (in path - {0}) is missing a version attribute in the <Identity /> node.", BuildDeployPrefs.AbsoluteBuildDirectory));
+                return false;
             }
 
             // Assume package version always has a '.' between each number.
             // According to https://msdn.microsoft.com/en-us/library/windows/apps/br211441.aspx
             // Package versions are always of the form Major.Minor.Build.Revision.
             // Note: Revision number reserved for Windows Store, and a value other than 0 will fail WACK.
             var version = PlayerSettings.WSA.packageVersion;
-            var newVersion = new Version(version.Major, version.Minor, version.Build + 1, version.Revision);
+            var newVersion = new Version(version.Major, version.Minor, increment ? version.Build + 1 : version.Build, version.Revision);
 
             PlayerSettings.WSA.packageVersion = newVersion;
             versionAttr.Value = newVersion.ToString();
             rootNode.Save(manifest);
+            return true;
         }
     }
 }