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
@@ -12,7 +12,7 @@

 #pragma once

-#include <AzToolsFramework/Application/ToolsApplication.h>
+#include <AzCore/Component/ComponentApplication.h>
 #include <AzCore/IO/Path/Path.h>

 namespace AZ
@@ -20,10 +20,10 @@ namespace AZ
    namespace SerializeContextTools
    {
        class Application final
-            : public AzToolsFramework::ToolsApplication
+            : public AZ::ComponentApplication
        {
        public:
-            Application(int* argc, char*** argv);
+            Application(int argc, char** argv);
            ~Application() override = default;
            
            const char* GetConfigFilePath() const;