Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -75,7 +75,8 @@ public: \
    void ConfigureSlots() override; \
    bool RequiresDynamicSlotOrdering() const override; \
    bool IsDeprecated() const override; \
-{% if deprecationUuid is defined %}NodeConfiguration GetReplacementNodeConfiguration() const override; \ {% endif %}
+{% if deprecationUuid is defined %}    NodeConfiguration GetReplacementNodeConfiguration() const override; \
+{% endif %}
    using Node::FindDatum; \
 {% if Class.attrib['GraphEntryPoint'] is defined %}    bool IsEntryPoint() const override { return {%if Class.attrib['GraphEntryPoint'] == True %}true{%else%}false{%endif%}; } \
 {% endif %}
@@ -176,10 +176,10 @@ bool {{ Class.attrib['QualifiedName'] }}::IsDeprecated() const

 {% set deprecationUuid = Class.attrib['DeprecationUUID'] %}
 {% if deprecationUuid is defined %}
-NodeConfiguration {{ Class.attrib['QualifiedName'] }}::GetReplacementNodeConfiguration() const
+ScriptCanvas::NodeConfiguration {{ Class.attrib['QualifiedName'] }}::GetReplacementNodeConfiguration() const
 {
    ScriptCanvas::NodeConfiguration nodeConfig{};
-    nodeConfig.m_type = AZ::Uuid({{ deprecationUuid }});
+    nodeConfig.m_type = AZ::Uuid("{{ deprecationUuid }}");
    {% if Class.attrib['ReplacementMethodName'] is defined %}
    nodeConfig.m_methodName = "{{Class.attrib['ReplacementMethodName']}}";
    {% endif %}
@@ -1274,7 +1274,6 @@ namespace ScriptCanvas
                if (classIter != behaviorContext->m_typeToClassMap.end())
                {
                    BehaviorContextObjectPtr sourceObjectPtr = (*AZStd::any_cast<BehaviorContextObjectPtr>(&source.m_storage));
-                    auto anyCastResult = AZStd::any_cast<BehaviorContextObjectPtr>(&m_storage);
                    BehaviorContextObjectPtr newObjectPtr = sourceObjectPtr->CloneObject((*classIter->second));
                    m_storage = AZStd::move(newObjectPtr);
                    BehaviorContextObjectPtr newSourceObjectPtr = (*AZStd::any_cast<BehaviorContextObjectPtr>(&m_storage));
@@ -119,7 +119,6 @@ namespace ScriptCanvas
        void AddMethodOutputSlot(const MethodOutputConfig& outputConfig)
        {
            const AZ::BehaviorMethod& method = outputConfig.config.m_method;
-            const AZ::BehaviorClass* bcClass = outputConfig.config.m_class;

            // check for checked operation
            if (auto checkOpAttribute = AZ::FindAttribute(AZ::ScriptCanvasAttributes::CheckedOperation, method.m_attributes))
@@ -1893,7 +1893,6 @@ namespace ScriptCanvas

        if (slotIter != m_slotIdIteratorCache.end())
        {
-            Slot* slot = &(*slotIter->second.m_slotIterator);
            
            if (slotIter->second.HasDatum())
            {
@@ -2562,13 +2561,14 @@ namespace ScriptCanvas

        for (Slot& slot : m_slots)
        {
-            if (slot.IsDynamicSlot())
+            if (!slot.IsUserAdded() && slot.IsDynamicSlot())
            {
                AZ::Crc32 group = slot.GetDynamicGroup();

                if (group == AZ::Crc32())
                {
                    auto connectedDisplayType = FindConnectedConcreteDisplayType(slot, exploredGroupCache);
+
                    if (!connectedDisplayType.IsValid())
                    {
                        slot.ClearDisplayType();
@@ -975,7 +975,7 @@ protected:
        virtual void OnInputSignal(const SlotId& /*slot*/) {}

        //! Signal sent once the OwningScriptCanvasId is set.
-        virtual void OnGraphSet() {};
+        virtual void OnGraphSet() {}

        //! Signal sent when a Dynamic Group Display type is changed
        void SignalSlotDisplayTypeChanged(const SlotId& slotId, const Data::Type& dataType);
@@ -368,6 +368,7 @@ namespace ScriptCanvas

        void NodeableNodeOverloaded::CheckHasSingleOuts()
        {
+#if defined(AZ_ENABLE_TRACING)
            auto& slotExecutionMap = *GetSlotExecutionMap();

            auto& ins = slotExecutionMap.GetIns();
@@ -378,6 +379,7 @@ namespace ScriptCanvas
                // TODO: Append debugging information
                AZ_Error("ScriptCanvas", in.outs.size() <= 1, "Unable to resolve Overloaded Nodeable with multiple outs for a single method.");
            }
+#endif
        }

        void NodeableNodeOverloaded::UpdateSlotDisplay()
@@ -449,7 +451,6 @@ namespace ScriptCanvas
                NodeableMethodOverloadContractInterface* contractInterface = aznew NodeableMethodOverloadContractInterface((*this), methodIndex);
                m_methodOverloadContractInterface.emplace_back(contractInterface);

-                const OverloadConfiguration& baseConfiguration = (*m_methodConfigurations.begin());

                const auto& currentIn = executionIns[methodIndex];

@@ -867,9 +868,6 @@ namespace ScriptCanvas
            {
                if (outputDataIter->second.contains(dataType))
                {
-                    const OverloadConfiguration& overloadConfiguration = m_methodConfigurations[methodIndex];
-                    size_t startIndex = NodeableNodeOverloadedCpp::AdjustForHiddenNodeableThisPointer(overloadConfiguration, 0);
-
                    DataIndexMapping inputMapping;
                    DataIndexMapping outputMapping;

@@ -840,7 +840,6 @@ namespace ScriptCanvas
        }

        AZ::Outcome<void, AZStd::string> failureReason;
-        bool contractsAllowType = true;

        for (const auto& contract : m_contracts)
        {
@@ -170,7 +170,8 @@ namespace ScriptCanvas
                parameters.push_back(bvp);
            }

-            for (const auto& entityId : runtimeData.m_input.m_entityIds)
+            const size_t entityIdSize = runtimeData.m_input.m_entityIds.size();
+            for (size_t i = 0; i < entityIdSize; ++i)
            {
                AZ::BehaviorValueParameter bvp;
                bvp.m_typeId = azrtti_typeid<Data::EntityIDType>();
@@ -412,7 +412,7 @@ namespace ScriptCanvas
            AZ_Assert(lua_isuserdata(lua, -2) && !lua_islightuserdata(lua, -2), "Error in compiled lua file, 1st argument to OverrideNodeableMetatable is not userdata (Nodeable)");
            AZ_Assert(lua_istable(lua, -1), "Error in compiled lua file, 2nd argument to OverrideNodeableMetatable is not a Lua table");

-            auto userData = reinterpret_cast<AZ::LuaUserData*>(lua_touserdata(lua, -2));
+            [[maybe_unused]] auto userData = reinterpret_cast<AZ::LuaUserData*>(lua_touserdata(lua, -2));
            AZ_Assert(userData && userData->magicData == AZ_CRC_CE("AZLuaUserData"), "this isn't user data");
            // Lua: LuaUserData::nodeable, class_mt
            lua_newtable(lua);
@@ -189,7 +189,7 @@ namespace ScriptCanvas
        void OutInterpretedUserSubgraph::operator()(AZ::BehaviorValueParameter* /*resultBVP*/, AZ::BehaviorValueParameter* /*argsBVPs*/, int argsCount)
        {
            // Lua: executionState, outKey, args...
-            auto behaviorContext = AZ::ScriptContext::FromNativeContext(m_lua)->GetBoundContext();
+            /*auto behaviorContext =*/ AZ::ScriptContext::FromNativeContext(m_lua)->GetBoundContext();
            lua_rawgeti(m_lua, LUA_REGISTRYINDEX, m_lambdaRegistryIndex);
            // Lua: executionState, outKey, args..., lambda
            lua_remove(m_lua, 1);
@@ -1497,7 +1497,6 @@ namespace ScriptCanvas

            while (outputSource)
            {
-                AZ::s32 firstFoundIndex = 0;
                // check every connected SC Node
                for (const auto& scNodeAndOutputSlot : scriptCanvasNodesConnectedToInput)
                {
@@ -2612,7 +2611,6 @@ namespace ScriptCanvas

        void AbstractCodeModel::ParseConstructionInputVariables()
        {
-            AZ::SerializeContext* serializeContext = AZ::EntityUtils::GetApplicationSerializeContext();
            AZStd::vector<AZStd::pair<AZ::EntityId, Nodeable*>> nodeablesById;
            AZStd::vector<VariableId> inputVariableIds;
            AZStd::unordered_map<VariableId, Grammar::VariableConstPtr> inputVariablesById;
@@ -4636,7 +4634,6 @@ namespace ScriptCanvas
            NodelingInParserIterationListener listener;
            TraverseTree(root, listener);
            auto& leavesWithoutNodelings = listener.GetLeavesWithoutNodelings();
-            auto& outCalls = listener.GetOutCalls();
            AZStd::unordered_set<const ScriptCanvas::Nodes::Core::FunctionDefinitionNode*> uniqueNodelingsOut = listener.GetNodelingsOut();
            // determine the the execution topology can be reduced to single function call with a single return point to graph execution
            const UserInParseTopologyResult result = ParseUserInTolopology(uniqueNodelingsOut.size(), leavesWithoutNodelings.size());
@@ -76,7 +76,6 @@ namespace ScriptCanvas::Nodes::Core
        }

        // Store the name of the event in the AzEventEntry structure
-        Slot* onEventSlot = AzEventHandlerProperty::GetOnEventSlot(this);
        m_azEventEntry.m_eventName = AZStd::move(behaviorAzEventDesc.m_eventName);

        // Add a DataSlot which accepts the aliased AZ::Event<Params...> type by reference;
@@ -24,8 +24,6 @@ namespace ScriptCanvas
        {
           bool IsFunctionCallNodeOutOfDate(const IsFunctionCallOutOfDateConfig& config)
           {
-                bool changedToNodeable = false;
-
                if (Grammar::IsFunctionSourceIdNodeable(config.sourceId))
                {
                    const bool latestIsNodeable = config.latestInterface.IsUserNodeable();
@@ -643,7 +643,6 @@ namespace ScriptCanvas
                        ScriptCanvas::Data::Type dataType = (*inputDataTypeIter->second.begin());
                        SlotId slotId = m_orderedInputSlotIds[inputIndex];

-                        Slot* slot = GetSlot(slotId);

                        auto isValidType = SlotAcceptsType(slotId, dataType);

@@ -670,7 +669,6 @@ namespace ScriptCanvas
                        ScriptCanvas::Data::Type dataType = (*outputDataTypeIter->second.begin());
                        SlotId slotId = m_outputSlotIds[outputIndex];

-                        Slot* slot = GetSlot(slotId);

                        auto isValidType = SlotAcceptsType(slotId, dataType);

@@ -8,6 +8,7 @@
           Base="ScriptCanvas::Nodes::Internal::BaseTimerNode"
           Icon="Editor/Icons/ScriptCanvas/Placeholder.png"
           Deprecated="This node is deprecated"
+           DeprecationUUID="{AB587027-2270-4CA6-242F-6069C6D9BBB6}"
           Category="Utilities"
           Version="3"
           VersionConverter="ScriptCanvas::VersionConverters::RepeaterVersionConverter"
@@ -366,7 +366,7 @@ namespace ScriptCanvas
                }

                ScriptEvents::Method scriptEventMethod;
-                bool methodFound = definition.FindMethod(method->m_name, scriptEventMethod);
+                definition.FindMethod(method->m_name, scriptEventMethod);
                
                size_t argIndex = 0;
                
@@ -471,7 +471,6 @@ namespace ScriptCanvas
                if (asset && asset.IsReady())
                {
                    const ScriptEvents::ScriptEvent& definition = asset.Get()->m_definition;
-                    const AZStd::string& name = definition.GetName();

                    AZ::BehaviorMethod* method{};
                    if (m_version != definition.GetVersion())
@@ -74,8 +74,7 @@ namespace ScriptCanvas
                    {
                        m_variableView.AssignToDatum((*sourceDatum));

-                        const Datum* variableDatum = m_variableView.GetDatum();
-                        SC_EXECUTION_TRACE_VARIABLE_CHANGE((m_variableId), (CreateVariableChange((*variableDatum), m_variableId)));
+                        SC_EXECUTION_TRACE_VARIABLE_CHANGE((m_variableId), (CreateVariableChange((*m_variableView.GetDatum()), m_variableId)));
                    }
                    
                    Slot* resultSlot = GetSlot(m_variableDataOutSlotId);
@@ -8,6 +8,7 @@
           Base="ScriptCanvas::Node"
           Category="Entity/Transform"
           Version="4"
+           Deprecated="true"
           EditAttributes="AZ::Edit::Attributes::CategoryStyle@.method;ScriptCanvas::Attributes::Node::TitlePaletteOverride@MethodNodeTitlePalette"
           GeneratePropertyFriend="True"
           Description="Rotates the given entity by the specified amount.">
@@ -224,7 +224,6 @@ namespace ScriptCanvas
            {
                for (auto pairIter = m_weightedPairings.begin(); pairIter != m_weightedPairings.end(); ++pairIter)
                {
-                    const WeightedPairing& weightedPairing = (*pairIter);
                    
                    if (pairIter->m_executionSlotId == slotId
                        || pairIter->m_weightSlotId == slotId)                        
@@ -9,6 +9,9 @@
           Category="Containers"
           Version="0"
           GeneratePropertyFriend="True"
+           Deprecated="True"
+           DeprecationUUID="{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}"
+           ReplacementMethodName="Get Element"
           Description="Returns the element at the specified Index or Key">
        <Out Name="Key Not Found" Description="Triggered if the specified key was not found"/>
    </Class>
@@ -8,6 +8,8 @@
           Base="ScriptCanvas::Nodes::Operators::OperatorBase"
           Category="Containers"
           Version="0"
-           Description="Retrieves the last element in the container">
+           Deprecated="True"
+           DeprecationUUID="{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}"
+           Description="Get Last Element">
    </Class>
 </ScriptCanvas>
@@ -10,8 +10,11 @@
           Version="1"
           VersionConverter="OperatorClearVersionConverter"
           GeneratePropertyFriend="True"
-           Description="Eliminates all the elements in the container">
-        <In Name="In" Description=""/>
+           Deprecated="True"
+           Description="Eliminates all the elements in the container"
+           DeprecationUUID="{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}"
+           ReplacementMethodName="Clear All Elements">
+      <In Name="In" Description=""/>
        <Out Name="Out" Description=""/>
        <DynamicDataSlot Name="Source"
                         Description="The container to be cleared from the node."
@@ -10,6 +10,9 @@
           Version="1"
           VersionConverter="OperatorEmptyVersionConverter"
           GeneratePropertyFriend="True"
+           Deprecated="True"
+           DeprecationUUID="{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}"
+           ReplacementMethodName="Is Empty"
           Description="Returns whether the container is empty">
        <In Name="In" Description=""/>
        <Out Name="Out" Description=""/>
@@ -8,6 +8,9 @@
           Base="ScriptCanvas::Nodes::Operators::OperatorBase"
           Category="Containers"
           Version="1"
+           Deprecated="True"
+           DeprecationUUID="{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}"
+           ReplacementMethodName="Erase"
           GeneratePropertyFriend="True"
           Description="Erase the element at the specified Index or with the specified Key">
        <Out Name="Element Not Found" Description="Triggered if the specified element was not found"/>
@@ -8,6 +8,9 @@
           Base="ScriptCanvas::Nodes::Operators::OperatorBase"
           Category="Containers"
           Version="0"
+           Deprecated="True"
+           DeprecationUUID="{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}"
+           ReplacementMethodName="Get First Element"
           Description="Retrieves the first element in the container">
    </Class>
 </ScriptCanvas>
@@ -8,6 +8,9 @@
           Base="ScriptCanvas::Nodes::Operators::OperatorBase"
           Category="Containers"
           Version="0"
+           Deprecated="True"
+           DeprecationUUID="{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}"
+           ReplacementMethodName="Insert"
           Description="Inserts an element into the container at the specified Index or Key">
    </Class>
 </ScriptCanvas>
@@ -8,6 +8,9 @@
           Base="ScriptCanvas::Nodes::Operators::OperatorBase"
           Category="Containers"
           Version="0"
+           Deprecated="True"
+           DeprecationUUID="{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}"
+           ReplacementMethodName="Add Element at End"
           Description="Adds the provided element at the end of the container">
    </Class>
 </ScriptCanvas>
@@ -8,6 +8,9 @@
           Base="ScriptCanvas::Node"
           Category="Containers"
           Version="1"
+           Deprecated="True"
+           DeprecationUUID="{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}"
+           ReplacementMethodName="Get Size"
           VersionConverter="OperatorSizeVersionConverter"
           GeneratePropertyFriend="True"
           Description="Get the number of elements in the specified container">
@@ -96,7 +96,6 @@ namespace ScriptCanvas
                const SlotId inSlotId = OperatorSizeProperty::GetInSlotId(this);
                if (slotId == inSlotId)
                {
-                    bool pushedSize = false;

                    SlotId sourceSlotId = OperatorSizeProperty::GetSourceSlotId(this);
                    SlotId sizeSlotId = OperatorSizeProperty::GetSizeSlotId(this);
@@ -115,7 +114,6 @@ namespace ScriptCanvas

                        // Index
                        Datum sizeResult = sizeOutcome.TakeValue();
-                        const size_t* sizePtr = sizeResult.GetAs<size_t>();

                        PushOutput(sizeResult, *GetSlot(sizeSlotId));                        
                    }
@@ -8,6 +8,9 @@
           Base="ScriptCanvas::Node"
           Category="Math"
           Version="1"
+           Deprecated="True"
+           DrecationUUID="{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}"
+           ReplacementMethodName="Divide by Number (/)"
           VersionConverter="OperatorDivideByNumberVersionConverter"
           GeneratePropertyFriend="True"
           Description="Divides certain types by a given number">
@@ -8,6 +8,9 @@
           Base="ScriptCanvas::Node"
           Category="Math"
           Version="1"
+           Deprecated="True"
+           DrecationUUID="{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}"
+           ReplacementMethodName="Length"
           VersionConverter="OperatorLengthConverter"
           GeneratePropertyFriend="True"
           Description="Given a vector this returns the magnitude (length) of the vector. For a quaternion, magnitude is the cosine of half the angle of rotation.">
@@ -2,12 +2,14 @@

 <ScriptCanvas Include="Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.h" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <Class Name="LerpBetween"
-	       QualifiedName="ScriptCanvas::Nodes::LerpBetween"
-	       PreferredClassName="Lerp Between"
+           QualifiedName="ScriptCanvas::Nodes::LerpBetween"
+           PreferredClassName="Lerp Between"
           Uuid="{58AF538D-021A-4D0C-A3F1-866C2FFF382E}"
           Base="ScriptCanvas::Node"
           Category="Math"
           Version="1"
+           Deprecated="True"
+           DreprecationUUID="{A4CFB2F2-4045-47ED-AE73-ED60C2072EE4}"
           GeneratePropertyFriend="True"
           Description="Performs a lerp between the two specified sources using the speed specified or in the amount of time specified, or the minimum of the two">
        <In Name="In" Description=""/>
@@ -7,6 +7,12 @@
           Uuid="{8481E892-DE37-4CCF-86AA-E4770DE90643}"
           Base="ScriptCanvas::Node"
           Category="String"
+           
+           Deprecated="True"
+           DeprecationUUID="{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}"
+           ReplacementClassName="String"
+           ReplacementMethodName="Contains String"
+           
           Version="0"
           GeneratePropertyFriend="True"
           Description="Checks if a string contains an instance of a specified string, if true, it returns the index to the first instance matched.">
@@ -8,6 +8,10 @@
           Base="ScriptCanvas::Node"
           Category="String"
           Version="0"
+           Deprecated="True"
+           DeprecationUUID="{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}"
+           ReplacementClassName="String"
+           ReplacementMethodName="Replace"
           GeneratePropertyFriend="True"
           Description="Allows replacing a substring from a given string.">
        <In Name="In" Description="Input signal"/>
@@ -8,6 +8,10 @@
           Base="ScriptCanvas::Node"
           Category="String"
           Version="0"
+           Deprecated="True"
+           DeprecationUUID="{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}"
+           ReplacementClassName="String"
+           ReplacementMethodName="Starts With"
           GeneratePropertyFriend="True"
           Description=".">
        <In Name="In" Description="Input signal"/>
@@ -36,6 +40,10 @@
           Uuid="{6C1CECA6-C155-4ED5-96BC-1D4F11C7A0FE}"
           Base="ScriptCanvas::Node"
           Category="String"
+           Deprecated="True"
+           DeprecationUUID="{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}"
+           ReplacementClassName="String"
+           ReplacementMethodName="Ends With"
           Version="0"
           GeneratePropertyFriend="True"
           Description=".">
@@ -66,6 +74,10 @@
           Base="ScriptCanvas::Node"
           Category="String"
           Version="0"
+           Deprecated="True"
+           DeprecationUUID="{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}"
+           ReplacementClassName="String"
+           ReplacementMethodName="Split"
           GeneratePropertyFriend="True"
           Description=".">
        <In Name="In" Description="Input signal"/>
@@ -94,6 +106,10 @@
           Base="ScriptCanvas::Node"
           Category="String"
           Version="0"
+           Deprecated="True"
+           DeprecationUUID="{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}"
+           ReplacementClassName="String"
+           ReplacementMethodName="Join"
           GeneratePropertyFriend="True"
           Description=".">
        <In Name="In" Description="Input signal"/>
@@ -8,6 +8,7 @@
           Base="ScriptCanvas::Nodes::Internal::BaseTimerNode"
           GeneratePropertyFriend="True"
           Deprecated="This node has been deprecated in favor of the nodeable form"
+           DeprecationUUID="{D3629902-02E9-AE59-0424-F366D342B433}"
           Description="Delays all incoming execution for the specified number of ticks">
        <In Name="In" Description="When signaled, execution is delayed at this node for the specified amount of times." Contracts="DisallowReentrantExecutionContract"/>
        <OutLatent Name="Out" Description="Signaled after waiting for the specified amount of times."/>
@@ -18,6 +19,7 @@
           Uuid="{399A2608-77E3-41F9-90FA-58A9B6E0E34D}"
           Base="ScriptCanvas::Node"
           GeneratePropertyFriend="True"
+           DeprecationUUID="{D3629902-02E9-AE59-0424-F366D342B433}"
           Deprecated="This node has been deprecated in favor of the nodeable form"
           Description="Delays all incoming execution for the specified number of ticks">
        <In Name="In" Description="When signaled, execution is delayed at this node for the specified amount of frames." Contracts="DisallowReentrantExecutionContract"/>
@@ -41,6 +43,7 @@
           Uuid="{FAEADF5A-F7D9-415A-A3E8-F534BD379B9A}"
           Base="ScriptCanvas::Node"
           Version="3"
+           DeprecationUUID="{233C84A7-44DE-A948-D65C-46C11F1F7162}"
           Deprecated="This node has been deprecated in favor of the nodeable form"
           VersionConverter="ScriptCanvas::VersionConverters::DelayVersionConverter"
           GeneratePropertyFriend="True"
@@ -9,6 +9,7 @@
           Version="2"
           VersionConverter="ScriptCanvas::VersionConverters::DurationVersionConverter"
           GeneratePropertyFriend="True"
+           DeprecationUUID="{CCF1F41F-39C2-C847-9D9E-0155C8B46E1C}"
           Deprecated="This node has been deprecated in favor of the nodeable form"
           Description="Triggers a signal every frame during the specified duration.">
        <In Name="Start" Description="Starts the countdown"/>
@@ -8,6 +8,7 @@
           Base="ScriptCanvas::Nodes::Internal::BaseTimerNode"
           Category="Timing"
           Version="0"
+           DeprecationUUID="{E73DB180-A325-763B-A1FE-517B548AF66E}"
           Deprecated="This node has been deprecated in favor of the nodeable form"
           GeneratePropertyFriend="True"
           Description="While active, will signal the output at the given interval.">
@@ -8,6 +8,7 @@
           Base="ScriptCanvas::Node"
           Version="2"
           GeneratePropertyFriend="True"
+           DeprecationUUID="32A4BEDC-C207-4472-61DE-9A716402620A"
           Deprecated="This node has been deprecated in favor of the nodeable form"
           Description="Provides a time value.">
        <In Name="Start" Description="Starts the timer."/>
@@ -9,8 +9,13 @@
           Icon="Editor/Icons/ScriptCanvas/AddFailure.png"
           Version="0"
           GeneratePropertyFriend="True"
-           Description="adds a failure directly to the unit testing framework">
-        <In Name="In" Description="Input signal"/>
+           Description="adds a failure directly to the unit testing framework"
+           DeprecationUUID="{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}"
+           ReplacementClassname="Unit Testing"
+           ReplacementMethodName="Add Failure"
+           >
+
+      <In Name="In" Description="Input signal"/>
        <Out Name="Out" Description=""/>
        <Property Name="Report"
                  Description="additional notes for the test report"
@@ -9,6 +9,9 @@
           Icon="Editor/Icons/ScriptCanvas/AddSuccess.png"
           Version="0"
           GeneratePropertyFriend="True"
+           DeprecationUUID="{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}"
+           ReplacementClassname="Unit Testing"
+           ReplacementMethodName="Add Success"
           Description="adds a success directly to the unit testing framework">
        <In Name="In" Description="Input signal"/>
        <Out Name="Out" Description=""/>
@@ -9,6 +9,9 @@
           Icon="Editor/Icons/ScriptCanvas/Checkpoint.png"
           Version="0"
           GeneratePropertyFriend="True"
+           DeprecationUUID="{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}"
+           ReplacementClassname="Unit Testing"
+           ReplacementMethodName="Checkpoint"
           Description="Add a progress checkpoint for test debugging">
        <In Name="In" Description="Input signal"/>
        <Out Name="Out" Description=""/>
@@ -10,6 +10,9 @@
           Version="1"
           VersionConverter="ScriptCanvas::UnitTesting::ExpectComparisonVersioner"
           GeneratePropertyFriend="True"
+           DeprecationUUID="{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}"
+           ReplacementClassname="Unit Testing"
+           ReplacementMethodName="Expect Equal"
           Description="Expects lhs equal to rhs">
        <In Name="In" Description="Input signal"/>
        <Out Name="Out" Description=""/>
@@ -81,7 +81,6 @@ namespace ScriptCanvas
                    return;
                }

-                const auto report = FindDatum(GetSlotId("Report"))->GetAs<Data::StringType>();

                switch (lhs->GetType().GetType())
                {
@@ -10,6 +10,9 @@
           Version="1"
           VersionConverter="ScriptCanvas::UnitTesting::ExpectBooleanVersioner"
           GeneratePropertyFriend="True"
+           DeprecationUUID="{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}"
+           ReplacementClassname="Unit Testing"
+           ReplacementMethodName="Expect False"
           Description="Expects a value to be false">
        <In Name="In" Description="Input signal"/>
        <Out Name="Out" Description=""/>
@@ -10,6 +10,9 @@
           Version="1"
           VersionConverter="ScriptCanvas::UnitTesting::ExpectComparisonVersioner"
           GeneratePropertyFriend="True"
+           DeprecationUUID="{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}"
+           ReplacementClassname="Unit Testing"
+           ReplacementMethodName="Expect Greater Than"
           Description="Expects lhs to be greater than rhs">
        <In Name="In" Description="Input signal"/>
        <Out Name="Out" Description=""/>
@@ -81,7 +81,6 @@ namespace ScriptCanvas
                    return;
                }

-                const auto report = FindDatum(GetSlotId("Report"))->GetAs<Data::StringType>();

                switch (lhs->GetType().GetType())
                {
@@ -10,6 +10,9 @@
           Version="1"
           VersionConverter="ScriptCanvas::UnitTesting::ExpectComparisonVersioner"
           GeneratePropertyFriend="True"
+           DeprecationUUID="{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}"
+           ReplacementClassname="Unit Testing"
+           ReplacementMethodName="Expect Greater Than Equal"
           Description="Expects lhs to be greater than rhs">
        <In Name="In" Description="Input signal"/>
        <Out Name="Out" Description=""/>
@@ -81,7 +81,6 @@ namespace ScriptCanvas
                    return;
                }
                
-                const auto report = FindDatum(GetSlotId("Report"))->GetAs<Data::StringType>();

                switch (lhs->GetType().GetType())
                {
@@ -10,6 +10,9 @@
           Version="1"
           VersionConverter="ScriptCanvas::UnitTesting::ExpectComparisonVersioner"
           GeneratePropertyFriend="True"
+           DeprecationUUID="{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}"
+           ReplacementClassname="Unit Testing"
+           ReplacementMethodName="Expect Less Than"
           Description="Expects lhs to be less than rhs">
        <In Name="In" Description="Input signal"/>
        <Out Name="Out" Description=""/>
@@ -81,7 +81,6 @@ namespace ScriptCanvas
                    return;
                }

-                const auto report = FindDatum(GetSlotId("Report"))->GetAs<Data::StringType>();

                switch (lhs->GetType().GetType())
                {
@@ -10,6 +10,9 @@
           Version="1"
           VersionConverter="ScriptCanvas::UnitTesting::ExpectComparisonVersioner"
           GeneratePropertyFriend="True"
+           DeprecationUUID="{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}"
+           ReplacementClassname="Unit Testing"
+           ReplacementMethodName="Expect Less Than Equal"
           Description="Expects lhs to be greater than rhs">
        <In Name="In" Description="Input signal"/>
        <Out Name="Out" Description=""/>
@@ -81,7 +81,6 @@ namespace ScriptCanvas
                    return;
                }

-                const auto report = FindDatum(GetSlotId("Report"))->GetAs<Data::StringType>();

                switch (lhs->GetType().GetType())
                {
@@ -10,6 +10,9 @@
           Version="1"
           VersionConverter="ScriptCanvas::UnitTesting::ExpectComparisonVersioner"
           GeneratePropertyFriend="True"
+           DeprecationUUID="{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}"
+           ReplacementClassname="Unit Testing"
+           ReplacementMethodName="Expect Not Equal"
           Description="Expects lhs not equal to rhs">
        <In Name="In" Description="Input signal"/>
        <Out Name="Out" Description=""/>
@@ -81,7 +81,6 @@ namespace ScriptCanvas
                    return; 
                }

-                const auto report = FindDatum(GetSlotId("Report"))->GetAs<Data::StringType>();

                switch (lhs->GetType().GetType())
                {
@@ -10,6 +10,9 @@
           Version="1"
           VersionConverter="ScriptCanvas::UnitTesting::ExpectBooleanVersioner"
           GeneratePropertyFriend="True"
+           DeprecationUUID="{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}"
+           ReplacementClassname="Unit Testing"
+           ReplacementMethodName="Expect True"
           Description="Expects a value to be true">
        <In Name="In" Description="Input signal"/>
        <Out Name="Out" Description=""/>
@@ -9,6 +9,9 @@
           Icon="Editor/Icons/ScriptCanvas/MarkComplete.png"
           Version="0"
           GeneratePropertyFriend="True"
+           DeprecationUUID="{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}"
+           ReplacementClassname="Unit Testing"
+           ReplacementMethodName="Mark Complete"
           Description="reports that the graph completed to the unit testing framework">
        <In Name="In" Description="Input signal"/>
        <Out Name="Out" Description=""/>
@@ -846,7 +846,6 @@ namespace ScriptCanvas
        {
            for (const auto& nameAndEventThread : ebusHandling->m_events)
            {
-                const AZStd::string& eventName = nameAndEventThread.first;
                const Grammar::ExecutionTreeConstPtr& eventThread = nameAndEventThread.second;

                const bool hasResults = eventThread->HasReturnValues();
@@ -248,16 +248,20 @@ namespace ScriptCanvas
            // The method is not in the behaviorContext Global Methods, so check the Global Properties
            for (auto [propertyName, behaviorProperty] : behaviorContext->m_properties)
            {
-                if (behaviorProperty->m_getter && behaviorProperty->m_getter->m_name == methodName)
+                AZStd::string getterName = AZStd::string::format("%s::Getter", methodName.data());
+                AZStd::string setterName = AZStd::string::format("%s::Setter", methodName.data());
+
+                if (behaviorProperty->m_getter && (behaviorProperty->m_getter->m_name == methodName || behaviorProperty->m_getter->m_name == getterName))
                {
                    method = behaviorProperty->m_getter;
                    break;
                }
-                if (behaviorProperty->m_setter && behaviorProperty->m_setter->m_name == methodName)
+                if (behaviorProperty->m_setter && (behaviorProperty->m_setter->m_name == methodName || behaviorProperty->m_setter->m_name == setterName))
                {
                    method = behaviorProperty->m_setter;
                    break;
                }
+
            }

            if (!method)