Merge branch 'master' into 1.5

# Conflicts: # Source/Engine/Serialization/Stream.cpp
2022-11-21 15:51:57 +01:00
parent 1dfea17bce b139ebfe88
commit 93c0dd704e
62 changed files with 391 additions and 351 deletions
--- a/Source/Tools/Flax.Build/Projects/VisualStudioCode/VisualStudioCodeProjectGenerator.cs
+++ b/Source/Tools/Flax.Build/Projects/VisualStudioCode/VisualStudioCodeProjectGenerator.cs
@@ -569,6 +569,7 @@ namespace Flax.Build.Projects.VisualStudioCode
                json.AddField("jake.autoDetect", "off");
                json.AddField("grunt.autoDetect", "off");
                json.AddField("omnisharp.defaultLaunchSolution", solution.Name + ".sln");
+                json.AddField("omnisharp.useModernNet", false);
                json.EndObject();

                // Folders