Merge commit 'dbc5d7a8bc5404b80fbc38b6b004aaa1f9e06df9' into junbo/gitflow_211123_o3de

Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp

@@ -376,7 +376,7 @@ namespace AzToolsFramework::Prefab
         size_t index = 0;
         size_t maxIndex = m_instanceFocusHierarchy.size() - 1;
 
-        for (const AZ::EntityId containerEntityId : m_instanceFocusHierarchy)
+        for (const AZ::EntityId& containerEntityId : m_instanceFocusHierarchy)
         {
             InstanceOptionalReference instance = GetReferenceFromContainerEntityId(containerEntityId);
             if (instance.has_value())
@@ -414,7 +414,7 @@ namespace AzToolsFramework::Prefab
             return;
         }
         
-        for (const AZ::EntityId containerEntityId : instances)
+        for (const AZ::EntityId& containerEntityId : instances)
         {
             InstanceOptionalReference instance = GetReferenceFromContainerEntityId(containerEntityId);
 
@@ -433,7 +433,7 @@ namespace AzToolsFramework::Prefab
             return;
         }
 
-        for (const AZ::EntityId containerEntityId : instances)
+        for (const AZ::EntityId& containerEntityId : instances)
         {
             InstanceOptionalReference instance = GetReferenceFromContainerEntityId(containerEntityId);
 

scripts/build/Platform/Windows/build_config.json

@@ -359,7 +359,7 @@
     "PARAMETERS": {
         "CONFIGURATION": "profile",
         "OUTPUT_DIRECTORY": "build\\windows_vs2019",
-        "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_DISABLE_TEST_MODULES=TRUE -DLY_VERSION_ENGINE_NAME=o3de-sdk -DLY_VERSION_STRING=!O3DE_VERSION! -DLY_INSTALLER_WIX_ROOT=\"!WIX! \"",
+        "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_DISABLE_TEST_MODULES=TRUE -DLY_VERSION_ENGINE_NAME=o3de-sdk -DLY_INSTALLER_WIX_ROOT=\"!WIX! \"",
         "EXTRA_CMAKE_OPTIONS": "-DLY_INSTALLER_AUTO_GEN_TAG=TRUE -DLY_INSTALLER_DOWNLOAD_URL=!INSTALLER_DOWNLOAD_URL! -DLY_INSTALLER_LICENSE_URL=!INSTALLER_DOWNLOAD_URL!/license",
         "CMAKE_TARGET": "ALL_BUILD",
         "CPACK_OPTIONS": "-D CPACK_UPLOAD_URL=\"!CPACK_UPLOAD_URL!\"",