Integrating github/staging through commit ab87ed9

Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp

@@ -33,6 +33,7 @@
 #include <AzToolsFramework/ToolsComponents/ToolsAssetCatalogComponent.h>
 #include <AzToolsFramework/AssetBrowser/AssetBrowserComponent.h>
 #include <AzToolsFramework/SourceControl/PerforceComponent.h>
+#include <AzToolsFramework/Prefab/PrefabSystemComponent.h>
 
 namespace AssetProcessor
 {
@@ -153,6 +154,7 @@ AZ::ComponentTypeList AssetProcessorAZApplication::GetRequiredSystemComponents()
     }
 
     components.push_back(azrtti_typeid<AzToolsFramework::PerforceComponent>());
+    components.push_back(azrtti_typeid<AzToolsFramework::Prefab::PrefabSystemComponent>());
 
     return components;
 }
@@ -508,7 +510,6 @@ bool ApplicationManager::StartAZFramework()
     AZ::ComponentApplication::StartupParameters params;
 
     QString projectName = AssetUtilities::ComputeProjectName();
-    AZ::SettingsRegistryInterface& registry = *AZ::SettingsRegistry::Get();
 
     // Prevent loading of gems in the Create method of the ComponentApplication
     params.m_loadDynamicModules = false;

Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp

@@ -11,6 +11,7 @@
 */
 #include "ApplicationManagerBase.h"
 
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/std/smart_ptr/make_shared.h>
 #include <AzCore/std/sort.h>
 
@@ -1592,10 +1593,9 @@ void ApplicationManagerBase::BuilderLogV(const AZ::Uuid& builderId, const char*
 
     if (m_builderDescMap.find(builderId) != m_builderDescMap.end())
     {
-        const AssetBuilderSDK::AssetBuilderDesc& builderDesc = m_builderDescMap[builderId];
         char messageBuffer[1024];
         azvsnprintf(messageBuffer, 1024, message, list);
-        AZ_TracePrintf(AssetProcessor::ConsoleChannel, "Builder name : %s Message : %s.\n", builderDesc.m_name.c_str(), messageBuffer);
+        AZ_TracePrintf(AssetProcessor::ConsoleChannel, "Builder name : %s Message : %s.\n", m_builderDescMap[builderId].m_name.c_str(), messageBuffer);
     }
     else
     {
@@ -1691,7 +1691,7 @@ bool ApplicationManagerBase::CheckSufficientDiskSpace(const QString& savePath, q
     }
 
     qint64 bytesFree = 0;
-    bool result = AzToolsFramework::ToolsFileUtils::GetFreeDiskSpace(savePath, bytesFree);
+    [[maybe_unused]] bool result = AzToolsFramework::ToolsFileUtils::GetFreeDiskSpace(savePath, bytesFree);
 
     AZ_Assert(result, "Unable to determine the amount of free space on drive containing path (%s).", savePath.toUtf8().constData());
     
@@ -1717,7 +1717,15 @@ void ApplicationManagerBase::RemoveOldTempFolders()
         return;
     }
 
-    QString startFolder = rootDir.absolutePath();
+    QString startFolder;
+    if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
+    {
+        if (AZ::IO::Path userPath; settingsRegistry->Get(userPath.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_ProjectUserPath))
+        {
+            startFolder = QString::fromUtf8(userPath.c_str(), aznumeric_cast<int>(userPath.Native().size()));
+        }
+    }
+
     QDir root;
     if (!AssetUtilities::CreateTempRootFolder(startFolder, root))
     {

Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.cpp

@@ -1521,10 +1521,10 @@ namespace AssetProcessor
     //! Given a scan folder path, get its complete info
     const AssetProcessor::ScanFolderInfo* PlatformConfiguration::GetScanFolderByPath(const QString& scanFolderPath) const
     {
-        QString normalized = AssetUtilities::NormalizeFilePath(scanFolderPath);
+        AZ::IO::Path scanFolderPathView(scanFolderPath.toUtf8().constData());
         for (int pathIdx = 0; pathIdx < m_scanFolders.size(); ++pathIdx)
         {
-            if (QString::compare(m_scanFolders[pathIdx].ScanPath(), normalized, Qt::CaseSensitive) == 0)
+            if (AZ::IO::PathView(m_scanFolders[pathIdx].ScanPath().toUtf8().constData()) == scanFolderPathView)
             {
                 return &m_scanFolders[pathIdx];
             }

Code/Tools/AssetProcessor/native/utilities/assetUtils.cpp

@@ -1478,7 +1478,14 @@ to ensure that the address is correct. Asset Processor won't be running in serve
             return false;
         }
 #endif
-        return AzToolsFramework::AssetUtils::UpdateFilePathToCorrectCase(rootPath, relativePathFromRoot);
+
+        AZStd::string relPathFromRoot = relativePathFromRoot.toUtf8().constData();
+        if(AzToolsFramework::AssetUtils::UpdateFilePathToCorrectCase(rootPath.toUtf8().constData(), relPathFromRoot))
+        {
+            relativePathFromRoot = QString::fromUtf8(relPathFromRoot.c_str(), aznumeric_cast<int>(relPathFromRoot.size()));
+            return true;
+        }
+        return false;
     }
 
     BuilderFilePatternMatcher::BuilderFilePatternMatcher(const AssetBuilderSDK::AssetBuilderPattern& pattern, const AZ::Uuid& builderDescID)