Missing from last commit

Author: StephenHodgson

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

@@ -5,7 +5,7 @@
 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;
@@ -29,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>
@@ -48,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>
@@ -63,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>
@@ -106,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())
@@ -121,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();
@@ -142,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");
@@ -164,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/Utilities/Scripts/ApplicationViewManager.cs

@@ -5,7 +5,7 @@
 using System.Collections;
 using UnityEngine;
 
-#if !UNITY_EDITOR && UNITY_WSA
+#if !UNITY_EDITOR && UNITY_WSA && (!ENABLE_IL2CPP && NET_STANDARD_2_0)
 using System.Threading.Tasks;
 using Windows.ApplicationModel.Core;
 using Windows.UI.Core;
@@ -27,7 +27,7 @@ public class ApplicationViewManager : MonoBehaviour
     {
         private void Start()
         {
-#if !UNITY_EDITOR && UNITY_WSA
+#if !UNITY_EDITOR && UNITY_WSA && (!ENABLE_IL2CPP && NET_STANDARD_2_0)
             UnityEngine.WSA.Application.InvokeOnUIThread(
                 () =>
                 {
@@ -36,7 +36,7 @@ private void Start()
 #endif
         }
 
-#if !UNITY_EDITOR && UNITY_WSA
+#if !UNITY_EDITOR && UNITY_WSA && (!ENABLE_IL2CPP && NET_STANDARD_2_0)
         static int Full3DViewId { get; set; }
         static System.Collections.Concurrent.ConcurrentDictionary<int, Action<object>> CallbackDictionary
             = new System.Collections.Concurrent.ConcurrentDictionary<int, Action<object>>();
@@ -46,7 +46,7 @@ static System.Collections.Concurrent.ConcurrentDictionary<int, Action<object>> C
         /// Call this method with Application View Dispatcher， or in Application View Thread, will return to Full3D View and close Application View
         /// </summary>
         /// <param name="returnValue">The return value of the XAML View Execution</param>
-#if !UNITY_EDITOR && UNITY_WSA
+#if !UNITY_EDITOR && UNITY_WSA && (!ENABLE_IL2CPP && NET_STANDARD_2_0)
         public static async void CallbackReturnValue(object returnValue)
         {
             var viewId = ApplicationView.GetForCurrentView().Id;
@@ -80,7 +80,7 @@ public static void CallbackReturnValue(object returnValue)
         public IEnumerator OnLaunchXamlView<TReturnValue>(string xamlPageName, Action<TReturnValue> callback, object pageNavigateParameter = null)
         {
             bool isCompleted = false;
-#if !UNITY_EDITOR && UNITY_WSA
+#if !UNITY_EDITOR && UNITY_WSA && (!ENABLE_IL2CPP && NET_STANDARD_2_0)
             object returnValue = null;
             CoreApplicationView newView = CoreApplication.CreateNewView();
             int newViewId = 0;