Unity 2017.4.17f1 C# reference source code

Unity Technologies · Unity Technologies · commit 397f7250c7a9 · 2018-12-07T15:51:37.000Z
diff --git a/Editor/Mono/BuildPlayerWindow.cs b/Editor/Mono/BuildPlayerWindow.cs
@@ -858,7 +858,8 @@ private static void GUIBuildButtons(IBuildWindowExtension buildWindowExtension,
 
             GUIContent buildButton = styles.build;
             if (platform.targetGroup == BuildTargetGroup.Android
-                && EditorUserBuildSettings.exportAsGoogleAndroidProject)
+                && EditorUserBuildSettings.exportAsGoogleAndroidProject
+                && EditorUserBuildSettings.androidBuildSystem != AndroidBuildSystem.Internal)
                 buildButton = styles.export;
 
             // Build Button
diff --git a/Editor/Mono/BuildPlayerWindowBuildMethods.cs b/Editor/Mono/BuildPlayerWindowBuildMethods.cs
@@ -308,10 +308,11 @@ static bool PickBuildLocation(BuildTargetGroup targetGroup, BuildTarget target,
                 }
 
 
-                // When exporting Eclipse project, we're saving a folder, not file,
+                // When exporting Gradle or VS project, we're saving a folder, not file,
                 // deal with it separately:
                 if (target == BuildTarget.Android
-                    && EditorUserBuildSettings.exportAsGoogleAndroidProject)
+                    && EditorUserBuildSettings.exportAsGoogleAndroidProject
+                    && EditorUserBuildSettings.androidBuildSystem != AndroidBuildSystem.Internal)
                 {
                     var exportProjectTitle  = "Export Google Android Project";
                     var exportProjectFolder = EditorUtility.SaveFolderPanel(exportProjectTitle, previousPath, "");
@@ -324,6 +325,10 @@ static bool PickBuildLocation(BuildTargetGroup targetGroup, BuildTarget target,
                 }
 
                 string extension = PostprocessBuildPlayer.GetExtensionForBuildTarget(targetGroup, target, options);
+                // Invalidate default name, if extension mismatches the default file (for ex., when switching between folder type export to file type export, see Android)
+                if (extension != Path.GetExtension(defaultName).Replace(".", ""))
+                    defaultName = string.Empty;
+
                 string title = "Build " + BuildPlatforms.instance.GetBuildTargetDisplayName(targetGroup, target);
                 string path = EditorUtility.SaveBuildPanel(target, title, defaultFolder, defaultName, extension, out updateExistingBuild);
 
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## Unity 2017.4.16f1 C# reference source code
+## Unity 2017.4.17f1 C# reference source code
 
 The C# part of the Unity engine and editor source code.
 May be used for reference purposes only.
diff --git a/Runtime/Export/iOS/iOSDevice.bindings.cs b/Runtime/Export/iOS/iOSDevice.bindings.cs
@@ -54,6 +54,8 @@ public enum DeviceGeneration
         iPhoneXS        = 40,
         iPhoneXSMax     = 41,
         iPhoneXR        = 42,
+        iPadPro11Inch   = 43,
+        iPadPro3Gen     = 44,
 
         iPhoneUnknown       = 10001,
         iPadUnknown         = 10002,
diff --git a/Runtime/IMGUI/Managed/GUISkin.cs b/Runtime/IMGUI/Managed/GUISkin.cs
@@ -195,7 +195,19 @@ static internal void CleanupRoots()
         public GUISettings settings { get { return m_Settings; } }
 
         internal static GUIStyle ms_Error;
-        internal static GUIStyle error { get { if (ms_Error == null) ms_Error = new GUIStyle(); return ms_Error; } }
+
+        internal static GUIStyle error
+        {
+            get
+            {
+                if (ms_Error == null)
+                {
+                    ms_Error = new GUIStyle();
+                    ms_Error.name = "StyleNotFoundError";
+                }
+                return ms_Error;
+            }
+        }
 
         private Dictionary<string, GUIStyle> m_Styles = null;
 
@@ -312,7 +324,7 @@ public GUIStyle GetStyle(string styleName)
             GUIStyle s = FindStyle(styleName);
             if (s != null)
                 return s;
-            Debug.LogWarning("Unable to find style '" + styleName + "' in skin '" + name + "' " + Event.current.type);
+            Debug.LogWarning("Unable to find style '" + styleName + "' in skin '" + name + "' " + (Event.current != null ? Event.current.type.ToString() : "<called outside OnGUI>"));
             return error;
         }
 
diff --git a/artifacts/generated/common/editor/EditorBuildSettingsBindings.gen.cs b/artifacts/generated/common/editor/EditorBuildSettingsBindings.gen.cs
@@ -874,6 +874,16 @@ public extern static bool exportAsGoogleAndroidProject
         set;
     }
 
+    public extern static bool buildAppBundle
+    {
+        [UnityEngine.Scripting.GeneratedByOldBindingsGeneratorAttribute] // Temporarily necessary for bindings migration
+        [System.Runtime.CompilerServices.MethodImplAttribute((System.Runtime.CompilerServices.MethodImplOptions)0x1000)]
+        get;
+        [UnityEngine.Scripting.GeneratedByOldBindingsGeneratorAttribute] // Temporarily necessary for bindings migration
+        [System.Runtime.CompilerServices.MethodImplAttribute((System.Runtime.CompilerServices.MethodImplOptions)0x1000)]
+        set;
+    }
+
     public extern static bool symlinkLibraries
     {
         [UnityEngine.Scripting.GeneratedByOldBindingsGeneratorAttribute] // Temporarily necessary for bindings migration

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-## Unity 2017.4.16f1 C# reference source code`
	`1`	`+## Unity 2017.4.17f1 C# reference source code`
`2`	`2`
`3`	`3`	`The C# part of the Unity engine and editor source code.`
`4`	`4`	`May be used for reference purposes only.`