DynamoDS
diff --git a/‎src/DynamoCore/Graph/Workspaces/SerializationExtensions.cs
Copy file name to clipboard
+22Lines changed: 22 additions & 0 deletions b/‎src/DynamoCore/Graph/Workspaces/SerializationExtensions.cs
Copy file name to clipboard
+22Lines changed: 22 additions & 0 deletions
diff --git a/‎src/DynamoCore/Graph/Workspaces/WorkspaceModel.cs
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions b/‎src/DynamoCore/Graph/Workspaces/WorkspaceModel.cs
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎src/Engine/ProtoCore/Parser/AssociativeAST.cs
Copy file name to clipboard
+38-17Lines changed: 38 additions & 17 deletions b/‎src/Engine/ProtoCore/Parser/AssociativeAST.cs
Copy file name to clipboard
+38-17Lines changed: 38 additions & 17 deletions
diff --git a/‎src/Libraries/CoreNodeModels/CoreNodeModelsImages.resx
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Libraries/CoreNodeModels/CoreNodeModelsImages.resx
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Libraries/CoreNodeModels/Input/BaseTypes.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Libraries/CoreNodeModels/Input/BaseTypes.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Libraries/CoreNodeModels/Input/BasicInteractive.cs
Copy file name to clipboard
+4-3Lines changed: 4 additions & 3 deletions b/‎src/Libraries/CoreNodeModels/Input/BasicInteractive.cs
Copy file name to clipboard
+4-3Lines changed: 4 additions & 3 deletions
@@ -44,6 +44,8 @@ internal static string ToJson(this WorkspaceModel workspace, EngineController en
             var json = JsonConvert.SerializeObject(workspace, settings);
             var result = ReplaceTypeDeclarations(json);
 
+            result = SerializeIntegerSliderAs32BitType(result);
+
             return result;
         }
 
@@ -72,5 +74,25 @@ internal static string ReplaceTypeDeclarations(string json, bool fromServer = fa
 
             return result;
         }
+
+        [Obsolete("Remove method after obsoleting IntegerSlider and replacing it with IntegerSlider64Bit")]
+        internal static string DeserializeIntegerSliderTo64BitType(string json)
+        {
+            var result = json;
+
+            var rgx2 = new Regex(@"\bCoreNodeModels.Input.IntegerSlider\b");
+
+            return rgx2.Replace(result, "CoreNodeModels.Input.IntegerSlider64Bit");
+        }
+
+        [Obsolete("Remove method after obsoleting IntegerSlider and replacing it with IntegerSlider64Bit")]
+        internal static string SerializeIntegerSliderAs32BitType(string json)
+        {
+            var result = json;
+
+            var rgx2 = new Regex(@"\bCoreNodeModels.Input.IntegerSlider64Bit\b");
+
+            return rgx2.Replace(result, "CoreNodeModels.Input.IntegerSlider");
+        }
     }
 }
@@ -1881,6 +1881,10 @@ public static WorkspaceModel FromJson(string json, LibraryServices libraryServic
             };
 
             var result = SerializationExtensions.ReplaceTypeDeclarations(json, true);
+
+            // TODO: Remove after deprecating "IntegerSlider : SliderBase<int>" 
+            result = SerializationExtensions.DeserializeIntegerSliderTo64BitType(result);
+
             var ws = JsonConvert.DeserializeObject<WorkspaceModel>(result, settings);
 
             return ws;
 
@@ -2759,11 +2759,27 @@ public static NullNode BuildNullNode()
             return new NullNode();
         }
 
+        /// <summary>
+        /// Build a DesignScript Int AST node from a 32 bit int input value.
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        [Obsolete("The DS language supports 32 bit integers since Dynamo 2.0. This method will be removed in a future version of Dynamo.")]
         public static IntNode BuildIntNode(int value)
         {
             return new IntNode(value);
         }
 
+        /// <summary>
+        /// Build a DesignScript Int AST node from a long input value.
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static IntNode BuildIntNode(long value)
+        {
+            return new IntNode(value);
+        }
+
         public static DoubleNode BuildDoubleNode(double value)
         {
             return new DoubleNode(value);
@@ -2793,23 +2809,28 @@ public static AssociativeNode BuildPrimitiveNodeFromObject(object value)
             if (null == value)
                 return BuildNullNode();
 
-            string type = value.GetType().Name;
-            switch (type)
-            {
-                case "Int16":
-                case "Int32":
-                case "Int64":
-                case "UInt16":
-                case "UInt32":
-                case "UInt64":
-                    return BuildIntNode(Convert.ToInt32(value));
-                case "Single":
-                case "Double":
-                    return BuildDoubleNode(Convert.ToDouble(value));
-                case "String":
-                    return BuildStringNode(value.ToString());
-                case "Boolean":
-                    return BuildBooleanNode(Convert.ToBoolean(value));
+            switch (value)
+            {
+                case short s:
+                    return BuildIntNode(Convert.ToInt64(s));
+                case int i:
+                    return BuildIntNode(Convert.ToInt64(i));
+                case long l:
+                    return BuildIntNode(l);
+                case ushort u16:
+                    return BuildIntNode(Convert.ToInt64(u16));
+                case uint u32:
+                    return BuildIntNode(u32);
+                case ulong u64:
+                    return BuildIntNode(Convert.ToInt64(u64));
+                case float s:
+                    return BuildDoubleNode(s);
+                case double d:
+                    return BuildDoubleNode(d);
+                case string s:
+                    return BuildStringNode(s);
+                case bool b:
+                    return BuildBooleanNode(b);
                 default:
                     Validity.Assert(false, "Invalide Input type to make AST node");
                     break;
 
@@ -724,7 +724,7 @@
         AFwtvaEfzhR5AAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="CoreNodeModels.Input.IntegerSlider.Large" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="CoreNodeModels.Input.IntegerSlider64Bit.Large" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAYAAADimHc4AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIqSURBVHhe7dlNbtNAGMbxHCF3iVTYUEWIig9VqEfo
@@ -740,7 +740,7 @@
         rkJggg==
 </value>
   </data>
-  <data name="CoreNodeModels.Input.IntegerSlider.Small" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="CoreNodeModels.Input.IntegerSlider64Bit.Small" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAACgSURBVFhHYxgFo2AUjIJRMAqoAQ76eBoAcQMUG0CF
 
@@ -737,7 +737,7 @@ public double GetValue(Dictionary<string, double> idLookup)
             public AssociativeNode GetAstNode(Dictionary<string, AssociativeNode> idLookup)
             {
                 if (Math.Floor(_d) == _d)
-                    return AstFactory.BuildIntNode((int)_d);
+                    return AstFactory.BuildIntNode((long)_d);
                 return AstFactory.BuildDoubleNode(_d);
             }
         }
 
@@ -61,7 +61,6 @@ public override NodeInputData InputData
 
         protected BasicInteractive(IEnumerable<PortModel> inPorts, IEnumerable<PortModel> outPorts) : base(inPorts, outPorts)
         {
-            Type type = typeof(T);
         }
 
         protected BasicInteractive()
@@ -97,8 +96,10 @@ protected override void DeserializeCore(XmlElement nodeElement, SaveContext cont
         {
             base.DeserializeCore(nodeElement, context); // Base implementation must be called
 
-            foreach (XmlNode subNode in nodeElement.ChildNodes.Cast<XmlNode>()
-                .Where(subNode => subNode.Name.Equals(typeof(T).FullName)))
+            var subNodes = nodeElement.ChildNodes.Cast<XmlNode>()
+                .Where(subNode => subNode.Name.Equals(typeof(T).FullName));
+
+            foreach (XmlNode subNode in subNodes)
             {
                 var attrs = subNode.Attributes;
Original file line number	Diff line number	Diff line change
`@@ -737,7 +737,7 @@ public double GetValue(Dictionary<string, double> idLookup)`
`737`	`737`	`public AssociativeNode GetAstNode(Dictionary<string, AssociativeNode> idLookup)`
`738`	`738`	`{`
`739`	`739`	`if (Math.Floor(_d) == _d)`
`740`		`- return AstFactory.BuildIntNode((int)_d);`
	`740`	`+ return AstFactory.BuildIntNode((long)_d);`
`741`	`741`	`return AstFactory.BuildDoubleNode(_d);`
`742`	`742`	`}`
`743`	`743`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,6 @@ public override NodeInputData InputData`
`61`	`61`
`62`	`62`	`protected BasicInteractive(IEnumerable<PortModel> inPorts, IEnumerable<PortModel> outPorts) : base(inPorts, outPorts)`
`63`	`63`	`{`
`64`		`- Type type = typeof(T);`
`65`	`64`	`}`
`66`	`65`
`67`	`66`	`protected BasicInteractive()`
`@@ -97,8 +96,10 @@ protected override void DeserializeCore(XmlElement nodeElement, SaveContext cont`
`97`	`96`	`{`
`98`	`97`	`base.DeserializeCore(nodeElement, context); // Base implementation must be called`
`99`	`98`
`100`		`- foreach (XmlNode subNode in nodeElement.ChildNodes.Cast<XmlNode>()`
`101`		`- .Where(subNode => subNode.Name.Equals(typeof(T).FullName)))`
	`99`	`+ var subNodes = nodeElement.ChildNodes.Cast<XmlNode>()`
	`100`	`+ .Where(subNode => subNode.Name.Equals(typeof(T).FullName));`
	`101`	`+`
	`102`	`+ foreach (XmlNode subNode in subNodes)`
`102`	`103`	`{`
`103`	`104`	`var attrs = subNode.Attributes;`
`104`	`105`