Merge remote-tracking branch 'upstream/master' into lowlevel-networking

Source/ThirdParty/mono-2.0/mono.Build.cs

@@ -87,7 +87,7 @@ public class mono : DepsModule
             options.Libraries.Add(Path.Combine(depsRoot, "libmonosgen-2.0.so"));
             break;
         case TargetPlatform.Switch:
-            // TODO: mono for Switch
+            options.OutputFiles.Add(Path.Combine(depsRoot, "libmonosgen-2.0.a"));
             break;
         default: throw new InvalidPlatformException(options.Platform.Target);
         }

Source/ThirdParty/rapidjson/document.h

@@ -1648,6 +1648,7 @@ public:
     //@{
 
     const Ch* GetString() const { RAPIDJSON_ASSERT(IsString()); return (data_.f.flags & kInlineStrFlag) ? data_.ss.str : GetStringPointer(); }
+	::StringAnsiView GetStringAnsiView() const { RAPIDJSON_ASSERT(IsString()); return data_.f.flags & kInlineStrFlag ? ::StringAnsiView(data_.ss.str, data_.ss.GetLength()) : ::StringAnsiView(GetStringPointer(), data_.s.length); }
 	::String GetText() const
     {
         ::String result;

Source/ThirdParty/tracy/tracy.Build.cs

@@ -33,6 +33,8 @@ public class tracy : ThirdPartyModule
         options.SourceFiles.Add(Path.Combine(FolderPath, "TracyClient.cpp"));
 
         options.PublicDefinitions.Add("TRACY_ENABLE");
+        if (options.Platform.Target == TargetPlatform.Windows)
+            options.PrivateDefinitions.Add("TRACY_DBGHELP_LOCK=DbgHelp");
     }
 
     /// <inheritdoc />