Skip to content

Commit e25350f

Browse files
author
Unity Technologies
committed
Unity 2023.3.0b4 C# reference source code
1 parent 7c95a72 commit e25350f

File tree

67 files changed

+2841
-388
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+2841
-388
lines changed

‎Editor/IncrementalBuildPipeline/BeeBuildProgramCommon.Data/BeeBuildProgramCommon.Data.gen.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Microsoft.NET.Sdk">
2+
<Project>
3+
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
34
<PropertyGroup>
45
<AssemblyName>BeeBuildProgramCommon.Data</AssemblyName>
56
<TargetFramework>netstandard2.1</TargetFramework>
@@ -12,4 +13,5 @@
1213
<ItemGroup>
1314
<Compile Include="Data.cs" />
1415
</ItemGroup>
16+
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
1517
</Project>

‎Editor/IncrementalBuildPipeline/PlayerBuildProgramLibrary.Data/PlayerBuildProgramLibrary.Data.gen.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Microsoft.NET.Sdk">
2+
<Project>
3+
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
34
<PropertyGroup>
45
<AssemblyName>PlayerBuildProgramLibrary.Data</AssemblyName>
56
<TargetFramework>netstandard2.1</TargetFramework>
@@ -14,4 +15,5 @@
1415
<Compile Include="Data.cs" />
1516
<ProjectReference Include="../BeeBuildProgramCommon.Data/BeeBuildProgramCommon.Data.gen.csproj" />
1617
</ItemGroup>
18+
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
1719
</Project>

‎Editor/IncrementalBuildPipeline/ScriptCompilationBuildProgram.Data/ScriptCompilationBuildProgram.Data.gen.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Microsoft.NET.Sdk">
2+
<Project>
3+
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
34
<PropertyGroup>
45
<AssemblyName>ScriptCompilationBuildProgram.Data</AssemblyName>
56
<TargetFramework>netstandard2.1</TargetFramework>
@@ -13,4 +14,5 @@
1314
<Compile Include="Data.cs" />
1415
<ProjectReference Include="../BeeBuildProgramCommon.Data/BeeBuildProgramCommon.Data.gen.csproj" />
1516
</ItemGroup>
17+
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
1618
</Project>

‎Editor/Mono/Animation/TransitionPreview.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ private void ResampleTransition(AnimatorStateTransition transition, AvatarMask l
284284
hasStarted = true;
285285
}
286286

287-
if (hasTransitioned || currentTime >= maxDuration)
287+
if (hasTransitioned && currentTime >= maxDuration)
288288
{
289289
hasFinished = true;
290290
}

‎Editor/Mono/AssemblyInfo/AssemblyInfo.cs

Lines changed: 154 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,157 @@
1313
// You can start by moving them to EditorCoreModuleAssemblyInfo.cs to reduce internal visibility
1414
// To remove a line in there, the target assembly must not depend on _any_ internal API from built-in Editor modules
1515

16+
17+
// ADD_NEW_PLATFORM_HERE
18+
[assembly: InternalsVisibleTo("Unity.LiveNotes")]
19+
[assembly: InternalsVisibleTo("Unity.Audio.Tests")]
20+
[assembly: InternalsVisibleTo("Unity.Burst")]
21+
[assembly: InternalsVisibleTo("Unity.Burst.Editor")]
22+
[assembly: InternalsVisibleTo("Unity.Cloud.Collaborate.Editor")]
23+
[assembly: InternalsVisibleTo("Unity.CollabProxy.Editor")]
24+
[assembly: InternalsVisibleTo("Unity.CollabProxy.EditorTests")]
25+
[assembly: InternalsVisibleTo("Unity.CollabProxy.UI")]
26+
[assembly: InternalsVisibleTo("Unity.CollabProxy.UI.Tests")]
27+
[assembly: InternalsVisibleTo("Unity.CollabProxy.Client")]
28+
[assembly: InternalsVisibleTo("Unity.CollabProxy.Client.Tests")]
29+
[assembly: InternalsVisibleTo("UnityEditor.Advertisements")]
30+
[assembly: InternalsVisibleTo("Unity.PackageManager")]
31+
[assembly: InternalsVisibleTo("Unity.PackageManagerStandalone")]
32+
[assembly: InternalsVisibleTo("Unity.AndroidBuildPipeline")]
33+
[assembly: InternalsVisibleTo("Unity.Automation")]
34+
[assembly: InternalsVisibleTo("UnityEngine.Common")]
35+
[assembly: InternalsVisibleTo("Unity.PureCSharpTests")]
36+
[assembly: InternalsVisibleTo("Unity.IntegrationTests")]
37+
[assembly: InternalsVisibleTo("Unity.DeploymentTests.Services")]
38+
[assembly: InternalsVisibleTo("Unity.IntegrationTests.ExternalVersionControl")]
39+
[assembly: InternalsVisibleTo("Unity.IntegrationTests.UnityAnalytics")]
40+
[assembly: InternalsVisibleTo("Unity.PerformanceIntegrationTests")]
41+
[assembly: InternalsVisibleTo("Unity.Timeline.Editor")]
42+
[assembly: InternalsVisibleTo("Unity.PackageManagerUI.Develop.Editor")]
43+
[assembly: InternalsVisibleTo("Unity.DeviceSimulator.Editor")]
44+
[assembly: InternalsVisibleTo("Unity.Timeline.EditorTests")]
45+
[assembly: InternalsVisibleTo("UnityEditor.Graphs")]
46+
[assembly: InternalsVisibleTo("UnityEditor.UWP.Extensions")]
47+
[assembly: InternalsVisibleTo("UnityEditor.iOS.Extensions.Common")]
48+
[assembly: InternalsVisibleTo("UnityEditor.iOS.Extensions")]
49+
[assembly: InternalsVisibleTo("UnityEditor.VisionOS.Extensions")]
50+
[assembly: InternalsVisibleTo("UnityEditor.AppleTV.Extensions")]
51+
[assembly: InternalsVisibleTo("UnityEditor.Android.Extensions")]
52+
[assembly: InternalsVisibleTo("UnityEditor.XboxOne.Extensions")]
53+
[assembly: InternalsVisibleTo("UnityEditor.PS4.Extensions")]
54+
[assembly: InternalsVisibleTo("UnityEditor.PS5.Extensions")]
55+
[assembly: InternalsVisibleTo("UnityEditor.Switch.Extensions")]
56+
[assembly: InternalsVisibleTo("UnityEditor.WebGL.Extensions")]
57+
[assembly: InternalsVisibleTo("Unity.WebGL.Extensions")]
58+
[assembly: InternalsVisibleTo("UnityEditor.LinuxStandalone.Extensions")]
59+
[assembly: InternalsVisibleTo("UnityEditor.CloudRendering.Extensions")]
60+
[assembly: InternalsVisibleTo("UnityEditor.EmbeddedLinux.Extensions")]
61+
[assembly: InternalsVisibleTo("UnityEditor.QNX.Extensions")]
62+
[assembly: InternalsVisibleTo("UnityEditor.WindowsStandalone.Extensions")]
63+
[assembly: InternalsVisibleTo("UnityEditor.OSXStandalone.Extensions")]
64+
[assembly: InternalsVisibleTo("UnityEditor.Lumin.Extensions")]
65+
[assembly: InternalsVisibleTo("UnityEditor.GameCoreScarlett.Extensions")]
66+
[assembly: InternalsVisibleTo("UnityEditor.GameCoreXboxOne.Extensions")]
67+
[assembly: InternalsVisibleTo("UnityEditor.GameCoreCommon.Extensions")]
68+
[assembly: InternalsVisibleTo("UnityEditor.Networking")]
69+
[assembly: InternalsVisibleTo("UnityEngine.Networking")]
70+
[assembly: InternalsVisibleTo("Unity.Analytics.Editor")]
71+
[assembly: InternalsVisibleTo("UnityEditor.Analytics")]
72+
[assembly: InternalsVisibleTo("UnityEditor.Purchasing")]
73+
[assembly: InternalsVisibleTo("UnityEditor.Lumin")]
74+
[assembly: InternalsVisibleTo("UnityEditor.Switch.Extensions")]
75+
[assembly: InternalsVisibleTo("UnityEditor.EditorTestsRunner")]
76+
[assembly: InternalsVisibleTo("UnityEditor.TestRunner")]
77+
[assembly: InternalsVisibleTo("UnityEditor.TestRunner.Tests")]
78+
[assembly: InternalsVisibleTo("Unity.Compiler.Client")]
79+
[assembly: InternalsVisibleTo("ExternalCSharpCompiler")]
80+
[assembly: InternalsVisibleTo("UnityEngine.TestRunner")]
81+
[assembly: InternalsVisibleTo("UnityEditor.VR")]
82+
[assembly: InternalsVisibleTo("Unity.RuntimeTests")]
83+
[assembly: InternalsVisibleTo("Unity.RuntimeTests.Framework")]
84+
[assembly: InternalsVisibleTo("Assembly-CSharp-Editor-firstpass-testable")]
85+
[assembly: InternalsVisibleTo("Assembly-CSharp-Editor-testable")]
86+
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
87+
[assembly: InternalsVisibleTo("UnityEditor.InteractiveTutorialsFramework")]
88+
[assembly: InternalsVisibleTo("UnityEditor.Networking")]
89+
[assembly: InternalsVisibleTo("UnityEditor.UI")]
90+
[assembly: InternalsVisibleTo("UnityEditor.AR")]
91+
[assembly: InternalsVisibleTo("UnityEditor.SpatialTracking")]
92+
[assembly: InternalsVisibleTo("Unity.WindowsMRAutomation")]
93+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridge.001")]
94+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridge.002")]
95+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridge.003")]
96+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridge.004")]
97+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridge.005")]
98+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridge.006")]
99+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridge.007")]
100+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridge.008")]
101+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridge.009")]
102+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridge.010")]
103+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridge.011")]
104+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridge.012")]
105+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridge.013")]
106+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridge.014")]
107+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridge.015")]
108+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridge.016")]
109+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridge.017")]
110+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridge.018")]
111+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridge.019")]
112+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridge.020")]
113+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridge.021")]
114+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridge.022")]
115+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridge.023")]
116+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridge.024")]
117+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridgeDev.001")]
118+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridgeDev.002")]
119+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridgeDev.003")]
120+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridgeDev.004")]
121+
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridgeDev.005")]
122+
[assembly: InternalsVisibleTo("Unity.XR.Remoting.Editor")]
123+
[assembly: InternalsVisibleTo("UnityEngine.Common")]
124+
[assembly: InternalsVisibleTo("Unity.UI.Builder.Editor")]
125+
[assembly: InternalsVisibleTo("UnityEditor.UIElements.Tests.Tests")] // for UI Test Framework
126+
[assembly: InternalsVisibleTo("UnityEditor.UIBuilderModule")]
127+
[assembly: InternalsVisibleTo("Unity.UI.Builder.EditorTests")]
128+
[assembly: InternalsVisibleTo("Unity.GraphViewTestUtilities.Editor")]
129+
[assembly: InternalsVisibleTo("Unity.ProBuilder.Editor")]
130+
[assembly: InternalsVisibleTo("Unity.2D.Sprite.Editor")]
131+
[assembly: InternalsVisibleTo("Unity.2D.Sprite.EditorTests")]
132+
[assembly: InternalsVisibleTo("Unity.2D.Tilemap.Editor")]
133+
[assembly: InternalsVisibleTo("Unity.2D.Tilemap.EditorTests")]
134+
[assembly: InternalsVisibleTo("Unity.PackageCleanConsoleTest.Editor")]
135+
[assembly: InternalsVisibleTo("Unity.TextCore.Editor.Tests")]
136+
[assembly: InternalsVisibleTo("UnityEditor.TextCoreTextEngineModule")]
137+
[assembly: InternalsVisibleTo("Unity.TextMeshPro.Editor")]
138+
[assembly: InternalsVisibleTo("Unity.Animation.Editor.AnimationWindow")]
139+
[assembly: InternalsVisibleTo("Unity.VisualEffectGraph.Editor")]
140+
[assembly: InternalsVisibleTo("Unity.Testing.VisualEffectGraph.EditorTests")]
141+
[assembly: InternalsVisibleTo("Unity.VisualEffectGraph.EditorTests")]
142+
[assembly: InternalsVisibleTo("Unity.RenderPipelines.Multiple_SRP.EditorTests")]
143+
144+
[assembly: InternalsVisibleTo("Unity.SceneTemplate.Editor")]
145+
[assembly: InternalsVisibleTo("com.unity.purchasing.udp.Editor")]
146+
[assembly: InternalsVisibleTo("com.unity.search.extensions.editor")]
147+
148+
[assembly: InternalsVisibleTo("UnityEditor.Android.Extensions")]
149+
150+
[assembly: InternalsVisibleTo("Unity.Entities.Build")]
151+
152+
[assembly: InternalsVisibleTo("Unity.Scenes")]
153+
154+
// This should move with the AnimationWindow to a module at some point
155+
[assembly: InternalsVisibleTo("UnityEditor.Modules.Animation.tests.AnimationWindow")]
156+
157+
[assembly: InternalsVisibleTo("UnityEditor.Modules.Physics.Tests")]
158+
159+
[assembly: InternalsVisibleTo("UnityEditor.Switch.Tests")]
160+
161+
[assembly: InternalsVisibleTo("UnityEditor.BuildProfileModule.Tests")]
162+
163+
[assembly: InternalsVisibleTo("UnityEditor.PS4.Tests")]
164+
165+
[assembly: InternalsVisibleTo("UnityEditor.PS5.Tests")]
166+
167+
[assembly: InternalsVisibleTo("Unity.Automation.Players.EmbeddedLinux")]
168+
[assembly: InternalsVisibleTo("Unity.Automation.Players.QNX")]
169+

‎Editor/Mono/EditorGUI.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3996,7 +3996,8 @@ internal static int DoPopup(Rect position, int controlID, int selected, GUIConte
39963996
}
39973997
else
39983998
{
3999-
buttonContent = popupValues[selected];
3999+
buttonContent = new GUIContent(popupValues[selected]);
4000+
buttonContent.text = EditorUtility.ParseMenuName(buttonContent.text);
40004001
}
40014002

40024003
Event evt = Event.current;
@@ -4025,7 +4026,7 @@ internal static int DoPopup(Rect position, int controlID, int selected, GUIConte
40254026
}
40264027

40274028
PopupCallbackInfo.instance = new PopupCallbackInfo(controlID);
4028-
EditorUtility.DisplayCustomMenu(position, popupValues, checkEnabled, showMixedValue ? -1 : selected, PopupCallbackInfo.instance.SetEnumValueDelegate, null);
4029+
EditorUtility.DisplayCustomMenu(position, popupValues, checkEnabled, showMixedValue ? -1 : selected, PopupCallbackInfo.instance.SetEnumValueDelegate, null, true);
40294030
GUIUtility.keyboardControl = controlID;
40304031
evt.Use();
40314032
}

‎Editor/Mono/EditorUserBuildSettingsEmbeddedLinux.deprecated.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public enum EmbeddedLinuxArchitecture
2828
public partial class EditorUserBuildSettings
2929
{
3030
#pragma warning disable 0618
31-
[Obsolete("EditorUserBuildSettings.selectedEmbeddedLinuxArchitecture is deprecated. EmbeddedLinux.Settings.architecture instead. (UnityUpgradable) -> UnityEditor.EmbeddedLinux.Settings.architecture", false)]
31+
[Obsolete("EditorUserBuildSettings.selectedEmbeddedLinuxArchitecture is deprecated. EmbeddedLinux.Settings.architecture instead. (UnityUpgradable) -> [UnityEditor.EmbeddedLinux.Extensions] UnityEditor.EmbeddedLinux.Settings.architecture", false)]
3232
public static extern EmbeddedLinuxArchitecture selectedEmbeddedLinuxArchitecture
3333
{
3434
[NativeMethod("GetSelectedEmbeddedLinuxArchitecture")]

‎Editor/Mono/EditorUserBuildSettingsQNX.deprecated.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public enum QNXArchitecture
2828

2929
public partial class EditorUserBuildSettings
3030
{
31-
[Obsolete("EditorUserBuildSettings.selectedQnxOsVersion is deprecated. Use QNX.Settings.osVersion instead. (UnityUpgradable) -> UnityEditor.QNX.Settings.osVersion", false)]
31+
[Obsolete("EditorUserBuildSettings.selectedQnxOsVersion is deprecated. Use QNX.Settings.osVersion instead. (UnityUpgradable) -> [UnityEditor.QNX.Extensions] UnityEditor.QNX.Settings.osVersion", false)]
3232
public static extern QNXOsVersion selectedQnxOsVersion
3333
{
3434
[NativeMethod("GetSelectedQNXOsVersion")]
@@ -38,7 +38,7 @@ public static extern QNXOsVersion selectedQnxOsVersion
3838
}
3939

4040
#pragma warning disable 0618
41-
[Obsolete("EditorUserBuildSettings.selectedQnxArchitecture is deprecated. Use QNX.Settings.architecture instead. (UnityUpgradable) -> UnityEditor.QNX.Settings.architecture", false)]
41+
[Obsolete("EditorUserBuildSettings.selectedQnxArchitecture is deprecated. Use QNX.Settings.architecture instead. (UnityUpgradable) -> [UnityEditor.QNX.Extensions] UnityEditor.QNX.Settings.architecture", false)]
4242
public static extern QNXArchitecture selectedQnxArchitecture
4343
{
4444
[NativeMethod("GetSelectedQNXArchitecture")]

‎Editor/Mono/GUI/DockArea.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,11 +1242,9 @@ internal static bool WindowMaximizeStateOnDoubleClick(Rect rect)
12421242
EditorWindow.focusedWindow.maximized = maximize;
12431243
InternalEditorUtility.RepaintAllViews();
12441244
}
1245-
return EditorWindow.focusedWindow.maximized;
12461245
}
12471246

1248-
// Return false in case there is no current focused window
1249-
return false;
1247+
return EditorWindow.focusedWindow.maximized;
12501248
}
12511249
}
12521250

‎Editor/Mono/GUI/HexColorTextField.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ internal static Color32 DoHexColorTextField(int id, Rect rect, Color32 color, bo
4646

4747
if (EndChangeCheck())
4848
{
49+
newHex = newHex.Trim();
4950
s_RecycledEditor.text = s_RecycledEditor.text.ToUpper();
5051
if (newHex.Length > 0)
5152
{

‎Editor/Mono/Help.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,6 @@ internal static string GetHelpURLForObject(Object obj, bool defaultToMonoBehavio
186186
if (attrs.Length > 0)
187187
{
188188
var attr = (HelpURLAttribute)attrs[0];
189-
if (attrs.Length > 1)
190-
Debug.LogWarningFormat("Multiple HelpURL attributes detected on <i>{0}</i>; only one is supported per class. <i>{1}</i> will be used.", obj.GetType().Name, attr.GetType().Name);
191-
192189
var url = attr.URL;
193190
if (!string.IsNullOrEmpty(attr.m_DispatchingFieldName))
194191
{

‎Editor/Mono/Inspector/Core/GenericInspector.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ public override VisualElement CreateInspectorGUI()
402402

403403
UIElements.InspectorElement.FillDefaultInspector(root, serializedObject, this);
404404

405-
if (target is MonoBehaviour behaviour && AudioUtil.HasAudioCallback(behaviour))
405+
if (target is MonoBehaviour behaviour && behaviour != null && AudioUtil.HasAudioCallback(behaviour))
406406
{
407407
root.Add(new OnAudioFilterReadLevelMeter(behaviour));
408408
}

0 commit comments

Comments
 (0)