Integrating up through commit 90f050496

2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
@@ -12,6 +12,7 @@

 #pragma once

+#include <AzCore/IO/Path/Path.h>
 #include <AzCore/std/containers/unordered_map.h>
 #include <AzCore/std/containers/vector.h>
 #include <AzCore/std/string/string.h>
@@ -27,7 +28,7 @@ namespace UnitTest
        InstanceData& operator=(const InstanceData& other);

        AZStd::string m_name;
-        AZStd::string m_source;
+        AZ::IO::Path m_source;
        AzToolsFramework::Prefab::PrefabDom m_patches;
    };

@@ -36,7 +37,7 @@ namespace UnitTest
        AzToolsFramework::Prefab::TemplateId m_id = AzToolsFramework::Prefab::InvalidTemplateId;
        bool m_isValid = true;
        bool m_isLoadedWithErrors = false;
-        AZStd::string m_filePath;
+        AZ::IO::Path m_filePath;
        AZStd::unordered_map<AZStd::string, InstanceData> m_instancesData;
    };