Merge branch 'master' into crash-fixes

.gitmodules

-[submodule "MaterialGraphProject/Assets/GraphView/Editor"]
-	path = MaterialGraphProject/Assets/GraphView/Editor
-url=https://github.com/Unity-Technologies/graphview.git

MaterialGraphProject/Assets/GeneratedShader.shader

-Shader "Hidden/PreviewShader/Sample2DTexture_1221CD9A_rgba" {
+Shader "Hidden/PreviewShader/Color_Color_3FAAF5EA_Uniform" {
-		[NonModifiableTextureData] Texture2D_Texture2D_D281CEC8_Uniform("Texture2D", 2D) = "white" {}
 
 	}	
 	
 			#include "UnityCG.cginc"
 
 
-			UNITY_DECLARE_TEX2D(Texture2D_Texture2D_D281CEC8_Uniform);
-			float2 Sample2DTexture_1221CD9A_UV;
+			float4 Color_Color_3FAAF5EA_Uniform;
 
 
 			struct v2f 
-				half4 meshUV0 : TEXCOORD5;
 
 			};
 
 				float3 viewDir = UnityWorldSpaceViewDir(worldPos);
 				float4 screenPos = ComputeScreenPos(UnityObjectToClipPos(v.vertex));
 				float3 worldNormal = UnityObjectToWorldNormal(v.normal);
-				o.meshUV0 = v.texcoord;
 
 				return o;
 			}
-				half4 uv0 = IN.meshUV0;
-				float4 Sample2DTexture_1221CD9A_rgba = UNITY_SAMPLE_TEX2D(Texture2D_Texture2D_D281CEC8_Uniform,uv0.xy);
-				return half4(Sample2DTexture_1221CD9A_rgba.x, Sample2DTexture_1221CD9A_rgba.y, Sample2DTexture_1221CD9A_rgba.z, 1.0);
+				return half4(Color_Color_3FAAF5EA_Uniform.x, Color_Color_3FAAF5EA_Uniform.y, Color_Color_3FAAF5EA_Uniform.z, 1.0);
 
 			}
 			ENDCG

MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/AbstractGraphEditWindow.cs

 using System.IO;
 using System.Linq;
 using System.Text;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEngine;
 using UnityEngine.Graphing;
 using UnityEngine.MaterialGraph;
         void OnEnable()
         {
             m_GraphEditorDrawer = new GraphEditorDrawer(CreateGraphView());
-            rootVisualContainer.AddChild(m_GraphEditorDrawer);
+            rootVisualContainer.Add(m_GraphEditorDrawer);
             var source = CreateDataSource();
             source.Initialize(inMemoryAsset, this);
             m_GraphEditorDrawer.presenter = source;
         {
-            rootVisualContainer.ClearChildren();
+            rootVisualContainer.Clear();
         }
 
         void Update()

MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/AbstractGraphPresenter.cs

 using System;
 using System.Collections.Generic;
 using System.Linq;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Util;
 using UnityEngine;
 using UnityEngine.Graphing;

MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/Drawer/GraphEditorDrawer.cs

-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEngine;
 
 namespace UnityEditor.Graphing.Drawing
             m_TitleBarDrawer = new TitleBarDrawer();
             m_TitleBarDrawer.name = "TitleBar";
 
-            AddChild(m_TitleBarDrawer);
-            AddChild(m_GraphView);
+            Add(m_TitleBarDrawer);
+            Add(m_GraphView);
         }
 
         public override void OnDataChanged()

MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/Drawer/NodeDrawer.cs

 using System.Collections.Generic;
 using System.Linq;
-using UIElements.GraphView;
-using UIElements.GraphView;
-using UnityEditor.Graphing.Util;
-using UnityEngine;
+using UnityEditor.Experimental.UIElements.GraphView;
-using UnityEngine.Experimental.UIElements.StyleEnums;
 
 namespace UnityEditor.Graphing.Drawing
 {
                 //pickingMode = PickingMode.Ignore,
             };
 
-            leftContainer.AddChild(m_ControlsContainer);
+            leftContainer.Add(m_ControlsContainer);
             m_CurrentControlPresenter = new List<GraphControlPresenter>();
 
             usePixelCaching = false;

MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/Drawer/TitleBarButtonDrawer.cs

-using UnityEngine.Experimental.UIElements;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
+using UnityEngine.Experimental.UIElements;
 
 namespace UnityEditor.Graphing.Drawing
 {
             m_clicker = new Clicker();
             m_clicker.onClick += OnClick;
             m_clicker.onStateChange += OnClickStateChanged;
-            AddManipulator(m_clicker);
+            this.AddManipulator(m_clicker);
-            AddChild(ve);
+            Add(ve);
-            AddChild(m_label);
+            Add(m_label);
 
             var ve2 = new VisualElement();
             ve2.AddToClassList("titleBarItemBorder");

MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/Drawer/TitleBarDrawer.cs

 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEngine.Experimental.UIElements;
 
 namespace UnityEditor.Graphing.Drawing
             {
                 name = "left"
             };
-            AddChild(m_LeftContainer);
+            Add(m_LeftContainer);
-            AddChild(m_RightContainer);
+            Add(m_RightContainer);
 
             AddStyleSheetPath("Styles/TitleBar");
         }

MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/Manipulators/ClickGlobalSelector.cs

 using System;
-using UnityEngine;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEngine.Experimental.UIElements;
 using ManipulatorActivationFilter = UnityEngine.Experimental.UIElements.ManipulatorActivationFilter;
 using MouseButton = UnityEngine.Experimental.UIElements.MouseButton;

MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/Manipulators/Clicker.cs

-using System;
-using UnityEngine;
 using UnityEngine.Experimental.UIElements;
 using MouseManipulator = UnityEngine.Experimental.UIElements.MouseManipulator;
 

MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/Manipulators/Commandable.cs

-using System;
-using System.Collections;
+using System.Collections;
-using System.Linq;
-using System.Text;
 using UnityEngine;
 using UnityEngine.Experimental.UIElements;
 

MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/Presenters/GraphAnchorPresenter.cs

 using System;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEngine;
 using UnityEngine.Graphing;
 

MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/Presenters/GraphControlPresenter.cs

 using System;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.MaterialGraph.Drawing;
 using UnityEngine;
 using UnityEngine.Graphing;

MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/Presenters/GraphEdgePresenter.cs

 using System;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 
 namespace UnityEditor.Graphing.Drawing
 {

MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/Presenters/GraphNodePresenter.cs

 using System.Collections.Generic;
 using System.Linq;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 
 namespace UnityEditor.Graphing.Drawing
 {

MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/SerializableGraphView.cs

 using System.Collections.Generic;
 using System.Linq;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEngine;
 using UnityEngine.Experimental.UIElements;
 
         public SerializableGraphView()
         {
             // Shortcut handler to delete elements
-            AddManipulator(new ShortcutHandler(
+            this.AddManipulator(new ShortcutHandler(
                     new Dictionary<Event, ShortcutDelegate>
             {
                 {Event.KeyboardEvent("a"), FrameAll},
                 {Event.KeyboardEvent("#d"), DuplicateSelection}
             }));
 
-            AddManipulator(new Commandable
+            this.AddManipulator(new Commandable
-            AddManipulator(new ClickGlobalSelector());
-            AddManipulator(new ContentZoomer());
-            AddManipulator(new ContentDragger());
-            AddManipulator(new RectangleSelector());
-            AddManipulator(new SelectionDragger());
-            AddManipulator(new ClickSelector());
+            this.AddManipulator(new ClickGlobalSelector());
+            this.AddManipulator(new ContentZoomer());
+            this.AddManipulator(new ContentDragger());
+            this.AddManipulator(new RectangleSelector());
+            this.AddManipulator(new SelectionDragger());
+            this.AddManipulator(new ClickSelector());
-            InsertChild(0, new GridBackground());
+            Insert(0, new GridBackground());
 
             typeFactory[typeof(GraphNodePresenter)] = typeof(NodeDrawer);
         }

MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Util/GraphTypeMapper.cs

 using System;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 
 namespace UnityEditor.Graphing.Util
 {

MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Runtime/Util/SerializationHelper.cs

 
                 return string.Format("{0}, {1}", fullName, assemblyName);
             }
+
+            public string SearchStringTestable()
+            {
+                if (!IsValid())
+                    return string.Empty;
+
+                return string.Format("{0}, {1}-testable", fullName, assemblyName);
+            }
         }
 
         [Serializable]
             if (!typeInfo.IsValid())
                 return null;
 
-            return Type.GetType(typeInfo.SearchString());
+            var res =  Type.GetType(typeInfo.SearchString());
+
+            // if we are using a 'testable' dll.
+            if (res == null)
+                res = Type.GetType(typeInfo.SearchStringTestable());
+
+            return res;
         }
 
         public static JSONSerializedElement Serialize<T>(T item)

MaterialGraphProject/Assets/NewNodes/Editor/BlendModeNodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine.MaterialGraph;
 

MaterialGraphProject/Assets/NewNodes/Editor/ConstantsNodePresenter.cs

 using System;
 using System.Collections.Generic;
 using UnityEngine.MaterialGraph;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 
 namespace UnityEditor.MaterialGraph.Drawing

MaterialGraphProject/Assets/NewNodes/Editor/ToggleNodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine;
 using UnityEngine.MaterialGraph;

MaterialGraphProject/Assets/NewNodes/Editor/TransformNodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine.MaterialGraph;
 using UnityEngine;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Drawer/MaterialNodeDrawer.cs

-using System.Collections.Generic;
+using UnityEngine;
-using UnityEditor.Graphing.Util;
-using UnityEngine;
 
 namespace UnityEditor.MaterialGraph.Drawing
 {
                 image = Texture2D.whiteTexture
             };
             m_PreviewImage.AddToClassList("inactive");
-            leftContainer.AddChild(m_PreviewImage);
+            leftContainer.Add(m_PreviewImage);
         }
 
         private void SchedulePolling()

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/MaterialGraphEditWindow.cs

 using System;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine;
 using UnityEngine.Graphing;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/MaterialGraphView.cs

 using System;
 using System.Reflection;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
-using Edge = UIElements.GraphView.Edge;
-using MouseButton = UIElements.GraphView.MouseButton;
+using Edge = UnityEditor.Experimental.UIElements.GraphView.Edge;
+using MouseButton = UnityEngine.Experimental.UIElements.MouseButton;
 
 namespace UnityEditor.MaterialGraph.Drawing
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/ColorNodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine;
 using UnityEngine.MaterialGraph;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/ConvolutionFilterNodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine.MaterialGraph;
 using UnityEngine;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/CubemapNodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine;
 using UnityEngine.MaterialGraph;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/CustomCodeNodePresenter.cs

 using System;
 using System.Linq;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine;
 using UnityEngine.MaterialGraph;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/GradientNodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine;
 

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/IfNodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine;
 using UnityEngine.MaterialGraph;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/LevelsNodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine.MaterialGraph;
 

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/MasterNodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine.MaterialGraph;
 using UnityEngine;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/MaterialGraphPresenter.cs

 using UnityEngine.MaterialGraph;
 using System.Collections.Generic;
 using System.Linq;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 
 namespace UnityEditor.MaterialGraph.Drawing
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/MaterialNodePresenter.cs

 using System;
 using System.Collections.Generic;
 using System.Linq;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 
 namespace UnityEditor.MaterialGraph.Drawing
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/Matrix2NodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine;
 using UnityEngine.MaterialGraph;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/Matrix3NodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine;
 using UnityEngine.MaterialGraph;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/Matrix4NodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine;
 using UnityEngine.MaterialGraph;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/MatrixCommonNodePresenter.cs

 using System;
 using System.Collections.Generic;
 using UnityEngine.MaterialGraph;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 
 namespace UnityEditor.MaterialGraph.Drawing

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/NodePreviewPresenter.cs

 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 
 namespace UnityEditor.MaterialGraph.Drawing
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/PropertyNodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine;
 using UnityEngine.MaterialGraph;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/RemapInputNodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine;
 using UnityEngine.MaterialGraph;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/RemapMasterNodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine;
 using UnityEngine.MaterialGraph;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/SamplerAssetPresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine;
 using UnityEngine.MaterialGraph;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/SamplerStatePresenter.cs

 using System;
 using System.Collections.Generic;
 using UnityEngine.MaterialGraph;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 
 namespace UnityEditor.MaterialGraph.Drawing

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/ScatterNodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 
 

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/SubgraphIONodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine;
 using UnityEngine.MaterialGraph;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/SubgraphNodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine;
 using UnityEngine.MaterialGraph;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/SurfaceMasterPresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine;
 using UnityEngine.MaterialGraph;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/SwizzleNodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine.MaterialGraph;
 

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/TextureAssetPresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine;
 using UnityEngine.MaterialGraph;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/TextureLODNodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine;
 using UnityEngine.MaterialGraph;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/TextureNodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine;
 using UnityEngine.MaterialGraph;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/TextureSamplerPresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine;
 using UnityEngine.MaterialGraph;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/UVNodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine.MaterialGraph;
 

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/Vector1NodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine.MaterialGraph;
 using UnityEngine;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/Vector2NodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine;
 using UnityEngine.MaterialGraph;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/Vector3NodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine;
 using UnityEngine.MaterialGraph;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/Vector4NodePresenter.cs

 using System;
 using System.Collections.Generic;
-using UIElements.GraphView;
+using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing.Drawing;
 using UnityEngine;
 using UnityEngine.MaterialGraph;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Testing/IntegrationTests/ShaderGenerationTest.cs

+using System;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using NUnit.Framework;
             else
             {
                 var textTemplate = File.ReadAllText(textTemplateFilePath);
-                var textsAreEqual = shaderString == textTemplate;
+                var textsAreEqual = string.Compare(shaderString, textTemplate, CultureInfo.CurrentCulture, CompareOptions.IgnoreSymbols);
-                if (!textsAreEqual)
+                if (0 != textsAreEqual)
                 {
                     var failedPath = Path.Combine(rootPath.ToString(), "Failed");
                     Directory.CreateDirectory(failedPath);
                     File.WriteAllText(misMatchLocationResult, shaderString);
                     File.WriteAllText(misMatchLocationTemplate, textTemplate);
                 }
-                Assert.IsTrue(textsAreEqual);
+                Assert.IsTrue(textsAreEqual == 0);
             }
 
             m_Shader = ShaderUtil.CreateShaderAsset(shaderString);

MaterialGraphProject/Packages/manifest.json.meta

 fileFormatVersion: 2
-guid: 81d786589ea66cc499cf72d5c21d8bcb
-timeCreated: 1501159646
+guid: a59019b6d8251f04795299011c601d61
+timeCreated: 1502182766
 licenseType: Pro
 TextScriptImporter:
   externalObjects: {}

MaterialGraphProject/ProjectSettings/DynamicsManager.asset

 --- !u!55 &1
 PhysicsManager:
   m_ObjectHideFlags: 0
-  m_Gravity: {x: 0, y: -9.81000042, z: 0}
+  serializedVersion: 3
+  m_Gravity: {x: 0, y: -9.81, z: 0}
-  m_SleepVelocity: .150000006
-  m_SleepAngularVelocity: .140000001
-  m_MaxAngularVelocity: 7
-  m_MinPenetrationForPenalty: .00999999978
-  m_SolverIterationCount: 6
-  m_RaycastsHitTriggers: 1
+  m_SleepThreshold: 0.005
+  m_DefaultContactOffset: 0.01
+  m_DefaultSolverIterations: 6
+  m_DefaultSolverVelocityIterations: 1
+  m_QueriesHitBackfaces: 0
+  m_QueriesHitTriggers: 1
+  m_EnableAdaptiveForce: 0
+  m_EnablePCM: 1
+  m_AutoSimulation: 1
+  m_AutoSyncTransforms: 1

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Resources/Shaders.meta

+fileFormatVersion: 2
+guid: 95a0c8e39aaf7f3468cff72de2b7c094
+folderAsset: yes
+timeCreated: 1502110345
+licenseType: Pro
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/mur_Ambiant.bmp.meta

-fileFormatVersion: 2
-guid: b5a88303611082242a4eb08e645752d2
-timeCreated: 1495717081
-licenseType: Pro
-TextureImporter:
-  fileIDToRecycleName: {}
-  serializedVersion: 4
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -1
-    wrapU: -1
-    wrapV: -1
-    wrapW: -1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spritePixelsToUnits: 100
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  platformSettings:
-  - buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-  spritePackingTag: 
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

MaterialGraphProject/Assets/GraphView.meta

-fileFormatVersion: 2
-guid: 0ec39c50d1bcd624b8f2dd329881127d
-folderAsset: yes
-timeCreated: 1485805545
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

MaterialGraphProject/Assets/Plugins.meta

-fileFormatVersion: 2
-guid: 3ee9d3a522f934619b2828d76eebf39f
-folderAsset: yes
-timeCreated: 1500533996
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

MaterialGraphProject/Packages/Config.meta

-fileFormatVersion: 2
-guid: cd955a43f23a0db408b7499ae2c3dd11
-folderAsset: yes
-timeCreated: 1501159605
-licenseType: Pro
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: