From cd72916838399024d5aef8d27e5c1c6a82ca904c Mon Sep 17 00:00:00 2001 From: Wojciech Figat Date: Mon, 10 Jan 2022 15:20:42 +0100 Subject: [PATCH] Adjust mono dependency build branching for git --- .../Tools/Flax.Build/Deps/Dependencies/mono.cs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/mono.cs b/Source/Tools/Flax.Build/Deps/Dependencies/mono.cs index 1576399b7..42bb1a9c7 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/mono.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/mono.cs @@ -484,10 +484,6 @@ namespace Flax.Deps.Dependencies if (string.IsNullOrEmpty(localRepoPath)) CloneGitRepo(root, "https://github.com/FlaxEngine/mono.git", null, "--recursive"); - // Pick a proper branch - GitCheckout(root, "flax-master-5-20"); - GitResetLocalChanges(root); - // Get the default preprocessor defines for Mono on Windows-based platforms { var monoProps = new XmlDocument(); @@ -498,6 +494,18 @@ namespace Flax.Deps.Dependencies foreach (var platform in options.Platforms) { + // Pick a proper branch + var monoBranch = "flax-master-5-20"; + switch (platform) + { + case TargetPlatform.Switch: + case TargetPlatform.Mac: + monoBranch = "flax-master-6-4"; + break; + } + GitCheckout(root, monoBranch); + GitResetLocalChanges(root); + switch (platform) { case TargetPlatform.Windows: