[iOS/Android/UWP/Shared] Fix handling of orphaned table child elements (microsoft#6408)

* [Shared] Fix parsing of `TableRow` and `TableCell` outside of `Table`

Fixes microsoft#6393

* SWIG updates

* Fix up Android rendering

* Fix up iOS

* Fix up UWP

Co-authored-by: Paul Campbell <[email protected]>

Author: paulcam206

source/android/adaptivecards/CMakeLists.txt

@@ -25,22 +25,22 @@ add_library( # Sets the name of the library.
              # file are automatically included.
              ../../shared/cpp/ObjectModel/jsoncpp.cpp
              ../../shared/cpp/ObjectModel/ActionParserRegistration.cpp
-             ../../shared/cpp/ObjectModel/AdaptiveBase64Util.cpp
              ../../shared/cpp/ObjectModel/ActionSet.cpp
+             ../../shared/cpp/ObjectModel/AdaptiveBase64Util.cpp
              ../../shared/cpp/ObjectModel/AdaptiveCardParseException.cpp
              ../../shared/cpp/ObjectModel/AdaptiveCardParseWarning.cpp
              ../../shared/cpp/ObjectModel/AuthCardButton.cpp
              ../../shared/cpp/ObjectModel/Authentication.cpp
-             ../../shared/cpp/ObjectModel/BaseActionElement.cpp
              ../../shared/cpp/ObjectModel/BackgroundImage.cpp
+             ../../shared/cpp/ObjectModel/BaseActionElement.cpp
              ../../shared/cpp/ObjectModel/BaseCardElement.cpp
              ../../shared/cpp/ObjectModel/BaseElement.cpp
              ../../shared/cpp/ObjectModel/BaseInputElement.cpp
              ../../shared/cpp/ObjectModel/ChoiceInput.cpp
              ../../shared/cpp/ObjectModel/ChoiceSetInput.cpp
+             ../../shared/cpp/ObjectModel/CollectionCoreElement.cpp
              ../../shared/cpp/ObjectModel/Column.cpp
              ../../shared/cpp/ObjectModel/ColumnSet.cpp
-             ../../shared/cpp/ObjectModel/CollectionTypeElement.cpp
              ../../shared/cpp/ObjectModel/Container.cpp
              ../../shared/cpp/ObjectModel/DateInput.cpp
              ../../shared/cpp/ObjectModel/DateTimePreparsedToken.cpp
@@ -72,6 +72,7 @@ add_library( # Sets the name of the library.
              ../../shared/cpp/ObjectModel/SemanticVersion.cpp
              ../../shared/cpp/ObjectModel/SharedAdaptiveCard.cpp
              ../../shared/cpp/ObjectModel/ShowCardAction.cpp
+             ../../shared/cpp/ObjectModel/StyledCollectionElement.cpp
              ../../shared/cpp/ObjectModel/SubmitAction.cpp
              ../../shared/cpp/ObjectModel/Table.cpp
              ../../shared/cpp/ObjectModel/TableCell.cpp
@@ -86,8 +87,8 @@ add_library( # Sets the name of the library.
              ../../shared/cpp/ObjectModel/ToggleVisibilityAction.cpp
              ../../shared/cpp/ObjectModel/ToggleVisibilityTarget.cpp
              ../../shared/cpp/ObjectModel/TokenExchangeResource.cpp
-             ../../shared/cpp/ObjectModel/UnknownElement.cpp
              ../../shared/cpp/ObjectModel/UnknownAction.cpp
+             ../../shared/cpp/ObjectModel/UnknownElement.cpp
              ../../shared/cpp/ObjectModel/Util.cpp
              src/main/cpp/objectmodel_wrap.cpp
              )

source/android/adaptivecards/src/AdaptiveCardObjectModel.i

@@ -112,7 +112,8 @@ STD_OPTIONAL(AdaptiveCards::VerticalContentAlignment, StdOptionalVerticalContent
 #include "../../../shared/cpp/ObjectModel/BaseCardElement.h"
 #include "../../../shared/cpp/ObjectModel/BaseActionElement.h"
 #include "../../../shared/cpp/ObjectModel/BaseInputElement.h"
-#include "../../../shared/cpp/ObjectModel/CollectionTypeElement.h"
+#include "../../../shared/cpp/ObjectModel/CollectionCoreElement.h"
+#include "../../../shared/cpp/ObjectModel/StyledCollectionElement.h"
 #include "../../../shared/cpp/ObjectModel/AdaptiveCardParseWarning.h"
 #include "../../../shared/cpp/ObjectModel/ActionParserRegistration.h"
 #include "../../../shared/cpp/ObjectModel/ElementParserRegistration.h"
@@ -183,7 +184,8 @@ STD_OPTIONAL(AdaptiveCards::VerticalContentAlignment, StdOptionalVerticalContent
 %shared_ptr(AdaptiveCards::BaseCardElementParser)
 %shared_ptr(AdaptiveCards::ActionElementParserWrapper)
 %shared_ptr(AdaptiveCards::BaseCardElementParserWrapper)
-%shared_ptr(AdaptiveCards::CollectionTypeElement)
+%shared_ptr(AdaptiveCards::CollectionCoreElement)
+%shared_ptr(AdaptiveCards::StyledCollectionElement)
 %shared_ptr(AdaptiveCards::FeatureRegistration)
 %shared_ptr(AdaptiveCards::BackgroundImage)
 %shared_ptr(AdaptiveCards::Container)
@@ -901,7 +903,8 @@ namespace Json {
 %include "../../../shared/cpp/ObjectModel/BaseActionElement.h"
 %include "../../../shared/cpp/ObjectModel/BaseInputElement.h"
 %include "../../../shared/cpp/ObjectModel/BackgroundImage.h"
-%include "../../../shared/cpp/ObjectModel/CollectionTypeElement.h"
+%include "../../../shared/cpp/ObjectModel/CollectionCoreElement.h"
+%include "../../../shared/cpp/ObjectModel/StyledCollectionElement.h"
 %include "../../../shared/cpp/ObjectModel/FeatureRegistration.h"
 %include "../../../shared/cpp/ObjectModel/SemanticVersion.h"
 %include "../../../shared/cpp/ObjectModel/Container.h"