From 4e362a2a04557b2c859df38ee020331820cee47b Mon Sep 17 00:00:00 2001
From: lumberyard-employee-dm
 <56135373+lumberyard-employee-dm@users.noreply.github.com>
Date: Tue, 25 May 2021 20:09:13 -0500
Subject: [PATCH] Removing the initialization of the "@root@" alias to the
 EngineRoot since it really represents the Asset Cache Root and any paths
 within it are lowercased. Moved the ordering to set the @assets@ alias before
 the @projectplatformcache@ so that the
 "ArchiveTestFixture.IResourceList_Add_AbsolutePath_RemovesAndReplacesWithAlias"
 test is able to convert it's absolute path to an alias path that starts with
 @assets@

---
 .../AzFramework/AzFramework/Application/Application.cpp        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Code/Framework/AzFramework/AzFramework/Application/Application.cpp b/Code/Framework/AzFramework/AzFramework/Application/Application.cpp
index b8014bc399..c65ba373f8 100644
--- a/Code/Framework/AzFramework/AzFramework/Application/Application.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Application/Application.cpp
@@ -679,7 +679,6 @@ namespace AzFramework
         {
             auto fileIoBase = m_archiveFileIO.get();
             // Set up the default file aliases based on the settings registry
-            fileIoBase->SetAlias("@root@", GetEngineRoot());
             fileIoBase->SetAlias("@engroot@", GetEngineRoot());
             fileIoBase->SetAlias("@projectroot@", GetEngineRoot());
             fileIoBase->SetAlias("@exefolder@", GetExecutableFolder());
@@ -693,8 +692,8 @@ namespace AzFramework
                 pathAliases.clear();
                 if (m_settingsRegistry->Get(pathAliases.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_CacheRootFolder))
                 {
-                    fileIoBase->SetAlias("@projectplatformcache@", pathAliases.c_str());
                     fileIoBase->SetAlias("@assets@", pathAliases.c_str());
+                    fileIoBase->SetAlias("@projectplatformcache@", pathAliases.c_str());
                     fileIoBase->SetAlias("@root@", pathAliases.c_str()); // Deprecated Use @projectplatformcache@
                 }
                 pathAliases.clear();