Fixing build issues related to different .NET versions in Unity. (#152)

Added a new build configuration for UnityEditor binaries to support both .NET 4.6 and .NET 3.5 compatibility levels. General cleanup of asset generation/copying.
2017-11-28 14:32:58 -08:00 · 2017-11-28 14:32:58 -08:00 · 7f3149d161
--- a/.gitignore
+++ b/.gitignore
@ -5,7 +5,6 @@
 /UWP/
 /Assets/AssetStoreTools*

-/Assets/Plugins/*
 Build/nuget.exe
 /CSharpSource/Plugins/
 /CppSource/Build/Microsoft.Xbox.Services.140.UWP.C/packages/
@ -52,14 +51,22 @@ sysinfo.txt
 # Builds
 *.apk
 *.unitypackage
+*.unitypackage.meta
 BuildPackage.log

 # We only want the .meta files for the libs which define which builds to include them in.
-/Assets/Xbox Live/Libs/
+/Assets/Xbox Live/Libs/*
 !/Assets/Xbox Live/Libs/*.meta
 !/Assets/Xbox Live/Libs/**/*.dll.meta
+/Assets/Plugins/*
+!/Assets/Plugins/*.meta
+!/Assets/Plugins/**/*.dll.meta
+

 # Ignore any configuration files created when testing stuff.
 /XboxServices.config
 /Assets/WSATestCertificate.pfx*
 /*_StoreKey.pfx
+
+/UnityPackageManager/
+/Assets/Xbox Live/Readme.txt.meta
--- a/Assets/Plugins.meta
+++ b/Assets/Plugins.meta
@ -1,9 +1,10 @@
 fileFormatVersion: 2
-guid: 011ccab3a4949a6498ac80a7bf5a05f8
+guid: 99938a7d4b76a1944be09c79c6244017
 folderAsset: yes
-timeCreated: 1500420550
+timeCreated: 1511806680
 licenseType: Free
 DefaultImporter:
+  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/Plugins/ARM.meta
+++ b/Assets/Plugins/ARM.meta
@ -1,9 +1,10 @@
 fileFormatVersion: 2
-guid: 516258369fab500409b2635579a96abb
+guid: f0cf78a2687926b479deb94810f8f50a
 folderAsset: yes
-timeCreated: 1486086551
+timeCreated: 1511807222
 licenseType: Free
 DefaultImporter:
+  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/Plugins/ARM/Microsoft.Xbox.Services.140.UWP.C.dll.meta
+++ b/Assets/Plugins/ARM/Microsoft.Xbox.Services.140.UWP.C.dll.meta
@ -0,0 +1,134 @@
+fileFormatVersion: 2
+guid: 314720312fa1fd64dbfc2edcce192344
+timeCreated: 1511831675
+licenseType: Free
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 1
+        Exclude Linux: 0
+        Exclude Linux64: 0
+        Exclude LinuxUniversal: 0
+        Exclude OSXIntel: 0
+        Exclude OSXIntel64: 0
+        Exclude OSXUniversal: 0
+        Exclude Win: 0
+        Exclude Win64: 0
+        Exclude WindowsStoreApps: 0
+        Exclude iOS: 1
+        Exclude tvOS: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 0
+      settings:
+        CPU: ARMv7
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 1
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 1
+      settings:
+        CPU: x86_64
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Standalone: OSXIntel
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: OSXIntel64
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Standalone: Win
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 1
+      settings:
+        CPU: ARM
+        DontProcess: False
+        PlaceholderPath: 
+        SDK: AnySDK
+        ScriptingBackend: AnyScriptingBackend
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 0
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
+  - first:
+      tvOS: tvOS
+    second:
+      enabled: 0
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Plugins/ARM/Microsoft.Xbox.Services.140.UWP.C.pdb.meta
+++ b/Assets/Plugins/ARM/Microsoft.Xbox.Services.140.UWP.C.pdb.meta
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 8127ac79e179daa47bfe896252890deb
+timeCreated: 1511831675
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Plugins/x64.meta
+++ b/Assets/Plugins/x64.meta
@ -1,9 +1,10 @@
 fileFormatVersion: 2
-guid: bfafaee7d41f2ba44822171eee1b2cc3
+guid: 16eaf07a02d7c09498039807bbe67603
 folderAsset: yes
-timeCreated: 1500420550
+timeCreated: 1511807222
 licenseType: Free
 DefaultImporter:
+  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/Plugins/x64/Microsoft.Xbox.Services.140.UWP.C.dll.meta
+++ b/Assets/Plugins/x64/Microsoft.Xbox.Services.140.UWP.C.dll.meta
@ -1,133 +1,136 @@
 fileFormatVersion: 2
-guid: 8f900ed0d95716443a1aa846d51fc596
-timeCreated: 1500420571
+guid: e9fdc25f2eac6fe42a6a7b12f382bb7e
+timeCreated: 1511831675
 licenseType: Free
 PluginImporter:
+  externalObjects: {}
  serializedVersion: 2
  iconMap: {}
  executionOrder: {}
  isPreloaded: 0
  isOverridable: 0
  platformData:
-    data:
-      first:
-        '': Any
-      second:
-        enabled: 0
-        settings:
-          Exclude Editor: 1
-          Exclude Linux: 0
-          Exclude Linux64: 0
-          Exclude LinuxUniversal: 0
-          Exclude OSXIntel: 0
-          Exclude OSXIntel64: 0
-          Exclude OSXUniversal: 0
-          Exclude Win: 0
-          Exclude Win64: 0
-          Exclude WindowsStoreApps: 0
-    data:
-      first:
-        '': Editor
-      second:
-        enabled: 0
-        settings:
-          CPU: AnyCPU
-          OS: AnyOS
-    data:
-      first:
-        Any: 
-      second:
-        enabled: 0
-        settings: {}
-    data:
-      first:
-        Editor: Editor
-      second:
-        enabled: 0
-        settings:
-          CPU: x86_64
-          DefaultValueInitialized: true
-    data:
-      first:
-        Facebook: Win
-      second:
-        enabled: 0
-        settings:
-          CPU: None
-    data:
-      first:
-        Facebook: Win64
-      second:
-        enabled: 1
-        settings:
-          CPU: AnyCPU
-    data:
-      first:
-        Standalone: Linux
-      second:
-        enabled: 1
-        settings:
-          CPU: None
-    data:
-      first:
-        Standalone: Linux64
-      second:
-        enabled: 1
-        settings:
-          CPU: x86_64
-    data:
-      first:
-        Standalone: LinuxUniversal
-      second:
-        enabled: 1
-        settings:
-          CPU: x86_64
-    data:
-      first:
-        Standalone: OSXIntel
-      second:
-        enabled: 1
-        settings:
-          CPU: None
-    data:
-      first:
-        Standalone: OSXIntel64
-      second:
-        enabled: 1
-        settings:
-          CPU: AnyCPU
-    data:
-      first:
-        Standalone: OSXUniversal
-      second:
-        enabled: 1
-        settings:
-          CPU: x86_64
-    data:
-      first:
-        Standalone: Win
-      second:
-        enabled: 1
-        settings:
-          CPU: None
-    data:
-      first:
-        Standalone: Win64
-      second:
-        enabled: 1
-        settings:
-          CPU: AnyCPU
-    data:
-      first:
-        Windows Store Apps: WindowsStoreApps
-      second:
-        enabled: 1
-        settings:
-          CPU: X64
-          DontProcess: False
-          PlaceholderPath: 
-          SDK: AnySDK
-          ScriptingBackend: AnyScriptingBackend
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 1
+        Exclude Linux: 0
+        Exclude Linux64: 0
+        Exclude LinuxUniversal: 0
+        Exclude OSXIntel: 0
+        Exclude OSXIntel64: 0
+        Exclude OSXUniversal: 0
+        Exclude Win: 0
+        Exclude Win64: 0
+        Exclude WindowsStoreApps: 0
+        Exclude iOS: 1
+        Exclude tvOS: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 0
+      settings:
+        CPU: ARMv7
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        CPU: x86_64
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 1
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 1
+      settings:
+        CPU: x86_64
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 1
+      settings:
+        CPU: x86_64
+  - first:
+      Standalone: OSXIntel
+    second:
+      enabled: 1
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXIntel64
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 1
+      settings:
+        CPU: x86_64
+  - first:
+      Standalone: Win
+    second:
+      enabled: 1
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 1
+      settings:
+        CPU: X64
+        DontProcess: False
+        PlaceholderPath: 
+        SDK: AnySDK
+        ScriptingBackend: AnyScriptingBackend
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 0
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
+  - first:
+      tvOS: tvOS
+    second:
+      enabled: 0
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/Plugins/x64/Microsoft.Xbox.Services.140.UWP.C.pdb.meta
+++ b/Assets/Plugins/x64/Microsoft.Xbox.Services.140.UWP.C.pdb.meta
@ -1,8 +1,9 @@
 fileFormatVersion: 2
-guid: 9f19dcc8e72a02a4494953e4b1e87ce6
-timeCreated: 1500420551
+guid: 019e5d7cbf04c034eabfe73773e643fc
+timeCreated: 1511831675
 licenseType: Free
 DefaultImporter:
+  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/Plugins/x86.meta
+++ b/Assets/Plugins/x86.meta
@ -1,9 +1,10 @@
 fileFormatVersion: 2
-guid: ea0b0caaa9f4fc740890db08660f701f
+guid: 27c5d496a36c8334997c0fd55ed6cea0
 folderAsset: yes
-timeCreated: 1500420550
+timeCreated: 1511807222
 licenseType: Free
 DefaultImporter:
+  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/Plugins/x86/Microsoft.Xbox.Services.140.UWP.C.dll.meta
+++ b/Assets/Plugins/x86/Microsoft.Xbox.Services.140.UWP.C.dll.meta
@ -1,133 +1,136 @@
 fileFormatVersion: 2
-guid: 2ca75a83ea88ec145a72ba7cd8e152a5
-timeCreated: 1500420570
+guid: c4ad22aa16b351043a78fa99f6c6b162
+timeCreated: 1511807224
 licenseType: Free
 PluginImporter:
+  externalObjects: {}
  serializedVersion: 2
  iconMap: {}
  executionOrder: {}
  isPreloaded: 0
  isOverridable: 0
  platformData:
-    data:
-      first:
-        '': Any
-      second:
-        enabled: 0
-        settings:
-          Exclude Editor: 1
-          Exclude Linux: 0
-          Exclude Linux64: 0
-          Exclude LinuxUniversal: 0
-          Exclude OSXIntel: 0
-          Exclude OSXIntel64: 0
-          Exclude OSXUniversal: 0
-          Exclude Win: 0
-          Exclude Win64: 0
-          Exclude WindowsStoreApps: 0
-    data:
-      first:
-        '': Editor
-      second:
-        enabled: 0
-        settings:
-          CPU: AnyCPU
-          OS: AnyOS
-    data:
-      first:
-        Any: 
-      second:
-        enabled: 0
-        settings: {}
-    data:
-      first:
-        Editor: Editor
-      second:
-        enabled: 0
-        settings:
-          CPU: x86
-          DefaultValueInitialized: true
-    data:
-      first:
-        Facebook: Win
-      second:
-        enabled: 1
-        settings:
-          CPU: AnyCPU
-    data:
-      first:
-        Facebook: Win64
-      second:
-        enabled: 0
-        settings:
-          CPU: None
-    data:
-      first:
-        Standalone: Linux
-      second:
-        enabled: 1
-        settings:
-          CPU: x86
-    data:
-      first:
-        Standalone: Linux64
-      second:
-        enabled: 1
-        settings:
-          CPU: None
-    data:
-      first:
-        Standalone: LinuxUniversal
-      second:
-        enabled: 1
-        settings:
-          CPU: x86
-    data:
-      first:
-        Standalone: OSXIntel
-      second:
-        enabled: 1
-        settings:
-          CPU: AnyCPU
-    data:
-      first:
-        Standalone: OSXIntel64
-      second:
-        enabled: 1
-        settings:
-          CPU: None
-    data:
-      first:
-        Standalone: OSXUniversal
-      second:
-        enabled: 1
-        settings:
-          CPU: x86
-    data:
-      first:
-        Standalone: Win
-      second:
-        enabled: 1
-        settings:
-          CPU: AnyCPU
-    data:
-      first:
-        Standalone: Win64
-      second:
-        enabled: 1
-        settings:
-          CPU: None
-    data:
-      first:
-        Windows Store Apps: WindowsStoreApps
-      second:
-        enabled: 1
-        settings:
-          CPU: X86
-          DontProcess: False
-          PlaceholderPath: 
-          SDK: AnySDK
-          ScriptingBackend: AnyScriptingBackend
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 1
+        Exclude Linux: 0
+        Exclude Linux64: 0
+        Exclude LinuxUniversal: 0
+        Exclude OSXIntel: 0
+        Exclude OSXIntel64: 0
+        Exclude OSXUniversal: 0
+        Exclude Win: 0
+        Exclude Win64: 0
+        Exclude WindowsStoreApps: 0
+        Exclude iOS: 1
+        Exclude tvOS: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 1
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 1
+      settings:
+        CPU: None
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 1
+      settings:
+        CPU: x86
+  - first:
+      Standalone: OSXIntel
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: OSXIntel64
+    second:
+      enabled: 1
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 1
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 1
+      settings:
+        CPU: None
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 1
+      settings:
+        CPU: X86
+        DontProcess: False
+        PlaceholderPath: 
+        SDK: AnySDK
+        ScriptingBackend: AnyScriptingBackend
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 0
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
+  - first:
+      tvOS: tvOS
+    second:
+      enabled: 0
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/Plugins/x86/Microsoft.Xbox.Services.140.UWP.C.pdb.meta
+++ b/Assets/Plugins/x86/Microsoft.Xbox.Services.140.UWP.C.pdb.meta
@ -1,8 +1,9 @@
 fileFormatVersion: 2
-guid: 2e271a50e0f990e4ba4e40f9eec2d4c4
-timeCreated: 1500420550
+guid: e19fc16e89887884aaeec7d1ae0fd78d
+timeCreated: 1511807223
 licenseType: Free
 DefaultImporter:
+  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Live/Examples/MultiUserExample.meta
+++ b/Live/Examples/MultiUserExample.meta
@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: a071a0fd06539b74ca577461c85790d4
+folderAsset: yes
+timeCreated: 1511217718
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Live/GameSave/README.txt.meta
+++ b/Live/GameSave/README.txt.meta
@ -1,8 +1,9 @@
 fileFormatVersion: 2
-guid: 4f1b3759175f7dd459c93787f4b211b5
-timeCreated: 1497557500
+guid: 231cf689a7d4d494dbac29a66caadb4e
+timeCreated: 1511906396
 licenseType: Free
 TextScriptImporter:
+  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Live/Libs/UWP/Microsoft.Xbox.Services.UWP.CSharp.dll.meta
+++ b/Live/Libs/UWP/Microsoft.Xbox.Services.UWP.CSharp.dll.meta
@ -1,17 +1,21 @@
 fileFormatVersion: 2
-guid: aec6265fb676f804ba0cabb5a6ff795f
-timeCreated: 1486085676
+guid: 3002820a4bfda064b991742838adb390
+timeCreated: 1511810314
 licenseType: Free
 PluginImporter:
-  serializedVersion: 1
+  externalObjects: {}
+  serializedVersion: 2
  iconMap: {}
  executionOrder: {}
  isPreloaded: 0
  isOverridable: 0
  platformData:
-    Any:
+  - first:
+      '': Any
+    second:
      enabled: 0
      settings:
+        Exclude Android: 1
        Exclude Editor: 1
        Exclude Linux: 0
        Exclude Linux64: 0
@ -22,45 +26,88 @@ PluginImporter:
        Exclude Win: 0
        Exclude Win64: 0
        Exclude WindowsStoreApps: 0
-    Editor:
+        Exclude iOS: 1
+        Exclude tvOS: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 0
+      settings:
+        CPU: ARMv7
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
      enabled: 0
      settings:
        CPU: AnyCPU
        DefaultValueInitialized: true
        OS: AnyOS
-    Linux:
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Linux
+    second:
      enabled: 1
      settings:
        CPU: x86
-    Linux64:
+  - first:
+      Standalone: Linux64
+    second:
      enabled: 1
      settings:
        CPU: x86_64
-    LinuxUniversal:
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Standalone: OSXIntel
+    second:
      enabled: 1
      settings:
        CPU: AnyCPU
-    OSXIntel:
+  - first:
+      Standalone: OSXIntel64
+    second:
      enabled: 1
      settings:
        CPU: AnyCPU
-    OSXIntel64:
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Standalone: Win
+    second:
      enabled: 1
      settings:
        CPU: AnyCPU
-    OSXUniversal:
+  - first:
+      Standalone: Win64
+    second:
      enabled: 1
      settings:
        CPU: AnyCPU
-    Win:
-      enabled: 1
-      settings:
-        CPU: AnyCPU
-    Win64:
-      enabled: 1
-      settings:
-        CPU: AnyCPU
-    WindowsStoreApps:
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
      enabled: 1
      settings:
        CPU: AnyCPU
@ -68,6 +115,20 @@ PluginImporter:
        PlaceholderPath: 
        SDK: AnySDK
        ScriptingBackend: AnyScriptingBackend
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 0
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
+  - first:
+      tvOS: tvOS
+    second:
+      enabled: 0
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Live/Libs/UWP/Microsoft.Xbox.Services.UWP.CSharp.pdb.meta
+++ b/Live/Libs/UWP/Microsoft.Xbox.Services.UWP.CSharp.pdb.meta
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 8ed4900b72921be4086776c2755960ec
+timeCreated: 1511810314
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Live/Libs/UWP/Newtonsoft.Json.dll.meta
+++ b/Live/Libs/UWP/Newtonsoft.Json.dll.meta
@ -1,17 +1,21 @@
 fileFormatVersion: 2
-guid: 55480ceb2b651fc499951f46d4a1ba68
-timeCreated: 1487186589
+guid: 83ffbc511b13b7d448089fbaa959e296
+timeCreated: 1511810315
 licenseType: Free
 PluginImporter:
-  serializedVersion: 1
+  externalObjects: {}
+  serializedVersion: 2
  iconMap: {}
  executionOrder: {}
  isPreloaded: 0
  isOverridable: 0
  platformData:
-    Any:
+  - first:
+      '': Any
+    second:
      enabled: 0
      settings:
+        Exclude Android: 1
        Exclude Editor: 1
        Exclude Linux: 0
        Exclude Linux64: 0
@ -22,45 +26,88 @@ PluginImporter:
        Exclude Win: 0
        Exclude Win64: 0
        Exclude WindowsStoreApps: 0
-    Editor:
+        Exclude iOS: 1
+        Exclude tvOS: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 0
+      settings:
+        CPU: ARMv7
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
      enabled: 0
      settings:
        CPU: AnyCPU
        DefaultValueInitialized: true
        OS: AnyOS
-    Linux:
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Linux
+    second:
      enabled: 1
      settings:
        CPU: x86
-    Linux64:
+  - first:
+      Standalone: Linux64
+    second:
      enabled: 1
      settings:
        CPU: x86_64
-    LinuxUniversal:
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Standalone: OSXIntel
+    second:
      enabled: 1
      settings:
        CPU: AnyCPU
-    OSXIntel:
+  - first:
+      Standalone: OSXIntel64
+    second:
      enabled: 1
      settings:
        CPU: AnyCPU
-    OSXIntel64:
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Standalone: Win
+    second:
      enabled: 1
      settings:
        CPU: AnyCPU
-    OSXUniversal:
+  - first:
+      Standalone: Win64
+    second:
      enabled: 1
      settings:
        CPU: AnyCPU
-    Win:
-      enabled: 1
-      settings:
-        CPU: AnyCPU
-    Win64:
-      enabled: 1
-      settings:
-        CPU: AnyCPU
-    WindowsStoreApps:
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
      enabled: 1
      settings:
        CPU: AnyCPU
@ -68,6 +115,20 @@ PluginImporter:
        PlaceholderPath: 
        SDK: AnySDK
        ScriptingBackend: AnyScriptingBackend
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 0
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
+  - first:
+      tvOS: tvOS
+    second:
+      enabled: 0
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Live/Libs/Unity/Microsoft.Xbox.Services.UnityEditor.CSharp.dll.meta
+++ b/Live/Libs/Unity/Microsoft.Xbox.Services.UnityEditor.CSharp.dll.meta
@ -1,67 +0,0 @@
-fileFormatVersion: 2
-guid: ba47ddefe6f945443be63f281ece18e5
-timeCreated: 1486086552
-licenseType: Free
-PluginImporter:
-  serializedVersion: 1
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  isOverridable: 0
-  platformData:
-    Any:
-      enabled: 0
-      settings:
-        Exclude Editor: 0
-        Exclude Linux: 1
-        Exclude Linux64: 1
-        Exclude LinuxUniversal: 1
-        Exclude OSXIntel: 1
-        Exclude OSXIntel64: 1
-        Exclude OSXUniversal: 1
-        Exclude Win: 1
-        Exclude Win64: 1
-        Exclude WindowsStoreApps: 1
-    Editor:
-      enabled: 1
-      settings:
-        DefaultValueInitialized: true
-    Linux:
-      enabled: 0
-      settings:
-        CPU: None
-    Linux64:
-      enabled: 0
-      settings:
-        CPU: None
-    LinuxUniversal:
-      enabled: 0
-      settings:
-        CPU: None
-    OSXIntel:
-      enabled: 0
-      settings:
-        CPU: None
-    OSXIntel64:
-      enabled: 0
-      settings:
-        CPU: None
-    OSXUniversal:
-      enabled: 0
-      settings:
-        CPU: None
-    Win:
-      enabled: 0
-      settings:
-        CPU: None
-    Win64:
-      enabled: 0
-      settings:
-        CPU: None
-    WindowsStoreApps:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Live/Libs/Unity/Newtonsoft.Json.dll.meta
+++ b/Live/Libs/Unity/Newtonsoft.Json.dll.meta
@ -1,67 +0,0 @@
-fileFormatVersion: 2
-guid: acd4be0bcf3bf6f4eaf955b07444cde9
-timeCreated: 1486086552
-licenseType: Free
-PluginImporter:
-  serializedVersion: 1
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  isOverridable: 0
-  platformData:
-    Any:
-      enabled: 0
-      settings:
-        Exclude Editor: 0
-        Exclude Linux: 1
-        Exclude Linux64: 1
-        Exclude LinuxUniversal: 1
-        Exclude OSXIntel: 1
-        Exclude OSXIntel64: 1
-        Exclude OSXUniversal: 1
-        Exclude Win: 1
-        Exclude Win64: 1
-        Exclude WindowsStoreApps: 1
-    Editor:
-      enabled: 1
-      settings:
-        DefaultValueInitialized: true
-    Linux:
-      enabled: 0
-      settings:
-        CPU: None
-    Linux64:
-      enabled: 0
-      settings:
-        CPU: None
-    LinuxUniversal:
-      enabled: 0
-      settings:
-        CPU: None
-    OSXIntel:
-      enabled: 0
-      settings:
-        CPU: None
-    OSXIntel64:
-      enabled: 0
-      settings:
-        CPU: None
-    OSXUniversal:
-      enabled: 0
-      settings:
-        CPU: None
-    Win:
-      enabled: 0
-      settings:
-        CPU: None
-    Win64:
-      enabled: 0
-      settings:
-        CPU: None
-    WindowsStoreApps:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Live/Libs/Unity/Unity.Compat.dll.meta
+++ b/Live/Libs/Unity/Unity.Compat.dll.meta
@ -1,67 +0,0 @@
-fileFormatVersion: 2
-guid: 894e742191d4014408731cf33d4efe61
-timeCreated: 1486086551
-licenseType: Free
-PluginImporter:
-  serializedVersion: 1
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  isOverridable: 0
-  platformData:
-    Any:
-      enabled: 0
-      settings:
-        Exclude Editor: 0
-        Exclude Linux: 1
-        Exclude Linux64: 1
-        Exclude LinuxUniversal: 1
-        Exclude OSXIntel: 1
-        Exclude OSXIntel64: 1
-        Exclude OSXUniversal: 1
-        Exclude Win: 1
-        Exclude Win64: 1
-        Exclude WindowsStoreApps: 1
-    Editor:
-      enabled: 1
-      settings:
-        DefaultValueInitialized: true
-    Linux:
-      enabled: 0
-      settings:
-        CPU: None
-    Linux64:
-      enabled: 0
-      settings:
-        CPU: None
-    LinuxUniversal:
-      enabled: 0
-      settings:
-        CPU: None
-    OSXIntel:
-      enabled: 0
-      settings:
-        CPU: None
-    OSXIntel64:
-      enabled: 0
-      settings:
-        CPU: None
-    OSXUniversal:
-      enabled: 0
-      settings:
-        CPU: None
-    Win:
-      enabled: 0
-      settings:
-        CPU: None
-    Win64:
-      enabled: 0
-      settings:
-        CPU: None
-    WindowsStoreApps:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Live/Libs/Unity/Unity.Tasks.dll.meta
+++ b/Live/Libs/Unity/Unity.Tasks.dll.meta
@ -1,67 +0,0 @@
-fileFormatVersion: 2
-guid: f9ec7733ddac9f64ab2734dcd45d3ad2
-timeCreated: 1486086552
-licenseType: Free
-PluginImporter:
-  serializedVersion: 1
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  isOverridable: 0
-  platformData:
-    Any:
-      enabled: 0
-      settings:
-        Exclude Editor: 0
-        Exclude Linux: 1
-        Exclude Linux64: 1
-        Exclude LinuxUniversal: 1
-        Exclude OSXIntel: 1
-        Exclude OSXIntel64: 1
-        Exclude OSXUniversal: 1
-        Exclude Win: 1
-        Exclude Win64: 1
-        Exclude WindowsStoreApps: 1
-    Editor:
-      enabled: 1
-      settings:
-        DefaultValueInitialized: true
-    Linux:
-      enabled: 0
-      settings:
-        CPU: None
-    Linux64:
-      enabled: 0
-      settings:
-        CPU: None
-    LinuxUniversal:
-      enabled: 0
-      settings:
-        CPU: None
-    OSXIntel:
-      enabled: 0
-      settings:
-        CPU: None
-    OSXIntel64:
-      enabled: 0
-      settings:
-        CPU: None
-    OSXUniversal:
-      enabled: 0
-      settings:
-        CPU: None
-    Win:
-      enabled: 0
-      settings:
-        CPU: None
-    Win64:
-      enabled: 0
-      settings:
-        CPU: None
-    WindowsStoreApps:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Live/Libs/UnityEditor.meta
+++ b/Live/Libs/UnityEditor.meta
@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: acda2589ad5eb1c418d23e7c56498482
+folderAsset: yes
+timeCreated: 1511394481
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Live/Libs/UnityEditor/NET35.meta
+++ b/Live/Libs/UnityEditor/NET35.meta
@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 523ef8b8f77971844b70c4e3d4b04855
+folderAsset: yes
+timeCreated: 1511394482
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Live/Libs/UnityEditor/NET35/Microsoft.Xbox.Services.UnityEditor.CSharp.dll.meta
+++ b/Live/Libs/UnityEditor/NET35/Microsoft.Xbox.Services.UnityEditor.CSharp.dll.meta
@ -0,0 +1,136 @@
+fileFormatVersion: 2
+guid: c7d9af2b74acfff4695d488bdcb3649e
+timeCreated: 1511812304
+licenseType: Free
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 0
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXIntel: 1
+        Exclude OSXIntel64: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude WindowsStoreApps: 1
+        Exclude iOS: 1
+        Exclude tvOS: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 0
+      settings:
+        CPU: ARMv7
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: x86_64
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXIntel
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: OSXIntel64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DontProcess: False
+        PlaceholderPath: 
+        SDK: AnySDK
+        ScriptingBackend: AnyScriptingBackend
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 0
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
+  - first:
+      tvOS: tvOS
+    second:
+      enabled: 0
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Live/Libs/UnityEditor/NET35/Newtonsoft.Json.dll.meta
+++ b/Live/Libs/UnityEditor/NET35/Newtonsoft.Json.dll.meta
@ -0,0 +1,136 @@
+fileFormatVersion: 2
+guid: 544d71426e9f3b944bc821fb686444ff
+timeCreated: 1511812706
+licenseType: Free
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 0
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXIntel: 1
+        Exclude OSXIntel64: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude WindowsStoreApps: 1
+        Exclude iOS: 1
+        Exclude tvOS: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 0
+      settings:
+        CPU: ARMv7
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: x86_64
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXIntel
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: OSXIntel64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DontProcess: False
+        PlaceholderPath: 
+        SDK: AnySDK
+        ScriptingBackend: AnyScriptingBackend
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 0
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
+  - first:
+      tvOS: tvOS
+    second:
+      enabled: 0
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Live/Libs/UnityEditor/NET35/Unity.Compat.dll.meta
+++ b/Live/Libs/UnityEditor/NET35/Unity.Compat.dll.meta
@ -0,0 +1,136 @@
+fileFormatVersion: 2
+guid: eb8bd1bb2585ba54eb39fcf39d286d0b
+timeCreated: 1511394488
+licenseType: Free
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 0
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXIntel: 1
+        Exclude OSXIntel64: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude WindowsStoreApps: 1
+        Exclude iOS: 1
+        Exclude tvOS: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 0
+      settings:
+        CPU: ARMv7
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXIntel
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXIntel64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DontProcess: False
+        PlaceholderPath: 
+        SDK: AnySDK
+        ScriptingBackend: AnyScriptingBackend
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 0
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
+  - first:
+      tvOS: tvOS
+    second:
+      enabled: 0
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Live/Libs/UnityEditor/NET35/Unity.Tasks.dll.meta
+++ b/Live/Libs/UnityEditor/NET35/Unity.Tasks.dll.meta
@ -0,0 +1,136 @@
+fileFormatVersion: 2
+guid: ba68b36fdf92a1c46bf6ddc55baf0ddd
+timeCreated: 1511394487
+licenseType: Free
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 0
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXIntel: 1
+        Exclude OSXIntel64: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude WindowsStoreApps: 1
+        Exclude iOS: 1
+        Exclude tvOS: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 0
+      settings:
+        CPU: ARMv7
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: x86_64
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXIntel
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: OSXIntel64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DontProcess: False
+        PlaceholderPath: 
+        SDK: AnySDK
+        ScriptingBackend: AnyScriptingBackend
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 0
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
+  - first:
+      tvOS: tvOS
+    second:
+      enabled: 0
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Live/Libs/UnityEditor/NET46.meta
+++ b/Live/Libs/UnityEditor/NET46.meta
@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 01c0cc0569bf19b4dbb120b777112e2a
+folderAsset: yes
+timeCreated: 1511394481
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Live/Libs/UnityEditor/NET46/Microsoft.Xbox.Services.UnityEditor.CSharp.dll.meta
+++ b/Live/Libs/UnityEditor/NET46/Microsoft.Xbox.Services.UnityEditor.CSharp.dll.meta
@ -0,0 +1,136 @@
+fileFormatVersion: 2
+guid: 5b0265f03d7136145a8bb44ad38dac4f
+timeCreated: 1511812307
+licenseType: Free
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXIntel: 1
+        Exclude OSXIntel64: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude WindowsStoreApps: 1
+        Exclude iOS: 1
+        Exclude tvOS: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 0
+      settings:
+        CPU: ARMv7
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: x86_64
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXIntel
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: OSXIntel64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DontProcess: False
+        PlaceholderPath: 
+        SDK: AnySDK
+        ScriptingBackend: AnyScriptingBackend
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 0
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
+  - first:
+      tvOS: tvOS
+    second:
+      enabled: 0
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Live/Libs/UnityEditor/NET46/Newtonsoft.Json.dll.meta
+++ b/Live/Libs/UnityEditor/NET46/Newtonsoft.Json.dll.meta
@ -0,0 +1,136 @@
+fileFormatVersion: 2
+guid: 2eec30c7dce605248a163371546a65b8
+timeCreated: 1511394491
+licenseType: Free
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXIntel: 1
+        Exclude OSXIntel64: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude WindowsStoreApps: 1
+        Exclude iOS: 1
+        Exclude tvOS: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 0
+      settings:
+        CPU: ARMv7
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: x86_64
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXIntel
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: OSXIntel64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DontProcess: False
+        PlaceholderPath: 
+        SDK: AnySDK
+        ScriptingBackend: AnyScriptingBackend
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 0
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
+  - first:
+      tvOS: tvOS
+    second:
+      enabled: 0
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Build/InstallXboxLiveSdk.ps1
+++ b/Build/InstallXboxLiveSdk.ps1
@ -88,6 +88,19 @@ elseif($FromSource)
      Write-Host "SDK Build (Platform:x86) Succeeded."
    }
    
+    Write-Host "Building (Platform:x86, configuration .NET35) Xbox Live SDK... "
+    $buildResult = Invoke-MsBuild $sdkSln -BuildLogDirectoryPath $PSScriptRoot -ShowBuildOutputInCurrentWindow -Params "/property:Platform=x86 /property:Configuration=DebugNET35"
+    
+    if(!$buildResult.BuildSucceeded)
+    {
+       Write-Host "Failed.  See build logs for details."
+       Write-Host "Build Log: $($buildResult.BuildLogFilePath)"
+       Write-Host "Error Log: $($buildResult.BuildErrorsLogFilePath)"
+    }
+    else {
+      Write-Host "SDK Build (Platform:x86 configuration .NET35) Succeeded."
+    }
+    
    Write-Host "Building (Platform:x64) Xbox Live SDK... "
    $buildResult = Invoke-MsBuild $sdkSln -BuildLogDirectoryPath $PSScriptRoot -ShowBuildOutputInCurrentWindow -Params "/property:Platform=x64"
    
@ -100,5 +113,33 @@ elseif($FromSource)
    else {
      Write-Host "SDK Build (Platform:x64) Succeeded."
    }
+    
+    Write-Host "Building (Platform:x64, configuration .NET35) Xbox Live SDK... "
+    $buildResult = Invoke-MsBuild $sdkSln -BuildLogDirectoryPath $PSScriptRoot -ShowBuildOutputInCurrentWindow -Params "/property:Platform=x64 /property:Configuration=DebugNET35"
+    
+    if(!$buildResult.BuildSucceeded)
+    {
+       Write-Host "Failed.  See build logs for details."
+       Write-Host "Build Log: $($buildResult.BuildLogFilePath)"
+       Write-Host "Error Log: $($buildResult.BuildErrorsLogFilePath)"
+    }
+    else {
+      Write-Host "SDK Build (Platform:x64 configuration .NET35) Succeeded."
+    }
+    
+    Write-Host "Building (Platform:ARM) Xbox Live SDK... "
+    $buildResult = Invoke-MsBuild $sdkSln -BuildLogDirectoryPath $PSScriptRoot -ShowBuildOutputInCurrentWindow -Params "/property:Platform=ARM"
+    
+    if(!$buildResult.BuildSucceeded)
+    {
+       Write-Host "Failed.  See build logs for details."
+       Write-Host "Build Log: $($buildResult.BuildLogFilePath)"
+       Write-Host "Error Log: $($buildResult.BuildErrorsLogFilePath)"
+    }
+    else {
+      Write-Host "SDK Build (Platform:ARM) Succeeded."
+    }
  }
-}
+}
+
+Write-Host "Done installing XboxLive SDK."
--- a/CSharpSource/Build/props/buildoutput.props
+++ b/CSharpSource/Build/props/buildoutput.props
@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <BaseOutputPath>$(BuildRoot)\binaries\</BaseOutputPath>
-    <BasePluginLayoutPath>$(BaseOutputPath)Layout\$(Configuration)\</BasePluginLayoutPath>
+    <AssetLibsBasePath>$(BuildRoot)\..\Assets\Xbox Live\Libs\</AssetLibsBasePath>
    <OutputPath>$(BaseOutputPath)$(Platform)\$(Configuration)\</OutputPath>
    <OutDir>$(OutputPath)</OutDir>
    <IntermediateOutputPath>$(BuildRoot)\obj\$(Platform)\$(Configuration)</IntermediateOutputPath>
--- a/CSharpSource/Source/Microsoft.Xbox.Services.CSharp.sln
+++ b/CSharpSource/Source/Microsoft.Xbox.Services.CSharp.sln
@ -35,59 +35,113 @@ Global
 		Debug|ARM = Debug|ARM
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		DebugNET35|ARM = DebugNET35|ARM
+		DebugNET35|x64 = DebugNET35|x64
+		DebugNET35|x86 = DebugNET35|x86
 		Release|ARM = Release|ARM
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
+		ReleaseNET35|ARM = ReleaseNET35|ARM
+		ReleaseNET35|x64 = ReleaseNET35|x64
+		ReleaseNET35|x86 = ReleaseNET35|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.Debug|ARM.Build.0 = Debug|Any CPU
+		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.Debug|ARM.ActiveCfg = Debug|ARM
+		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.Debug|ARM.Build.0 = Debug|ARM
 		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.Debug|x64.ActiveCfg = Debug|x64
 		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.Debug|x64.Build.0 = Debug|x64
 		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.Debug|x86.ActiveCfg = Debug|x86
 		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.Debug|x86.Build.0 = Debug|x86
-		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.Release|ARM.ActiveCfg = Release|Any CPU
-		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.Release|ARM.Build.0 = Release|Any CPU
+		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.DebugNET35|ARM.ActiveCfg = Debug|ARM
+		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.DebugNET35|ARM.Build.0 = Debug|ARM
+		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.DebugNET35|x64.ActiveCfg = Debug|x64
+		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.DebugNET35|x64.Build.0 = Debug|x64
+		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.DebugNET35|x86.ActiveCfg = Debug|x86
+		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.DebugNET35|x86.Build.0 = Debug|x86
+		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.Release|ARM.ActiveCfg = Release|ARM
+		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.Release|ARM.Build.0 = Release|ARM
 		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.Release|x64.ActiveCfg = Release|x64
 		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.Release|x64.Build.0 = Release|x64
 		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.Release|x86.ActiveCfg = Release|x86
 		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.Release|x86.Build.0 = Release|x86
-		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Debug|ARM.Build.0 = Debug|Any CPU
-		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Debug|x64.Build.0 = Debug|Any CPU
-		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Debug|x86.Build.0 = Debug|Any CPU
-		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Release|ARM.ActiveCfg = Release|Any CPU
-		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Release|ARM.Build.0 = Release|Any CPU
-		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Release|x64.ActiveCfg = Release|Any CPU
-		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Release|x64.Build.0 = Release|Any CPU
-		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Release|x86.ActiveCfg = Release|Any CPU
-		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Release|x86.Build.0 = Release|Any CPU
+		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.ReleaseNET35|ARM.ActiveCfg = Release|ARM
+		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.ReleaseNET35|ARM.Build.0 = Release|ARM
+		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.ReleaseNET35|x64.ActiveCfg = Release|x64
+		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.ReleaseNET35|x64.Build.0 = Release|x64
+		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.ReleaseNET35|x86.ActiveCfg = Release|x86
+		{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}.ReleaseNET35|x86.Build.0 = Release|x86
+		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Debug|ARM.ActiveCfg = DebugNET46|Any CPU
+		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Debug|ARM.Build.0 = DebugNET46|Any CPU
+		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Debug|x64.ActiveCfg = DebugNET46|Any CPU
+		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Debug|x64.Build.0 = DebugNET46|Any CPU
+		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Debug|x86.ActiveCfg = DebugNET46|Any CPU
+		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Debug|x86.Build.0 = DebugNET46|Any CPU
+		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.DebugNET35|ARM.ActiveCfg = DebugNET35|Any CPU
+		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.DebugNET35|ARM.Build.0 = DebugNET35|Any CPU
+		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.DebugNET35|x64.ActiveCfg = DebugNET35|Any CPU
+		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.DebugNET35|x64.Build.0 = DebugNET35|Any CPU
+		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.DebugNET35|x86.ActiveCfg = DebugNET35|Any CPU
+		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.DebugNET35|x86.Build.0 = DebugNET35|Any CPU
+		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Release|ARM.ActiveCfg = ReleaseNET46|Any CPU
+		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Release|ARM.Build.0 = ReleaseNET46|Any CPU
+		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Release|x64.ActiveCfg = ReleaseNET46|Any CPU
+		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Release|x64.Build.0 = ReleaseNET46|Any CPU
+		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Release|x86.ActiveCfg = ReleaseNET35|Any CPU
+		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Release|x86.Build.0 = ReleaseNET35|Any CPU
+		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.ReleaseNET35|ARM.ActiveCfg = ReleaseNET35|Any CPU
+		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.ReleaseNET35|ARM.Build.0 = ReleaseNET35|Any CPU
+		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.ReleaseNET35|x64.ActiveCfg = ReleaseNET35|Any CPU
+		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.ReleaseNET35|x64.Build.0 = ReleaseNET35|Any CPU
+		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.ReleaseNET35|x86.ActiveCfg = ReleaseNET35|Any CPU
+		{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.ReleaseNET35|x86.Build.0 = ReleaseNET35|Any CPU
 		{CBD81E44-F37F-47D6-B71B-A43A748AE09C}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{CBD81E44-F37F-47D6-B71B-A43A748AE09C}.Debug|ARM.Build.0 = Debug|Any CPU
 		{CBD81E44-F37F-47D6-B71B-A43A748AE09C}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{CBD81E44-F37F-47D6-B71B-A43A748AE09C}.Debug|x64.Build.0 = Debug|Any CPU
 		{CBD81E44-F37F-47D6-B71B-A43A748AE09C}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{CBD81E44-F37F-47D6-B71B-A43A748AE09C}.Debug|x86.Build.0 = Debug|Any CPU
+		{CBD81E44-F37F-47D6-B71B-A43A748AE09C}.DebugNET35|ARM.ActiveCfg = Debug|Any CPU
+		{CBD81E44-F37F-47D6-B71B-A43A748AE09C}.DebugNET35|ARM.Build.0 = Debug|Any CPU
+		{CBD81E44-F37F-47D6-B71B-A43A748AE09C}.DebugNET35|x64.ActiveCfg = Debug|Any CPU
+		{CBD81E44-F37F-47D6-B71B-A43A748AE09C}.DebugNET35|x64.Build.0 = Debug|Any CPU
+		{CBD81E44-F37F-47D6-B71B-A43A748AE09C}.DebugNET35|x86.ActiveCfg = Debug|Any CPU
+		{CBD81E44-F37F-47D6-B71B-A43A748AE09C}.DebugNET35|x86.Build.0 = Debug|Any CPU
 		{CBD81E44-F37F-47D6-B71B-A43A748AE09C}.Release|ARM.ActiveCfg = Release|Any CPU
 		{CBD81E44-F37F-47D6-B71B-A43A748AE09C}.Release|ARM.Build.0 = Release|Any CPU
 		{CBD81E44-F37F-47D6-B71B-A43A748AE09C}.Release|x64.ActiveCfg = Release|Any CPU
 		{CBD81E44-F37F-47D6-B71B-A43A748AE09C}.Release|x64.Build.0 = Release|Any CPU
 		{CBD81E44-F37F-47D6-B71B-A43A748AE09C}.Release|x86.ActiveCfg = Release|Any CPU
 		{CBD81E44-F37F-47D6-B71B-A43A748AE09C}.Release|x86.Build.0 = Release|Any CPU
+		{CBD81E44-F37F-47D6-B71B-A43A748AE09C}.ReleaseNET35|ARM.ActiveCfg = Release|Any CPU
+		{CBD81E44-F37F-47D6-B71B-A43A748AE09C}.ReleaseNET35|ARM.Build.0 = Release|Any CPU
+		{CBD81E44-F37F-47D6-B71B-A43A748AE09C}.ReleaseNET35|x64.ActiveCfg = Release|Any CPU
+		{CBD81E44-F37F-47D6-B71B-A43A748AE09C}.ReleaseNET35|x64.Build.0 = Release|Any CPU
+		{CBD81E44-F37F-47D6-B71B-A43A748AE09C}.ReleaseNET35|x86.ActiveCfg = Release|Any CPU
+		{CBD81E44-F37F-47D6-B71B-A43A748AE09C}.ReleaseNET35|x86.Build.0 = Release|Any CPU
 		{6A9CEF50-6BEF-4B8A-8DA5-F1FD0C1BA666}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{6A9CEF50-6BEF-4B8A-8DA5-F1FD0C1BA666}.Debug|ARM.Build.0 = Debug|Any CPU
 		{6A9CEF50-6BEF-4B8A-8DA5-F1FD0C1BA666}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{6A9CEF50-6BEF-4B8A-8DA5-F1FD0C1BA666}.Debug|x64.Build.0 = Debug|Any CPU
 		{6A9CEF50-6BEF-4B8A-8DA5-F1FD0C1BA666}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{6A9CEF50-6BEF-4B8A-8DA5-F1FD0C1BA666}.Debug|x86.Build.0 = Debug|Any CPU
+		{6A9CEF50-6BEF-4B8A-8DA5-F1FD0C1BA666}.DebugNET35|ARM.ActiveCfg = Debug|Any CPU
+		{6A9CEF50-6BEF-4B8A-8DA5-F1FD0C1BA666}.DebugNET35|ARM.Build.0 = Debug|Any CPU
+		{6A9CEF50-6BEF-4B8A-8DA5-F1FD0C1BA666}.DebugNET35|x64.ActiveCfg = Debug|Any CPU
+		{6A9CEF50-6BEF-4B8A-8DA5-F1FD0C1BA666}.DebugNET35|x64.Build.0 = Debug|Any CPU
+		{6A9CEF50-6BEF-4B8A-8DA5-F1FD0C1BA666}.DebugNET35|x86.ActiveCfg = Debug|Any CPU
+		{6A9CEF50-6BEF-4B8A-8DA5-F1FD0C1BA666}.DebugNET35|x86.Build.0 = Debug|Any CPU
 		{6A9CEF50-6BEF-4B8A-8DA5-F1FD0C1BA666}.Release|ARM.ActiveCfg = Release|Any CPU
 		{6A9CEF50-6BEF-4B8A-8DA5-F1FD0C1BA666}.Release|ARM.Build.0 = Release|Any CPU
 		{6A9CEF50-6BEF-4B8A-8DA5-F1FD0C1BA666}.Release|x64.ActiveCfg = Release|Any CPU
 		{6A9CEF50-6BEF-4B8A-8DA5-F1FD0C1BA666}.Release|x64.Build.0 = Release|Any CPU
 		{6A9CEF50-6BEF-4B8A-8DA5-F1FD0C1BA666}.Release|x86.ActiveCfg = Release|Any CPU
 		{6A9CEF50-6BEF-4B8A-8DA5-F1FD0C1BA666}.Release|x86.Build.0 = Release|Any CPU
+		{6A9CEF50-6BEF-4B8A-8DA5-F1FD0C1BA666}.ReleaseNET35|ARM.ActiveCfg = Release|Any CPU
+		{6A9CEF50-6BEF-4B8A-8DA5-F1FD0C1BA666}.ReleaseNET35|ARM.Build.0 = Release|Any CPU
+		{6A9CEF50-6BEF-4B8A-8DA5-F1FD0C1BA666}.ReleaseNET35|x64.ActiveCfg = Release|Any CPU
+		{6A9CEF50-6BEF-4B8A-8DA5-F1FD0C1BA666}.ReleaseNET35|x64.Build.0 = Release|Any CPU
+		{6A9CEF50-6BEF-4B8A-8DA5-F1FD0C1BA666}.ReleaseNET35|x86.ActiveCfg = Release|Any CPU
+		{6A9CEF50-6BEF-4B8A-8DA5-F1FD0C1BA666}.ReleaseNET35|x86.Build.0 = Release|Any CPU
 		{4C1806D5-7279-4DFC-8874-13D66D52A31B}.Debug|ARM.ActiveCfg = Debug|ARM
 		{4C1806D5-7279-4DFC-8874-13D66D52A31B}.Debug|ARM.Build.0 = Debug|ARM
 		{4C1806D5-7279-4DFC-8874-13D66D52A31B}.Debug|ARM.Deploy.0 = Debug|ARM
@ -97,33 +151,69 @@ Global
 		{4C1806D5-7279-4DFC-8874-13D66D52A31B}.Debug|x86.ActiveCfg = Debug|x86
 		{4C1806D5-7279-4DFC-8874-13D66D52A31B}.Debug|x86.Build.0 = Debug|x86
 		{4C1806D5-7279-4DFC-8874-13D66D52A31B}.Debug|x86.Deploy.0 = Debug|x86
+		{4C1806D5-7279-4DFC-8874-13D66D52A31B}.DebugNET35|ARM.ActiveCfg = Debug|ARM
+		{4C1806D5-7279-4DFC-8874-13D66D52A31B}.DebugNET35|ARM.Build.0 = Debug|ARM
+		{4C1806D5-7279-4DFC-8874-13D66D52A31B}.DebugNET35|ARM.Deploy.0 = Debug|ARM
+		{4C1806D5-7279-4DFC-8874-13D66D52A31B}.DebugNET35|x64.ActiveCfg = Debug|x64
+		{4C1806D5-7279-4DFC-8874-13D66D52A31B}.DebugNET35|x64.Build.0 = Debug|x64
+		{4C1806D5-7279-4DFC-8874-13D66D52A31B}.DebugNET35|x64.Deploy.0 = Debug|x64
+		{4C1806D5-7279-4DFC-8874-13D66D52A31B}.DebugNET35|x86.ActiveCfg = Debug|x86
+		{4C1806D5-7279-4DFC-8874-13D66D52A31B}.DebugNET35|x86.Build.0 = Debug|x86
+		{4C1806D5-7279-4DFC-8874-13D66D52A31B}.DebugNET35|x86.Deploy.0 = Debug|x86
 		{4C1806D5-7279-4DFC-8874-13D66D52A31B}.Release|ARM.ActiveCfg = Release|ARM
 		{4C1806D5-7279-4DFC-8874-13D66D52A31B}.Release|x64.ActiveCfg = Release|x64
 		{4C1806D5-7279-4DFC-8874-13D66D52A31B}.Release|x86.ActiveCfg = Release|x86
+		{4C1806D5-7279-4DFC-8874-13D66D52A31B}.ReleaseNET35|ARM.ActiveCfg = Release|ARM
+		{4C1806D5-7279-4DFC-8874-13D66D52A31B}.ReleaseNET35|x64.ActiveCfg = Release|x64
+		{4C1806D5-7279-4DFC-8874-13D66D52A31B}.ReleaseNET35|x86.ActiveCfg = Release|x86
 		{8F96710E-5169-4917-8874-7DE248F4D243}.Debug|ARM.ActiveCfg = Debug|ARM
 		{8F96710E-5169-4917-8874-7DE248F4D243}.Debug|ARM.Build.0 = Debug|ARM
 		{8F96710E-5169-4917-8874-7DE248F4D243}.Debug|x64.ActiveCfg = Debug|x64
 		{8F96710E-5169-4917-8874-7DE248F4D243}.Debug|x64.Build.0 = Debug|x64
 		{8F96710E-5169-4917-8874-7DE248F4D243}.Debug|x86.ActiveCfg = Debug|Win32
 		{8F96710E-5169-4917-8874-7DE248F4D243}.Debug|x86.Build.0 = Debug|Win32
+		{8F96710E-5169-4917-8874-7DE248F4D243}.DebugNET35|ARM.ActiveCfg = Debug|ARM
+		{8F96710E-5169-4917-8874-7DE248F4D243}.DebugNET35|ARM.Build.0 = Debug|ARM
+		{8F96710E-5169-4917-8874-7DE248F4D243}.DebugNET35|x64.ActiveCfg = Debug|x64
+		{8F96710E-5169-4917-8874-7DE248F4D243}.DebugNET35|x64.Build.0 = Debug|x64
+		{8F96710E-5169-4917-8874-7DE248F4D243}.DebugNET35|x86.ActiveCfg = Debug|Win32
+		{8F96710E-5169-4917-8874-7DE248F4D243}.DebugNET35|x86.Build.0 = Debug|Win32
 		{8F96710E-5169-4917-8874-7DE248F4D243}.Release|ARM.ActiveCfg = Release|ARM
 		{8F96710E-5169-4917-8874-7DE248F4D243}.Release|ARM.Build.0 = Release|ARM
 		{8F96710E-5169-4917-8874-7DE248F4D243}.Release|x64.ActiveCfg = Release|x64
 		{8F96710E-5169-4917-8874-7DE248F4D243}.Release|x64.Build.0 = Release|x64
 		{8F96710E-5169-4917-8874-7DE248F4D243}.Release|x86.ActiveCfg = Release|Win32
 		{8F96710E-5169-4917-8874-7DE248F4D243}.Release|x86.Build.0 = Release|Win32
+		{8F96710E-5169-4917-8874-7DE248F4D243}.ReleaseNET35|ARM.ActiveCfg = Release|ARM
+		{8F96710E-5169-4917-8874-7DE248F4D243}.ReleaseNET35|ARM.Build.0 = Release|ARM
+		{8F96710E-5169-4917-8874-7DE248F4D243}.ReleaseNET35|x64.ActiveCfg = Release|x64
+		{8F96710E-5169-4917-8874-7DE248F4D243}.ReleaseNET35|x64.Build.0 = Release|x64
+		{8F96710E-5169-4917-8874-7DE248F4D243}.ReleaseNET35|x86.ActiveCfg = Release|Win32
+		{8F96710E-5169-4917-8874-7DE248F4D243}.ReleaseNET35|x86.Build.0 = Release|Win32
 		{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.Debug|ARM.ActiveCfg = Debug|ARM
 		{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.Debug|ARM.Build.0 = Debug|ARM
 		{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.Debug|x64.ActiveCfg = Debug|x64
 		{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.Debug|x64.Build.0 = Debug|x64
 		{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.Debug|x86.ActiveCfg = Debug|Win32
 		{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.Debug|x86.Build.0 = Debug|Win32
+		{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.DebugNET35|ARM.ActiveCfg = Debug|ARM
+		{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.DebugNET35|ARM.Build.0 = Debug|ARM
+		{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.DebugNET35|x64.ActiveCfg = Debug|x64
+		{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.DebugNET35|x64.Build.0 = Debug|x64
+		{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.DebugNET35|x86.ActiveCfg = Debug|Win32
+		{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.DebugNET35|x86.Build.0 = Debug|Win32
 		{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.Release|ARM.ActiveCfg = Release|ARM
 		{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.Release|ARM.Build.0 = Release|ARM
 		{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.Release|x64.ActiveCfg = Release|x64
 		{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.Release|x64.Build.0 = Release|x64
 		{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.Release|x86.ActiveCfg = Release|Win32
 		{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.Release|x86.Build.0 = Release|Win32
+		{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.ReleaseNET35|ARM.ActiveCfg = Release|ARM
+		{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.ReleaseNET35|ARM.Build.0 = Release|ARM
+		{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.ReleaseNET35|x64.ActiveCfg = Release|x64
+		{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.ReleaseNET35|x64.Build.0 = Release|x64
+		{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.ReleaseNET35|x86.ActiveCfg = Release|Win32
+		{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.ReleaseNET35|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/CSharpSource/Source/Microsoft.Xbox.Services.CSharp/Microsoft.Xbox.Services.CSharp.csproj
+++ b/CSharpSource/Source/Microsoft.Xbox.Services.CSharp/Microsoft.Xbox.Services.CSharp.csproj
@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{8D7D8D57-27C7-487A-8792-FD63AC571136}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Microsoft.Xbox.Services.NET35.CSharp</RootNamespace>
+    <AssemblyName>Microsoft.Xbox.Services.NET35.CSharp</AssemblyName>
+    <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Unity Subset v3.5</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <BuildRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))</BuildRoot>
+    <DefineConstants>TRACE;DOTNET_3_5</DefineConstants>
+  </PropertyGroup>
+  <Import Project="$(BuildRoot)\build\props\buildoutput.props" />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\..\..\..\..\xbox-live-unity-plugin\CSharpSource\external\packages\Newtonsoft.Json.9.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Unity.Compat">
+      <HintPath>..\..\..\..\..\xbox-live-unity-plugin\CSharpSource\external\parse-sdk\release\Unity.Compat.dll</HintPath>
+    </Reference>
+    <Reference Include="Unity.Tasks">
+      <HintPath>..\..\..\..\..\xbox-live-unity-plugin\CSharpSource\external\parse-sdk\release\Unity.Tasks.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Microsoft.Xbox.Services.UWP.CSharp\Common\XboxLive.cs">
+      <Link>Common\XboxLive.cs</Link>
+    </Compile>
+    <Compile Include="..\Microsoft.Xbox.Services.UWP.CSharp\Common\XboxLiveAppConfiguration.cs">
+      <Link>Common\XboxLiveAppConfiguration.cs</Link>
+    </Compile>
+    <Compile Include="..\Microsoft.Xbox.Services.UWP.CSharp\Common\XboxLiveUser.cs">
+      <Link>Common\XboxLiveUser.cs</Link>
+    </Compile>
+    <Compile Include="..\Microsoft.Xbox.Services.UWP.CSharp\System\TitleCallableUI.cs">
+      <Link>System\TitleCallableUI.cs</Link>
+    </Compile>
+    <Compile Include="..\Microsoft.Xbox.Services.UWP.CSharp\System\TokenRequestResult.cs">
+      <Link>System\TokenRequestResult.cs</Link>
+    </Compile>
+    <Compile Include="..\Microsoft.Xbox.Services.UWP.CSharp\System\UserImpl.cs">
+      <Link>System\UserImpl.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="..\api\Microsoft.Xbox.Services.Shared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="CopyToUnityLibs" AfterTargets="Build">
+    <Message Importance="high" Text="Copying binaries to plugin layout path $(AssetLibsBasePath)" />
+    <Exec Command="xcopy /y /d &quot;$(OutDir)*.dll&quot; &quot;$(AssetLibsBasePath)UWP\NET35\&quot;" />
+    <Exec Command="xcopy /y /d &quot;$(OutDir)*.pdb&quot; &quot;$(AssetLibsBasePath)UWP\NET35\&quot;" Condition="'$(Configuration)' == 'Debug'" />
+    <!--<Exec Command="xcopy /y /d &quot;$(ProjectDir)..\..\external\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll&quot; &quot;$(AssetLibsBasePath)UWP\&quot;" />-->
+  </Target>
+</Project>
--- a/CSharpSource/Source/Microsoft.Xbox.Services.CSharp/Properties/AssemblyInfo.cs
+++ b/CSharpSource/Source/Microsoft.Xbox.Services.CSharp/Properties/AssemblyInfo.cs
@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Microsoft.Xbox.Services.NET35.CSharp")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Microsoft.Xbox.Services.NET35.CSharp")]
+[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("8d7d8d57-27c7-487a-8792-fd63ac571136")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
--- a/CSharpSource/Source/Microsoft.Xbox.Services.CSharp/packages.config
+++ b/CSharpSource/Source/Microsoft.Xbox.Services.CSharp/packages.config
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net35" requireReinstallation="true" />
+</packages>
--- a/CSharpSource/Source/Microsoft.Xbox.Services.UWP.CSharp/Common/XboxLive.cs
+++ b/CSharpSource/Source/Microsoft.Xbox.Services.UWP.CSharp/Common/XboxLive.cs
--- a/CSharpSource/Source/Microsoft.Xbox.Services.UWP.CSharp/Common/XboxLiveAppConfiguration.cs
+++ b/CSharpSource/Source/Microsoft.Xbox.Services.UWP.CSharp/Common/XboxLiveAppConfiguration.cs
--- a/CSharpSource/Source/Microsoft.Xbox.Services.UWP.CSharp/Common/XboxLiveUser.cs
+++ b/CSharpSource/Source/Microsoft.Xbox.Services.UWP.CSharp/Common/XboxLiveUser.cs
--- a/CSharpSource/Source/Microsoft.Xbox.Services.UWP.CSharp/Microsoft.Xbox.Services.UWP.CSharp.csproj
+++ b/CSharpSource/Source/Microsoft.Xbox.Services.UWP.CSharp/Microsoft.Xbox.Services.UWP.CSharp.csproj
@ -7,7 +7,7 @@
  <Import Project="$(BuildRoot)\build\props\buildoutput.props" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
    <ProjectGuid>{CFB2CA8F-6611-4DCA-981C-4B7AFCCA19A8}</ProjectGuid>
    <OutputType>Library</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
@ -20,10 +20,10 @@
    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PluginLayoutPath>$(BasePluginLayoutPath)UWP\</PluginLayoutPath>
  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|ARM' ">
+    <PlatformTarget>ARM</PlatformTarget>
+    <CDllPlatform>ARM</CDllPlatform>
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
@ -31,8 +31,9 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|ARM' ">
+    <PlatformTarget>ARM</PlatformTarget>
+    <CDllPlatform>ARM</CDllPlatform>
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
@ -41,6 +42,7 @@
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    <PlatformTarget>x86</PlatformTarget>
+    <CDllPlatform>win32</CDllPlatform>
    <DebugSymbols>true</DebugSymbols>
    <DefineConstants>TRACE;DEBUG;NETFX_CORE;WINDOWS_UWP</DefineConstants>
    <NoWarn>;2008</NoWarn>
@ -51,6 +53,7 @@
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    <PlatformTarget>x86</PlatformTarget>
+    <CDllPlatform>win32</CDllPlatform>
    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
    <Optimize>true</Optimize>
    <NoWarn>;2008</NoWarn>
@ -61,6 +64,7 @@
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    <PlatformTarget>x64</PlatformTarget>
+    <CDllPlatform>x64</CDllPlatform>
    <DebugSymbols>true</DebugSymbols>
    <DefineConstants>TRACE;DEBUG;NETFX_CORE;WINDOWS_UWP</DefineConstants>
    <NoWarn>;2008</NoWarn>
@ -71,6 +75,7 @@
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    <PlatformTarget>x64</PlatformTarget>
+    <CDllPlatform>x64</CDllPlatform>
    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
    <Optimize>true</Optimize>
    <NoWarn>;2008</NoWarn>
@ -88,9 +93,9 @@
    <Compile Include="System\TitleCallableUI.cs" />
    <Compile Include="System\TokenRequestResult.cs" />
    <Compile Include="System\UserImpl.cs" />
-    <Compile Include="XboxLiveUser.cs" />
-    <Compile Include="XboxLiveAppConfiguration.cs" />
-    <Compile Include="XboxLive.cs" />
+    <Compile Include="Common\XboxLiveUser.cs" />
+    <Compile Include="Common\XboxLiveAppConfiguration.cs" />
+    <Compile Include="Common\XboxLive.cs" />
    <EmbeddedResource Include="Properties\Microsoft.Xbox.Services._140.UWP.CSharp.rd.xml" />
  </ItemGroup>
  <ItemGroup>
@ -98,38 +103,21 @@
      <Name>Visual C++ 2015 Runtime for Universal Windows Platform Apps</Name>
    </SDKReference>
  </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\..\..\CppSource\Binaries\$(Configuration)\$(CDllPlatform)\Microsoft.Xbox.Services.140.UWP.C\Microsoft.Xbox.Services.140.UWP.C.dll">
+      <Link>Microsoft.Xbox.Services.140.UWP.C.dll</Link>
+    </Content>
+  </ItemGroup>
  <!-- Nearly all of our source comes from the Services.Shared project -->
  <Import Project="$(BuildRoot)\Source\api\Microsoft.Xbox.Services.Shared.projitems" Label="Shared" />
  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
    <VisualStudioVersion>14.0</VisualStudioVersion>
  </PropertyGroup>
  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <Target Name="LayoutPlugin" AfterTargets="Build">
-    <Message Importance="high" Text="OutputPath: $(OutDir)" />
-    <Message Importance="high" Text="Copying binaries to plugin layout path $(PluginLayoutPath)" />
-    <MakeDir Directories="$(PluginLayoutPath)" />
-    <Exec Command="xcopy /y /d &quot;$(OutDir)*.dll&quot; &quot;$(PluginLayoutPath)&quot;" />
-    <Exec Command="xcopy /y /d &quot;$(OutDir)*.pdb&quot; &quot;$(PluginLayoutPath)&quot;" Condition="'$(Configuration)' == 'Debug'" />
-    <Exec Command="xcopy /y /d &quot;$(ProjectDir)..\..\external\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll&quot; &quot;$(PluginLayoutPath)&quot;" />
-  </Target>
-  <Target Name="CopyToUnityLibs" Condition="Exists('$(SolutionDir)..\..\Assets\Xbox Live')" AfterTargets="LayoutPlugin">
-    <Message Importance="high" Text="Copying binaries to Unity Libs folder $(SolutionDir)..\..\Assets\Xbox Live\libs" />
-    <MakeDir Directories="$(SolutionDir)..\..\Assets\Xbox Live\libs" />
-    <ItemGroup>
-      <PluginFiles Include="$(PluginLayoutPath)\*.*" />
-    </ItemGroup>
-    <Copy SourceFiles="@(PluginFiles)" DestinationFolder="$(SolutionDir)..\..\Assets\Xbox Live\libs\UWP" />
-  </Target>
-  <Target Name="CopyCDllsToAssetsPlugins" AfterTargets="CopyToUnityLibs">
-    <Message Importance="high" Text="Copying c dlls to Assets Plugins folder $(SolutionDir)..\..\Assets\Plugins\$(Platform)" />
-    <MakeDir Directories="$(SolutionDir)..\..\Assets\Plugins\$(Platform)" />
-    <Exec Command="xcopy /y /d &quot;$(ProjectDir)..\..\Plugins\$(Platform)\*.dll&quot; &quot;$(SolutionDir)..\..\Assets\Plugins\$(Platform)&quot;" />
-    <Exec Command="xcopy /y /d &quot;$(ProjectDir)..\..\Plugins\$(Platform)\*.pdb&quot; &quot;$(SolutionDir)..\..\Assets\Plugins\$(Platform)&quot;" Condition="'$(Configuration)' == 'Debug'" />
-  </Target>
-  <Target Name="CopyCDllsToAppx" AfterTargets="CopyCDllsToAssetsPlugins">
-    <Message Importance="high" Text="OutputPath: $(OutDir)" />
-    <Message Importance="high" Text="Copying C dll to Appx folder $(TargetDir)AppX\" />
-    <Exec Command="xcopy /y /d &quot;$(ProjectDir)..\..\Plugins\$(Platform)\*.dll&quot; &quot;$(TargetDir)AppX\&quot;" />
-    <Exec Command="xcopy /y /d &quot;$(ProjectDir)..\..\Plugins\$(Platform)\*.pdb&quot; &quot;$(TargetDir)AppX\&quot;" Condition="'$(Configuration)' == 'Debug'" />
+  <Target Name="CopyToUnityLibs" AfterTargets="Build">
+    <Message Importance="high" Text="Copying binaries to plugin layout path $(AssetLibsBasePath)" />
+    <Exec Command="xcopy /y /d &quot;$(OutDir)*.dll&quot; &quot;$(AssetLibsBasePath)UWP\&quot;" />
+    <Exec Command="xcopy /y /d &quot;$(OutDir)*.pdb&quot; &quot;$(AssetLibsBasePath)UWP\&quot;" Condition="'$(Configuration)' == 'Debug'" />
+    <Exec Command="xcopy /y /d &quot;$(ProjectDir)..\..\external\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll&quot; &quot;$(AssetLibsBasePath)UWP\&quot;" />
  </Target>
 </Project>
--- a/CSharpSource/Source/Microsoft.Xbox.Services.UWP.CSharp/project.json
+++ b/CSharpSource/Source/Microsoft.Xbox.Services.UWP.CSharp/project.json
@ -8,7 +8,6 @@
  },
  "runtimes": {
    "win10-arm": {},
-    "win10-arm-aot": {},
    "win10-x86": {},
    "win10-x86-aot": {},
    "win10-x64": {},
--- a/CSharpSource/Source/Microsoft.Xbox.Services.UWP.UnitTests/project.json
+++ b/CSharpSource/Source/Microsoft.Xbox.Services.UWP.UnitTests/project.json
@ -7,8 +7,9 @@
    "uap10.0": {}
  },
  "runtimes": {
-    "win10-arm": {},
-    "win10-x86": {},
-    "win10-x64": {}
+    "win10-arm-aot": {},
+    "win10-arm": { },
+    "win10-x86": { },
+    "win10-x64": { }
  }
 }
--- a/CSharpSource/Source/Microsoft.Xbox.Services.UnityEditor.CSharp/Common/XboxLive.cs
+++ b/CSharpSource/Source/Microsoft.Xbox.Services.UnityEditor.CSharp/Common/XboxLive.cs
--- a/CSharpSource/Source/Microsoft.Xbox.Services.UnityEditor.CSharp/Common/XboxLiveAppConfiguration.cs
+++ b/CSharpSource/Source/Microsoft.Xbox.Services.UnityEditor.CSharp/Common/XboxLiveAppConfiguration.cs
--- a/CSharpSource/Source/Microsoft.Xbox.Services.UnityEditor.CSharp/Common/XboxLiveUser.cs
+++ b/CSharpSource/Source/Microsoft.Xbox.Services.UnityEditor.CSharp/Common/XboxLiveUser.cs
--- a/CSharpSource/Source/Microsoft.Xbox.Services.UnityEditor.CSharp/Microsoft.Xbox.Services.UnityEditor.CSharp.csproj
+++ b/CSharpSource/Source/Microsoft.Xbox.Services.UnityEditor.CSharp/Microsoft.Xbox.Services.UnityEditor.CSharp.csproj
@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Configuration Condition=" '$(Configuration)' == '' ">DebugNET35</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ProductVersion>10.0.20506</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
@ -23,42 +23,54 @@
    <FileAlignment>512</FileAlignment>
    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
    <BuildRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))</BuildRoot>
+    <DefineConstants>TRACE;UNITY_EDITOR</DefineConstants>
  </PropertyGroup>
  <Import Project="$(BuildRoot)\build\props\buildoutput.props" />
-  <PropertyGroup>
-    <PluginLayoutPath>$(BasePluginLayoutPath)Unity\</PluginLayoutPath>
+  <PropertyGroup Condition="'$(Configuration)' == 'DebugNET46' Or '$(Configuration)' == 'ReleaseNET46'">
+    <DefineConstants>$(DefineConstants);DOTNET_4_6</DefineConstants>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <AssetLibsPath>$(AssetLibsBasePath)UnityEditor\NET46\</AssetLibsPath>
  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  <PropertyGroup Condition="'$(Configuration)' == 'DebugNET35' Or '$(Configuration)' == 'ReleaseNET35'">
+    <AssetLibsPath>$(AssetLibsBasePath)UnityEditor\NET35\</AssetLibsPath>
+    <DefineConstants>$(DefineConstants);DOTNET_3_5</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugNET35|AnyCPU' Or '$(Configuration)|$(Platform)' == 'DebugNET46|AnyCPU'">
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>TRACE;DEBUG;UNITY_EDITOR;DOTNET_3_5</DefineConstants>
+    <Optimize>true</Optimize>
+    <DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <LangVersion>4</LangVersion>
  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseNET35|AnyCPU' Or '$(Configuration)|$(Platform)' == 'ReleaseNET46|AnyCPU'">
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
-    <DefineConstants>TRACE;UNITY_EDITOR;DOTNET_3_5</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="mscorlib" />
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" Condition="'$(TargetFrameworkVersion)' == 'v3.5'">
      <HintPath>..\..\external\packages\Newtonsoft.Json.9.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
      <Private>True</Private>
    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" Condition="'$(TargetFrameworkVersion)' == 'v4.6.1'">
+      <HintPath>..\..\external\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Xml" />
    <Reference Include="System.Core" />
    <Reference Include="System.Data" />
    <Reference Include="System.Runtime.Serialization" />
    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Unity.Compat">
+    <Reference Include="Unity.Compat" Condition="'$(TargetFrameworkVersion)' == 'v3.5'">
      <HintPath>..\..\external\parse-sdk\release\Unity.Compat.dll</HintPath>
    </Reference>
-    <Reference Include="Unity.Tasks">
+    <Reference Include="Unity.Tasks" Condition="'$(TargetFrameworkVersion)' == 'v3.5'">
      <HintPath>..\..\external\parse-sdk\release\Unity.Tasks.dll</HintPath>
    </Reference>
  </ItemGroup>
@ -66,9 +78,9 @@
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="System\TitleCallableUI.cs" />
    <Compile Include="System\UserImpl.cs" />
-    <Compile Include="XboxLiveUser.cs" />
-    <Compile Include="XboxLiveAppConfiguration.cs" />
-    <Compile Include="XboxLive.cs" />
+    <Compile Include="Common\XboxLiveUser.cs" />
+    <Compile Include="Common\XboxLiveAppConfiguration.cs" />
+    <Compile Include="Common\XboxLive.cs" />
  </ItemGroup>
  <ItemGroup>
    <None Include="packages.config" />
@ -76,18 +88,9 @@
  <Import Project="$(BuildRoot)\Source\api\Microsoft.Xbox.Services.Shared.projitems" Label="Shared" />
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <Target Name="GenerateTargetFrameworkMonikerAttribute" />
-  <Target Name="LayoutPlugin" AfterTargets="Build">
-    <Message Importance="high" Text="Copying binaries to plugin layout path $(PluginLayoutPath)" />
-    <MakeDir Directories="$(PluginLayoutPath)" />
-    <Exec Command="xcopy /y /d &quot;$(OutDir)*.dll&quot; &quot;$(PluginLayoutPath)&quot;" />
-    <Exec Command="xcopy /y /d &quot;$(OutDir)*.pdb&quot; &quot;$(PluginLayoutPath)&quot;" Condition="'$(Configuration)' == 'Debug'" />
-  </Target>
-  <Target Name="CopyToUnityLibs" Condition="Exists('$(SolutionDir)..\..\Assets\Xbox Live')" AfterTargets="LayoutPlugin">
-    <Message Text="Copying binaries to Unity Libs folder $(SolutionDir)..\..\Assets\Xbox Live\libs" />
-    <MakeDir Directories="$(SolutionDir)..\..\Assets\Xbox Live\libs" />
-    <ItemGroup>
-      <PluginFiles Include="$(PluginLayoutPath)\*.*" />
-    </ItemGroup>
-    <Copy SourceFiles="@(PluginFiles)" DestinationFolder="$(SolutionDir)..\..\Assets\Xbox Live\libs\Unity" />
+  <Target Name="CopyToUnityLibs" Condition="Exists('$(BuildRoot)\..\Assets\Xbox Live')" AfterTargets="Build">
+    <Message importance="high" Text="$(TargetPath) Copying binaries to Unity Libs folder $(BuildRoot)\..\Assets\Xbox Live\libs" />
+    <Exec Command="xcopy /y /d &quot;$(OutDir)*.dll&quot; &quot;$(AssetLibsPath)&quot;" />
+    <Exec Command="xcopy /y /d &quot;$(OutDir)*.pdb&quot; &quot;$(AssetLibsPath)&quot;" Condition="'$(Configuration)' == 'Debug'" />
  </Target>
 </Project>
--- a/CSharpSource/Source/Microsoft.Xbox.Services.UnityEditor.CSharp/packages.config
+++ b/CSharpSource/Source/Microsoft.Xbox.Services.UnityEditor.CSharp/packages.config
@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net35" requireReinstallation="true" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net35,net45" requireReinstallation="true" />
 </packages>
--- a/CppSource/Build/Microsoft.Xbox.Services.140.UWP.C/Microsoft.Xbox.Services.140.UWP.C.vcxproj
+++ b/CppSource/Build/Microsoft.Xbox.Services.140.UWP.C/Microsoft.Xbox.Services.140.UWP.C.vcxproj
@ -199,17 +199,16 @@
    <None Include="packages.config" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Target Name="CopyLibsForCSharp" AfterTargets="Build">
+  <Target Name="CopyToUnityLibs" AfterTargets="Build">
    <PropertyGroup Label="x86" Condition="'$(Platform.ToLower())' == 'win32' Or '$(Platform.ToLower())' == 'x86'">
      <PluginPlatform>x86</PluginPlatform>
    </PropertyGroup>
    <PropertyGroup Label="!x86" Condition="'$(Platform.ToLower())' == 'x64' Or '$(Platform.ToLower())' == 'arm'">
      <PluginPlatform>$(Platform)</PluginPlatform>
    </PropertyGroup>
-    <Message Importance="high" Text="Copying binaries to CSharp Libs folder $(ProjectDir)..\..\..\CSharpSource\Plugins\$(PluginPlatform)" />
-    <MakeDir Directories="$(ProjectDir)..\..\..\CSharpSource\Plugins\$(PluginPlatform)" />
-    <Exec Command="xcopy /y /d &quot;$(OutDir)*.dll&quot; &quot;$(ProjectDir)..\..\..\CSharpSource\Plugins\$(PluginPlatform)&quot;" />
-    <Exec Command="xcopy /y /d &quot;$(OutDir)*.pdb&quot; &quot;$(ProjectDir)..\..\..\CSharpSource\Plugins\$(PluginPlatform)&quot;" Condition="'$(Configuration)' == 'Debug'" />
+    <Message Importance="high" Text="Copying binaries from $(OutDir) to Unity Libs folder $(ProjectDir)..\..\..\Assets\Plugins\" />
+    <Exec Command="xcopy /y /d /i &quot;$(OutDir)*.dll&quot; &quot;$(ProjectDir)..\..\..\Assets\Plugins\$(PluginPlatform)&quot;" />
+    <Exec Command="xcopy /y /d /i &quot;$(OutDir)*.pdb&quot; &quot;$(ProjectDir)..\..\..\Assets\Plugins\$(PluginPlatform)&quot;" Condition="'$(Configuration)' == 'Debug'" />
  </Target>
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    <PropertyGroup>
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@ -1 +1 @@
-m_EditorVersion: 5.6.0p3
+m_EditorVersion: 2017.2.0p2