Publish version 3.0.5

packages/com.vrchat.avatars/Editor/VRCSDK/SDK3A/VRC.SDK3A.Editor.asmdef

@@ -3,7 +3,8 @@
     "references": [
         "VRC.SDK3A",
         "VRC.SDKBase.Editor",
-        "VRC.SDKBase"
+        "VRC.SDKBase",
+        "VRC.Enums.Validation.Performance"
     ],
     "includePlatforms": [
         "Editor"

packages/com.vrchat.avatars/Editor/VRCSDK/SDK3A/VRCSdkControlPanelAvatarBuilder3A.cs

@@ -4,6 +4,7 @@
 using UnityEditor;
 using UnityEditor.Animations;
 using UnityEngine;
+using VRC.Editor;
 using VRC.SDKBase.Editor;
 using VRC.SDK3.Avatars;
 using VRC.SDK3.Avatars.Components;
@@ -320,7 +321,7 @@ bool ValidateNonBoolParam(string name)
             // delete PipelineSaver(s) from the list of the Components we will destroy now
             foreach (Component c in toRemoveSilently)
             {
-                componentsToRemove.Remove(c);
+                    componentsToRemove.Remove(c);
             }
 
             HashSet<string> componentsToRemoveNames = new HashSet<string>();
@@ -408,11 +409,11 @@ bool ValidateNonBoolParam(string name)
                         break;
                     case AvatarPerformanceCategory.MaterialCount:
                         show = GetAvatarSubSelectAction(avatar,
-                            new[] { typeof(MeshRenderer), typeof(SkinnedMeshRenderer) });
+                            new[] {typeof(MeshRenderer), typeof(SkinnedMeshRenderer)});
                         break;
                     case AvatarPerformanceCategory.MeshCount:
                         show = GetAvatarSubSelectAction(avatar,
-                            new[] { typeof(MeshRenderer), typeof(SkinnedMeshRenderer) });
+                            new[] {typeof(MeshRenderer), typeof(SkinnedMeshRenderer)});
                         break;
                     case AvatarPerformanceCategory.ParticleCollisionEnabled:
                         show = GetAvatarSubSelectAction(avatar, typeof(ParticleSystem));
@@ -437,7 +438,7 @@ bool ValidateNonBoolParam(string name)
                         break;
                     case AvatarPerformanceCategory.PolyCount:
                         show = GetAvatarSubSelectAction(avatar,
-                            new[] { typeof(MeshRenderer), typeof(SkinnedMeshRenderer) });
+                            new[] {typeof(MeshRenderer), typeof(SkinnedMeshRenderer)});
                         break;
                     case AvatarPerformanceCategory.SkinnedMeshCount:
                         show = GetAvatarSubSelectAction(avatar, typeof(SkinnedMeshRenderer));
@@ -504,9 +505,9 @@ public override void OnGUIAvatar(VRC_AvatarDescriptor avatar)
             GUILayout.Label("Offline Testing", VRCSdkControlPanel.infoGuiStyle);
             if (GUI.enabled)
             {
-                GUILayout.Label(
-                    "Before uploading your avatar you may build and test it in the VRChat client. Other users will not able to see the test avatar.",
-                    VRCSdkControlPanel.infoGuiStyle);
+            GUILayout.Label(
+                "Before uploading your avatar you may build and test it in the VRChat client. Other users will not able to see the test avatar.",
+                VRCSdkControlPanel.infoGuiStyle);
             }
             else
             {
@@ -542,7 +543,7 @@ public override void OnGUIAvatar(VRC_AvatarDescriptor avatar)
 
             EditorGUILayout.Separator();
 
-            EditorGUILayout.BeginVertical(VRCSdkControlPanel.boxGuiStyle);
+                       EditorGUILayout.BeginVertical(VRCSdkControlPanel.boxGuiStyle);
             EditorGUILayout.BeginHorizontal();
 
             EditorGUILayout.BeginVertical(GUILayout.Width(300));

packages/com.vrchat.avatars/package.json

@@ -1,11 +1,11 @@
 {
   "name": "com.vrchat.avatars",
   "displayName": "VRChat SDK - Avatars",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "unity": "2019.4",
   "description": "Our powerful Avatars 3.0 System",
   "gitDependencies": {
-    "com.vrchat.base": "https://github.com/vrchat/packages.git?path=/packages/com.vrchat.base#3.0.4"
+    "com.vrchat.base": "https://github.com/vrchat/packages.git?path=/packages/com.vrchat.base#3.0.5"
   },
   "author": {
     "name": "VRChat",
@@ -18,7 +18,7 @@
   "legacyFiles": {
     "ProjectVersion.txt": ""
   },
-  "url": "https://github.com/vrchat/packages.git?path=/packages/com.vrchat.avatars#3.0.4",
+  "url": "https://github.com/vrchat/packages.git?path=/packages/com.vrchat.avatars#3.0.5",
   "samples": [
     {
       "displayName": "AV3 Demo Assets",

packages/com.vrchat.base/Editor/VRCSDK/Dependencies/VRChat/ControlPanel/VRCSdkControlPanel.cs

@@ -1,6 +1,7 @@
 using UnityEditor;
 using UnityEngine;
 using VRC.Core;
+using VRC.Editor;
 using VRC.SDKBase.Editor;
 
 [ExecuteInEditMode]

packages/com.vrchat.base/Editor/VRCSDK/Dependencies/VRChat/ControlPanel/VRCSdkControlPanelAvatarBuilder.cs

@@ -6,6 +6,7 @@
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.Networking;
+using VRC.Editor;
 using VRC.SDKBase.Editor.BuildPipeline;
 using VRC.SDKBase.Editor.Validation;
 using VRC.SDKBase.Validation.Performance;

packages/com.vrchat.base/Editor/VRCSDK/Dependencies/VRChat/ControlPanel/VRCSdkControlPanelWorldBuilder.cs

@@ -7,6 +7,7 @@
 using UnityEditor.SceneManagement;
 using UnityEngine.Networking;
 using UnityEngine.SceneManagement;
+using VRC.Editor;
 using VRC.SDKBase.Editor.Validation;
 using Object = UnityEngine.Object;
 

packages/com.vrchat.base/Editor/VRCSDK/Dependencies/VRChat/EnvConfig.cs

@@ -11,6 +11,8 @@
 using VRC.SDKBase.Validation.Performance.Stats;
 using Object = UnityEngine.Object;
 
+namespace VRC.Editor
+{
 /// <summary>
 /// Setup up SDK env on editor launch
 /// </summary>
@@ -190,7 +192,7 @@ private static void EditorUpdate()
         }
     }
 
-    public static void RequestConfigureSettings()
+        private static void RequestConfigureSettings()
     {
         _requestConfigureSettings = true;
     }
@@ -201,7 +203,7 @@ private static void DidReloadScripts()
         RequestConfigureSettings();
     }
 
-    public static bool ConfigureSettings()
+        private static bool ConfigureSettings()
     {
         CheckForFirstInit();
 
@@ -383,7 +385,7 @@ private static void EnableBatching(bool enable)
             return;
         }
 
-        SerializedObject playerSettingsSerializedObject = new SerializedObject(playerSettings.Cast<UnityEngine.Object>().ToArray());
+            SerializedObject playerSettingsSerializedObject = new SerializedObject(playerSettings.Cast<Object>().ToArray());
         SerializedProperty batchingSettings = playerSettingsSerializedObject.FindProperty("m_BuildTargetBatching");
         if(batchingSettings == null)
         {
@@ -447,15 +449,13 @@ public static void SetVRSDKs(BuildTargetGroup buildTargetGroup, string[] sdkName
         }
     }
 
-    public static bool CheckForFirstInit()
+    private static void CheckForFirstInit()
     {
         bool firstLaunch = SessionState.GetBool("EnvConfigFirstLaunch", true);
         if(firstLaunch)
         {
             SessionState.SetBool("EnvConfigFirstLaunch", false);
         }
-
-        return firstLaunch;
     }
 
     private static void SetDefaultGraphicsAPIs()
@@ -956,6 +956,12 @@ private static void SetPlayerSettings()
         #else
         PlayerSettings.Android.targetSdkVersion = AndroidSdkVersions.AndroidApiLevel26;
         #endif
+
+        #if VRC_VR_OCULUS
+#pragma warning disable CS0618
+        PlayerSettings.VROculus.v2Signing = true;
+#pragma warning restore CS0618
+        #endif
 #else
         PlayerSettings.SetAdditionalIl2CppArgs("");
 #endif
@@ -1035,10 +1041,10 @@ private static void SetBuildTarget()
         #endif
     }
 
-    private static void ConfigureAssets()
+    public static void ConfigureAssets(bool forStandaloneBuild = false)
     {
 #if VRC_CLIENT
-        VRC.UI.Client.Editor.VRCUIManagerEditorHelpers.ConfigureNewUIAssets();
+        VRC.UI.Client.Editor.VRCUIManagerEditorHelpers.ConfigureNewUIAssets(forStandaloneBuild);
 #endif
     }
 
@@ -1077,7 +1083,8 @@ public FogSettings(FogStrippingMode fogStrippingMode, bool keepLinear, bool keep
         }
     }
 
-    private static readonly Dictionary<string, object>[] _graphicsPresets = {
+        private static readonly Dictionary<string, object>[] _graphicsPresets =
+        {
         new Dictionary<string, object>
         {
             {"name", "Low"},
@@ -1270,3 +1277,4 @@ public FogSettings(FogStrippingMode fogStrippingMode, bool keepLinear, bool keep
         }
     };
 }
+}

packages/com.vrchat.base/Editor/VRCSDK/Dependencies/VRChat/Validation/Performance/SDKPerformanceDisplay.cs

@@ -772,7 +772,7 @@ public static class SDKPerformanceDisplay
                 }
                 case AvatarPerformanceCategory.PhysBoneComponentCount:
                 {
-                    switch (rating)
+                    switch(rating)
                     {
                         case PerformanceRating.Excellent:
                         case PerformanceRating.Good:
@@ -811,7 +811,7 @@ public static class SDKPerformanceDisplay
                 }
                 case AvatarPerformanceCategory.PhysBoneTransformCount:
                 {
-                    switch (rating)
+                    switch(rating)
                     {
                         case PerformanceRating.Excellent:
                         case PerformanceRating.Good:
@@ -851,7 +851,7 @@ public static class SDKPerformanceDisplay
                 }
                 case AvatarPerformanceCategory.PhysBoneColliderCount:
                 {
-                    switch (rating)
+                    switch(rating)
                     {
                         case PerformanceRating.Excellent:
                         case PerformanceRating.Good:
@@ -890,7 +890,7 @@ public static class SDKPerformanceDisplay
                 }
                 case AvatarPerformanceCategory.PhysBoneCollisionCheckCount:
                 {
-                    switch (rating)
+                    switch(rating)
                     {
                         case PerformanceRating.Excellent:
                         case PerformanceRating.Good:
@@ -929,7 +929,7 @@ public static class SDKPerformanceDisplay
                 }
                 case AvatarPerformanceCategory.ContactCount:
                 {
-                    switch (rating)
+                    switch(rating)
                     {
                         case PerformanceRating.Excellent:
                         case PerformanceRating.Good:

packages/com.vrchat.base/Editor/VRCSDK/VRC.SDKBase.Editor.asmdef

@@ -1,7 +1,8 @@
 {
     "name": "VRC.SDKBase.Editor",
     "references": [
-        "VRC.SDKBase"
+        "VRC.SDKBase",
+        "VRC.Enums.Validation.Performance"
     ],
     "includePlatforms": [
         "Editor"

packages/com.vrchat.base/Runtime/VRCSDK/Dependencies/VRChat/Scripts/ApiFileHelper.cs

@@ -1361,7 +1361,7 @@ private bool UploadFileComponentValidateFileDesc(ApiFile apiFile, string filenam
                 apiFile.StartSimpleUpload(fileDescriptorType,
                     (c) =>
                     {
-                        uploadUrl = (c as ApiDictContainer).ResponseDictionary["url"] as string;
+                        uploadUrl = (c as ApiDictContainer).ResponseDictionary["url"].ToString();
                         wait = false;
                     },
                     (c) =>
@@ -1619,7 +1619,7 @@ private bool UploadFileComponentValidateFileDesc(ApiFile apiFile, string filenam
                     apiFile.StartMultipartUpload(fileDescriptorType, partNumber,
                         (c) =>
                         {
-                            uploadUrl = (c as ApiDictContainer).ResponseDictionary["url"] as string;
+                            uploadUrl = (c as ApiDictContainer).ResponseDictionary["url"].ToString();
                             wait = false;
                         },
                         (c) =>

packages/com.vrchat.base/Runtime/VRCSDK/Dependencies/VRChat/Scripts/RuntimeWorldCreation.cs

@@ -179,10 +179,9 @@ void GetUserUploadInformationAndSetupUI(string worldId)
                         {
                             try
                             {
-                                Dictionary<string, object> publish = c as Dictionary<string, object>;
-                                if (publish["canPublish"] is bool)
+                                if (c["canPublish"].Type == BestHTTP.JSON.Json.TokenType.Boolean)
                                 {
-                                    HasExceededPublishLimit = !(bool)(publish["canPublish"]);
+                                    HasExceededPublishLimit = !(bool)(c["canPublish"]);
                                 }
                                 else
                                     HasExceededPublishLimit = true;

packages/com.vrchat.base/Runtime/VRCSDK/VRC.SDKBase.asmdef

@@ -1,7 +1,8 @@
 {
     "name": "VRC.SDKBase",
     "references": [
-        "Unity.Timeline"
+        "Unity.Timeline",
+        "VRC.Enums.Validation.Performance"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

packages/com.vrchat.base/package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.vrchat.base",
   "displayName": "VRChat SDK - Base",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "unity": "2019.4",
   "description": "Base for VRChat SDK",
   "vrchatVersion": "2022.1.1",
@@ -10,7 +10,7 @@
     "email": "developer@vrchat.com",
     "url": "https://github.com/vrchat/packages"
   },
-  "url": "https://github.com/vrchat/packages.git?path=/packages/com.vrchat.base#3.0.4",
+  "url": "https://github.com/vrchat/packages.git?path=/packages/com.vrchat.base#3.0.5",
   "dependencies": {
     "com.unity.burst": "1.4.11",
     "com.unity.mathematics": "1.2.5"