Integrating latest from github/staging

Integrating up through commit 5e1bdae

Gems/NvCloth/Code/CMakeLists.txt

@@ -39,7 +39,6 @@ ly_add_target(
 ly_add_target(
     NAME NvCloth ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
     NAMESPACE Gem
-    OUTPUT_NAME Gem.NvCloth.6ab53783d9f54c9e97a15ad729e7c182.v0.1.0
     FILES_CMAKE
         nvcloth_shared_files.cmake
     INCLUDE_DIRECTORIES
@@ -53,6 +52,8 @@ ly_add_target(
         PRIVATE
             Legacy::CryCommon
             Gem::NvCloth.Static
+    RUNTIME_DEPENDENCIES
+        Gem::LmbrCentral
 )
 
 if(PAL_TRAIT_BUILD_HOST_TOOLS)
@@ -80,9 +81,9 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
     )
 
     ly_add_target(
-        NAME NvCloth.Editor MODULE
+        NAME NvCloth.Editor GEM_MODULE
+
         NAMESPACE Gem
-        OUTPUT_NAME Gem.NvCloth.Editor.6ab53783d9f54c9e97a15ad729e7c182.v0.1.0
         FILES_CMAKE
             nvcloth_editor_shared_files.cmake
         INCLUDE_DIRECTORIES
@@ -96,6 +97,8 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
             PRIVATE
                 Legacy::CryCommon
                 Gem::NvCloth.Editor.Static
+        RUNTIME_DEPENDENCIES
+            Gem::LmbrCentral.Editor
     )
 endif()
 

Gems/NvCloth/Code/Tests/NvClothEditorTestEnvironment.cpp

@@ -51,8 +51,8 @@ namespace UnitTest
     void NvClothEditorTestEnvironment::AddGemsAndComponents()
     {
         AddDynamicModulePaths({
-            "Gem.LmbrCentral.Editor.ff06785f7145416b9d46fde39098cb0c.v0.1.0",
-            "Gem.EMotionFX.Editor.044a63ea67d04479aa5daf62ded9d9ca.v0.1.0"
+            "LmbrCentral.Editor",
+            "EMotionFX.Editor"
         });
 
         AddComponentDescriptors({

Gems/NvCloth/Code/Tests/NvClothTestEnvironment.cpp

@@ -45,8 +45,8 @@ namespace UnitTest
     void NvClothTestEnvironment::AddGemsAndComponents()
     {
         AddDynamicModulePaths({
-            "Gem.LmbrCentral.ff06785f7145416b9d46fde39098cb0c.v0.1.0",
-            "Gem.EMotionFX.044a63ea67d04479aa5daf62ded9d9ca.v0.1.0"
+            "LmbrCentral",
+            "EMotionFX"
         });
 
         AddComponentDescriptors({

Gems/NvCloth/Code/nvcloth_stub.cmake

@@ -25,7 +25,8 @@ add_library(Gem::NvCloth ALIAS NvCloth.Stub)
 
 if(PAL_TRAIT_BUILD_HOST_TOOLS)
     ly_add_target(
-        NAME NvCloth.Editor.Stub MODULE
+        NAME NvCloth.Editor.Stub GEM_MODULE
+
         NAMESPACE Gem
         FILES_CMAKE
             nvcloth_stub_files.cmake