Merge remote-tracking branch 'upstream/master' into text_edit

Samples/UIWidgetsTheatre/UIWidgetsTheatre.cs

 using Unity.UIWidgets.material;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;
+
+#if UNITY_EDITOR
+#endif
+
 using UnityEngine;
 
 
     }
     
     
+    #if UNITY_EDITOR
     [CustomEditor(typeof(UIWidgetsTheatre), true)]
     [CanEditMultipleObjects]
     public class UIWidgetTheatreEditor : RawImageEditor {
             EditorUtility.SetDirty(this.target);
         }
     }
+    #endif
 }

Samples/UIWidgetsGallery/Editor.meta

+fileFormatVersion: 2
+guid: 348a394ab7d3f4ba088eb92226e94979
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Samples/UIWidgetsGallery/Editor/GalleryMainEditor.cs.meta

+fileFormatVersion: 2
+guid: 98f11153c8c804448abe7a050222da98
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Samples/UIWidgetsGallery/Editor/UIWidgetsGallery.Editor.asmdef

+{
+    "name": "UIWidgetsGallery.Editor",
+    "references": [
+        "Unity.UIWidgets",
+        "UIWidgetsGallery"],
+    "optionalUnityReferences": [],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": []
+}

Samples/UIWidgetsGallery/Editor/UIWidgetsGallery.Editor.asmdef.meta

+fileFormatVersion: 2
+guid: 58e068d0e290f4278b5ee4a75e56c10f
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Samples/UIWidgetsGallery/GalleryMainEditor.cs.meta

-fileFormatVersion: 2
-guid: 1a499c991275944c983bdc42598f80b0
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: