[UWP] Add handling for column fallback (#3197) (#3288)

* [UWP] Add handling for column fallback (#3197) * [UWP] Add handling for column fallback * Fix shared model x64 build * Test updates
microsoft · Jul 31, 2019 · 4f210fa · 4f210fa
1 parent c80768d
commit 4f210fa
Show file tree

Hide file tree

Showing 54 changed files with 1,163 additions and 795 deletions.
diff --git a/samples/v1.2/Elements/Column.Fallback.json b/samples/v1.2/Elements/Column.Fallback.json
@@ -0,0 +1,49 @@
+{
+	"type": "AdaptiveCard",
+	"body": [
+		{
+			"type": "ColumnSet",
+			"columns": [
+				{
+					"type": "Column",
+					"items": [
+						{
+							"type": "Graph"
+						}
+					],
+					"fallback": {
+						"type": "Column",
+						"items": [
+							{
+								"type": "TextBlock",
+								"text": "Fallback"
+							}
+						]
+					},
+					"width": "auto"
+				},
+				{
+					"type": "Column",
+					"items": [
+						{
+							"type": "Graph"
+						}
+					],
+					"fallback": "drop"
+				},
+				{
+					"type": "Column",
+					"items": [
+						{
+							"type": "TextBlock",
+							"text": "This is a column",
+							"wrap": true
+						}
+					]
+				}
+			]
+		}
+	],
+	"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
+	"version": "1.0"
+}
diff --git a/samples/v1.2/Tests/ContainerDoubleFallback.json b/samples/v1.2/Tests/ContainerDoubleFallback.json
@@ -0,0 +1 @@
+{	"type": "AdaptiveCard",	"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",	"version": "1.2",	"body": [		{			"type": "whoknows",			"fallback": {				"type": "Container",				"items": [					{						"type": "notme"					}				],				"fallback": {					"type": "TextBlock",					"text": "Hello World"				}			}		}	]}

diff --git a/...ardsSharedModel/AdaptiveCardsSharedModelUnitTest/AdaptiveCardsSharedModelUnitTest.vcxproj b/...ardsSharedModel/AdaptiveCardsSharedModelUnitTest/AdaptiveCardsSharedModelUnitTest.vcxproj
@@ -170,6 +170,7 @@
     <ClCompile Include="AdditionalPropertiesTest.cpp" />
     <ClCompile Include="Base64Test.cpp" />
     <ClCompile Include="ContainerStyleTest.cpp" />
+    <ClCompile Include="FallbackTests.cpp" />
     <ClCompile Include="UnsupportedtypesParsingTest.cpp" />
     <ClCompile Include="EnumTest.cpp" />
     <ClCompile Include="EverythingBagel.cpp" />

diff --git a/...edModel/AdaptiveCardsSharedModelUnitTest/AdaptiveCardsSharedModelUnitTest.vcxproj.filters b/...edModel/AdaptiveCardsSharedModelUnitTest/AdaptiveCardsSharedModelUnitTest.vcxproj.filters
@@ -83,5 +83,8 @@
     <ClCompile Include="ContainerStyleTest.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="FallbackTests.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>