Dgs/unity 6 update

.yamato/project.metafile

@@ -47,7 +47,7 @@ projects:
   - name: dedicatedgameserver
     path: Experimental/DedicatedGameServer
     test_editors:
-      - 2023.3.0a17
+      - 6000.0.3
     run_editor_tests: !!bool false
     run_playmode_tests: !!bool true
     test_filter: Unity.DedicatedGameServerSample.Tests

Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs

@@ -36,7 +36,7 @@ public class BuildProcessor : IPreprocessBuildWithReport, IPostprocessBuildWithR
         /// <param name="report">The generated build report.</param>
         public void OnPreprocessBuild(BuildReport report)
         {
-            AssetDatabase.SaveAssets();
+            DisableBurstCompiler();
             ApplyChangesToMetagameApplication();
 
             string definesString = PlayerSettings.GetScriptingDefineSymbols(NamedBuildTarget.FromBuildTargetGroup(EditorUserBuildSettings.selectedBuildTargetGroup));
@@ -55,12 +55,22 @@ public void OnPreprocessBuild(BuildReport report)
             PlayerSettings.SetScriptingDefineSymbols(NamedBuildTarget.FromBuildTargetGroup(EditorUserBuildSettings.selectedBuildTargetGroup), string.Join(";", allDefines.ToArray()));
         }
 
+        void DisableBurstCompiler()
+        {
+            //unfortunately we can't use burst compilation due to a 
+            //bug in its latest version, so we need to disable it.
+            //It annoyingly re-enables every time you switch platform...
+            Burst.BurstCompiler.Options.EnableBurstCompilation = false;
+            AssetDatabase.SaveAssets();
+        }
+
         /// <summary>
         /// Called at the end of the build process
         /// </summary>
         /// <param name="report">The generated build report.</param>
         public void OnPostprocessBuild(BuildReport report)
         {
+            DisableBurstCompiler();
             RevertChangesToMetagameApplication();
             string definesString = PlayerSettings.GetScriptingDefineSymbols(NamedBuildTarget.FromBuildTargetGroup(EditorUserBuildSettings.selectedBuildTargetGroup));
             List<string> allDefines = definesString.Split(';').ToList();
@@ -130,15 +140,14 @@ MetagameApplication FindMetagameAppInProject()
 
         internal static void BuildServer(BuildTarget target, string locationPathName, bool exitApplicationOnFailure = false)
         {
-            Debug.Log($"Building {target} server");
+            Debug.Log($"Building {target} server in {locationPathName}");
             EditorUserBuildSettings.SwitchActiveBuildTarget(NamedBuildTarget.Server, BuildTarget.StandaloneLinux64);
-            EditorMultiplayerRolesManager.SetMultiplayerRoleForBuildTarget(NamedBuildTarget.Server, MultiplayerRoleFlags.Server);
             var report = BuildPipeline.BuildPlayer(new BuildPlayerOptions
             {
                 scenes = GetScenePaths(),
                 locationPathName = locationPathName,
                 target = target,
-                subtarget = (int) StandaloneBuildSubtarget.Server,
+                subtarget = (int)StandaloneBuildSubtarget.Server,
             });
             if (exitApplicationOnFailure && report.summary.result != BuildResult.Succeeded)
             {
@@ -148,16 +157,15 @@ internal static void BuildServer(BuildTarget target, string locationPathName, bo
 
         internal static void BuildClient(BuildTarget target, string locationPathName, bool exitApplicationOnFailure = false)
         {
-            Debug.Log($"Building {target} client");
+            Debug.Log($"Building {target} client in {locationPathName}");
 
             EditorUserBuildSettings.SwitchActiveBuildTarget(NamedBuildTarget.Standalone, target);
-            EditorMultiplayerRolesManager.SetMultiplayerRoleForBuildTarget(NamedBuildTarget.Standalone, MultiplayerRoleFlags.Client);
             var report = BuildPipeline.BuildPlayer(new BuildPlayerOptions
             {
                 scenes = GetScenePaths(),
                 locationPathName = locationPathName,
                 target = target,
-                subtarget = (int) StandaloneBuildSubtarget.Player,
+                subtarget = (int)StandaloneBuildSubtarget.Player,
             });
             if (exitApplicationOnFailure && report.summary.result != BuildResult.Succeeded)
             {

Experimental/DedicatedGameServer/Assets/Scripts/Editor/com.unity.sample.dedicated-server.editor.asmdef

@@ -8,7 +8,8 @@
         "Unity.Networking.Transport",
         "Unity.EditorCoroutines.Editor",
         "Unity.DedicatedServer.MultiplayerRoles",
-        "Unity.DedicatedServer.MultiplayerRoles.Editor"
+        "Unity.DedicatedServer.MultiplayerRoles.Editor",
+        "Unity.Burst"
     ],
     "includePlatforms": [
         "Editor"

Experimental/DedicatedGameServer/Assets/UI Toolkit/GameMenuView/GameMenuViewPanelSettings.asset

@@ -13,6 +13,7 @@ MonoBehaviour:
   m_Name: GameMenuViewPanelSettings
   m_EditorClassIdentifier: 
   themeUss: {fileID: -4733365628477956816, guid: 2798018c7901adf47b47c3e251c0d36b, type: 3}
+  m_DisableNoThemeWarning: 0
   m_TargetTexture: {fileID: 0}
   m_RenderMode: 0
   m_WorldSpaceLayer: 0
@@ -40,4 +41,6 @@ MonoBehaviour:
   m_AtlasBlitShader: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0}
   m_RuntimeShader: {fileID: 9100, guid: 0000000000000000f000000000000000, type: 0}
   m_RuntimeWorldShader: {fileID: 9102, guid: 0000000000000000f000000000000000, type: 0}
+  m_ICUDataAsset: {fileID: 0}
+  forceGammaRendering: 0
   textSettings: {fileID: 0}

Experimental/DedicatedGameServer/Assets/UI Toolkit/MatchView/MatchViewPanelSettings.asset

@@ -13,6 +13,7 @@ MonoBehaviour:
   m_Name: MatchViewPanelSettings
   m_EditorClassIdentifier: 
   themeUss: {fileID: -4733365628477956816, guid: 2798018c7901adf47b47c3e251c0d36b, type: 3}
+  m_DisableNoThemeWarning: 0
   m_TargetTexture: {fileID: 0}
   m_RenderMode: 0
   m_WorldSpaceLayer: 0
@@ -40,4 +41,6 @@ MonoBehaviour:
   m_AtlasBlitShader: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0}
   m_RuntimeShader: {fileID: 9100, guid: 0000000000000000f000000000000000, type: 0}
   m_RuntimeWorldShader: {fileID: 9102, guid: 0000000000000000f000000000000000, type: 0}
+  m_ICUDataAsset: {fileID: 0}
+  forceGammaRendering: 0
   textSettings: {fileID: 0}

Experimental/DedicatedGameServer/Assets/UniversalRenderPipelineGlobalSettings.asset

@@ -49,9 +49,13 @@ MonoBehaviour:
       - rid: 889817428941602829
       - rid: 889817428941602830
       - rid: 889817428941602831
+      - rid: 7796461650670780416
+      - rid: 7796461650670780417
+      - rid: 7796461650670780418
+      - rid: 7796461650670780419
     m_RuntimeSettings:
       m_List: []
-  m_AssetVersion: 6
+  m_AssetVersion: 8
   m_ObsoleteDefaultVolumeProfile: {fileID: 0}
   m_RenderingLayerNames:
   - Default
@@ -78,8 +82,9 @@ MonoBehaviour:
       type: {class: UniversalRenderPipelineRuntimeShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
         m_Version: 0
-        m_CoreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3}
+        m_FallbackErrorShader: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
         m_BlitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3}
+        m_CoreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3}
         m_CoreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3}
         m_SamplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
     - rid: 889817428941602817
@@ -100,6 +105,7 @@ MonoBehaviour:
         m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3}
         m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
         m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
+        m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
     - rid: 889817428941602819
       type: {class: URPDefaultVolumeProfileSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
@@ -137,7 +143,7 @@ MonoBehaviour:
       type: {class: RenderGraphSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
         m_Version: 0
-        m_UseRenderGraph: 0
+        m_EnableRenderCompatibilityMode: 0
     - rid: 889817428941602824
       type: {class: UniversalRendererResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
@@ -203,3 +209,33 @@ MonoBehaviour:
       data:
         m_Version: 1
         m_ProbeVolumeDisableStreamingAssets: 0
+    - rid: 7796461650670780416
+      type: {class: RenderGraphUtilsResources, ns: UnityEngine.Rendering.RenderGraphModule.Util, asm: Unity.RenderPipelines.Core.Runtime}
+      data:
+        m_Version: 0
+        m_CoreCopyPS: {fileID: 4800000, guid: 12dc59547ea167a4ab435097dd0f9add, type: 3}
+    - rid: 7796461650670780417
+      type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
+      data:
+        m_Version: 1
+        dilationShader: {fileID: 7200000, guid: 6bb382f7de370af41b775f54182e491d, type: 3}
+        subdivideSceneCS: {fileID: 7200000, guid: bb86f1f0af829fd45b2ebddda1245c22, type: 3}
+        voxelizeSceneShader: {fileID: 4800000, guid: c8b6a681c7b4e2e4785ffab093907f9e, type: 3}
+        traceVirtualOffsetCS: {fileID: 7200000, guid: 805f10d263aac4b4098c0279cd37a4f3, type: 3}
+        traceVirtualOffsetRT: {fileID: 4807578003741378534, guid: b60511f4aa1443f4d8c0b18f4fec92f4, type: 3}
+        skyOcclusionCS: {fileID: 7200000, guid: 798f52ec82fa04048a12826bbbbcf7b4, type: 3}
+        skyOcclusionRT: {fileID: 4807578003741378534, guid: dfaf42b38dd001f49a72d8102b709f29, type: 3}
+        renderingLayerCS: {fileID: 7200000, guid: a63c9cf933e3d8f41ae680a372784ebf, type: 3}
+        renderingLayerRT: {fileID: 4807578003741378534, guid: c2be09c936362eb49a58f08aeb30627a, type: 3}
+    - rid: 7796461650670780418
+      type: {class: RenderGraphGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
+      data:
+        m_version: 0
+        m_EnableCompilationCaching: 1
+        m_EnableValidityChecks: 1
+    - rid: 7796461650670780419
+      type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
+      data:
+        m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}
+        m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3}
+        m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3}

Experimental/DedicatedGameServer/Packages/manifest.json

@@ -1,23 +1,24 @@
 {
   "dependencies": {
     "com.unity.ai.navigation": "2.0.0",
-    "com.unity.cinemachine": "2.9.7",
-    "com.unity.dedicated-server": "1.0.0",
-    "com.unity.ide.rider": "3.0.26",
+    "com.unity.burst": "1.8.15",
+    "com.unity.cinemachine": "2.10.0",
+    "com.unity.dedicated-server": "1.1.0",
+    "com.unity.ide.rider": "3.0.28",
     "com.unity.ide.visualstudio": "2.0.22",
-    "com.unity.inputsystem": "1.8.0-pre.2",
+    "com.unity.inputsystem": "1.8.2",
     "com.unity.learn.iet-framework": "3.1.3",
     "com.unity.learn.iet-framework.authoring": "1.2.2",
-    "com.unity.multiplayer.playmode": "1.0.0",
+    "com.unity.multiplayer.playmode": "1.1.0",
     "com.unity.multiplayer.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.3.0",
     "com.unity.multiplayer.tools": "2.1.0",
-    "com.unity.netcode.gameobjects": "1.8.0",
-    "com.unity.render-pipelines.universal": "17.0.1",
+    "com.unity.netcode.gameobjects": "1.9.1",
+    "com.unity.render-pipelines.universal": "17.0.3",
     "com.unity.services.matchmaker": "1.1.2",
-    "com.unity.services.multiplay": "1.0.5",
-    "com.unity.test-framework": "1.4.0",
+    "com.unity.services.multiplay": "1.1.0",
+    "com.unity.test-framework": "1.4.4",
     "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.6",
-    "com.unity.transport": "2.0.2",
+    "com.unity.transport": "2.1.0",
     "com.unity.modules.animation": "1.0.0"
   }
 }