Integrating latest from github/staging

Integrating up through commit 5e1bdae
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
@@ -61,7 +61,7 @@ namespace AZ
                rapidjson::StringBuffer& scratchBuffer);

            static void SetupLogging(AZStd::string& scratchBuffer, JsonSerializationResult::JsonIssueCallback& callback,
-                const AzFramework::CommandLine& commandLine);
+                const AZ::CommandLine& commandLine);
            static JsonSerializationResult::ResultCode VerboseLogging(AZStd::string& scratchBuffer, AZStd::string_view message,
                JsonSerializationResult::ResultCode result, AZStd::string_view target);
            static AZ::JsonSerializationResult::ResultCode SimpleLogging(AZStd::string& scratchBuffer, AZStd::string_view message,