Merge branch 'main' into Atom/moudgils/AutomatedTestingNullRHI

Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeBitset.h

@@ -115,7 +115,7 @@ namespace AzNetworking
 
         ContainerType m_container;
 
-        template <AZStd::size_t, typename ElementType>
+        template <AZStd::size_t, typename>
         friend class FixedSizeVectorBitset;
     };
 }

Gems/Atom/RPI/Code/Source/RPI.Builders/ResourcePool/ResourcePoolBuilder.cpp

@@ -45,7 +45,7 @@ namespace AZ
             AssetBuilderSDK::AssetBuilderDesc builderDescriptor;
 
             builderDescriptor.m_name = "Atom Resource Pool Asset Builder";
-            builderDescriptor.m_version = 1;
+            builderDescriptor.m_version = 2; //ATOM-15196 
             builderDescriptor.m_patterns.emplace_back(AssetBuilderSDK::AssetBuilderPattern(AZStd::string("*.") + s_sourcePoolAssetExt,
                 AssetBuilderSDK::AssetBuilderPattern::PatternType::Wildcard));
             builderDescriptor.m_busId = azrtti_typeid<ResourcePoolBuilder>();

Gems/Multiplayer/Code/Tests/MultiplayerSystemTests.cpp

@@ -97,6 +97,10 @@ namespace UnitTest
         m_mpComponent->OnConnect(&connMock2);
 
         EXPECT_EQ(m_connectionAcquiredCount, 25);
+
+        // Clean up connection data
+        m_mpComponent->OnDisconnect(&connMock1, AzNetworking::DisconnectReason::None, AzNetworking::TerminationEndpoint::Local);
+        m_mpComponent->OnDisconnect(&connMock2, AzNetworking::DisconnectReason::None, AzNetworking::TerminationEndpoint::Local);
     }
 }