From 35500981ebcee1c344b995b4f281963dbfe3c69f Mon Sep 17 00:00:00 2001
From: karlberg <karlberg@amazon.com>
Date: Tue, 11 May 2021 16:36:44 -0700
Subject: [PATCH] More removal fixes

---
 .../Components/TransformComponent.cpp            |  2 ++
 .../Code/Tests/Builders/LevelBuilderTest.cpp     | 16 ++++++++++++++++
 Gems/PhysX/Code/Tests/PhysXTestCommon.h          |  1 +
 3 files changed, 19 insertions(+)

diff --git a/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp b/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp
index 284df15eb9..3c05887a89 100644
--- a/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp
@@ -878,6 +878,8 @@ namespace AzFramework
         AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection);
         if (serializeContext)
         {
+            serializeContext->ClassDeprecate("NetBindable", "{80206665-D429-4703-B42E-94434F82F381}");
+
             serializeContext->Class<TransformComponent, AZ::Component>()
                 ->Version(4, &TransformComponentVersionConverter)
                 ->Field("Parent", &TransformComponent::m_parentId)
diff --git a/Gems/LmbrCentral/Code/Tests/Builders/LevelBuilderTest.cpp b/Gems/LmbrCentral/Code/Tests/Builders/LevelBuilderTest.cpp
index 47d24f09f4..58e7e9e093 100644
--- a/Gems/LmbrCentral/Code/Tests/Builders/LevelBuilderTest.cpp
+++ b/Gems/LmbrCentral/Code/Tests/Builders/LevelBuilderTest.cpp
@@ -309,6 +309,22 @@ TEST_F(LevelBuilderTest, DynamicSlice_NoAssetReferences_HasNoProductDependencies
     ASSERT_EQ(productPathDependencies.size(), 0);
 }
 
+TEST_F(LevelBuilderTest, DynamicSlice_HasAssetReference_HasCorrectProductDependency)
+{
+    LevelBuilderWorker worker;
+    AZStd::vector<AssetBuilderSDK::ProductDependency> productDependencies;
+    ProductPathDependencySet productPathDependencies;
+
+    AZStd::string filePath(GetTestFileAliasedPath("levelSlice_oneAssetRef.entities_xml"));
+    ASSERT_TRUE(AZ::IO::FileIOBase::GetInstance()->Exists(filePath.c_str()));
+
+    worker.PopulateLevelSliceDependenciesHelper(filePath, productDependencies, productPathDependencies);
+    ASSERT_EQ(productPathDependencies.size(), 0);
+    ASSERT_EQ(productDependencies.size(), 1);
+    ASSERT_EQ(productDependencies[0].m_dependencyId.m_guid, AZ::Uuid("A8970A25-5043-5519-A927-F180E7D6E8C1"));
+    ASSERT_EQ(productDependencies[0].m_dependencyId.m_subId, 1);
+}
+
 void BuildSliceWithSimpleAssetReference(const AZStd::vector<AZStd::string>& filePaths, AZStd::vector<AssetBuilderSDK::ProductDependency>& productDependencies, ProductPathDependencySet& productPathDependencies)
 {
     auto* assetComponent = aznew MockSimpleAssetRefComponent;
diff --git a/Gems/PhysX/Code/Tests/PhysXTestCommon.h b/Gems/PhysX/Code/Tests/PhysXTestCommon.h
index c4d08953eb..d130cccf9f 100644
--- a/Gems/PhysX/Code/Tests/PhysXTestCommon.h
+++ b/Gems/PhysX/Code/Tests/PhysXTestCommon.h
@@ -15,6 +15,7 @@
 #include <AzCore/Asset/AssetCommon.h>
 #include <AzCore/std/containers/vector.h>
 #include <AzCore/std/smart_ptr/shared_ptr.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
 
 #include <AzFramework/Physics/Material.h>
 #include <AzFramework/Physics/Common/PhysicsTypes.h>