Upstream merge fixes

Assets/NuGet/Editor/NugetPreferences.cs

@@ -12,7 +12,7 @@ public static class NugetPreferences
 		/// <summary>
 		/// The current version of NuGet for Unity.
 		/// </summary>
-		public const string NuGetForUnityVersion = "1.1.9";
+		public const string NuGetForUnityVersion = "1.2.0";
 
 		/// <summary>
 		/// The current position of the scroll bar in the GUI.

Assets/NuGet/Editor/NugetWindow.cs

@@ -798,11 +798,11 @@ private void DrawPackage(NugetPackage package, GUIStyle packageStyle, GUIStyle c
 				using (new EditorGUILayout.HorizontalScope())
 				{
 					const int iconSize = 32;
-					var padding = EditorStyles.label.padding.vertical;
+					var padding = 5;
 					var rect = GUILayoutUtility.GetRect(iconSize, iconSize);
 					// only use GetRect's Y position.  It doesn't correctly set the width, height or X position.
 					rect.x = padding;
-					rect.y += padding;
+					rect.y += 3;
 					rect.width = iconSize;
 					rect.height = iconSize;
 
@@ -815,8 +815,8 @@ private void DrawPackage(NugetPackage package, GUIStyle packageStyle, GUIStyle c
 						GUI.DrawTexture(rect, defaultIcon, ScaleMode.StretchToFill);
 					}
 
-					rect = GUILayoutUtility.GetRect(position.width / 2 - (iconSize + leftPadding), 20);
-					rect.x = iconSize + leftPadding;
+					rect = GUILayoutUtility.GetRect(position.width / 2 - (iconSize + padding), 20);
+					rect.x = iconSize + padding;
 					rect.y += 10;
 
 					EditorStyles.label.fontStyle = FontStyle.Bold;