microsoft · RebeccaAnne · Jun 10, 2019 · Jun 3, 2019 · Jun 3, 2019 · Jun 3, 2019
diff --git a/samples/Tests/Action.CustomParsing.json → samples/v1.0/Tests/Action.CustomParsing.json b/samples/Tests/Action.CustomParsing.json → samples/v1.0/Tests/Action.CustomParsing.json
diff --git a/samples/Tests/Action.NoBody.json → samples/v1.0/Tests/Action.NoBody.json b/samples/Tests/Action.NoBody.json → samples/v1.0/Tests/Action.NoBody.json
diff --git a/samples/Tests/Action.Title.json → samples/v1.0/Tests/Action.Title.json b/samples/Tests/Action.Title.json → samples/v1.0/Tests/Action.Title.json
diff --git a/samples/Tests/AdaptiveCard.MinVersion.json → ...s/v1.0/Tests/AdaptiveCard.MinVersion.json b/samples/Tests/AdaptiveCard.MinVersion.json → ...s/v1.0/Tests/AdaptiveCard.MinVersion.json
diff --git a/...es/Tests/AdaptiveCard.MissingVersion.json → ....0/Tests/AdaptiveCard.MissingVersion.json b/...es/Tests/AdaptiveCard.MissingVersion.json → ....0/Tests/AdaptiveCard.MissingVersion.json
diff --git a/...s/Tests/AdaptiveCard.UnknownElements.json → ...0/Tests/AdaptiveCard.UnknownElements.json b/...s/Tests/AdaptiveCard.UnknownElements.json → ...0/Tests/AdaptiveCard.UnknownElements.json
diff --git a/samples/Tests/AdditionalProperty.json → samples/v1.0/Tests/AdditionalProperty.json b/samples/Tests/AdditionalProperty.json → samples/v1.0/Tests/AdditionalProperty.json
diff --git a/samples/Tests/AutoImageSet.json → samples/v1.0/Tests/AutoImageSet.json b/samples/Tests/AutoImageSet.json → samples/v1.0/Tests/AutoImageSet.json
@@ -1,60 +1,60 @@
-{
-	"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
-	"type": "AdaptiveCard",
-	"version": "1.0",
-	"body": [
-		{
-			"type": "TextBlock",
-			"text": "Here are some cool photos",
-			"size": "large"
-		},
-		{
-			"type": "TextBlock",
-			"text": "Sorry some of them are repeats",
-			"size": "medium",
-			"weight": "lighter"
-		},
-		{
-			"type": "ImageSet",
-			"imageSize": "auto",
-			"images": [
-				{
-					"type": "Image",
-					"url": "https://picsum.photos/200/200?image=100"
-				},
-				{
-					"type": "Image",
-					"url": "https://picsum.photos/300/200?image=200"
-				},
-				{
-					"type": "Image",
-					"url": "https://picsum.photos/300/200?image=301"
-				},
-				{
-					"type": "Image",
-					"url": "https://picsum.photos/200/200?image=400"
-				},
-				{
-					"type": "Image",
-					"url": "https://picsum.photos/300/200?image=500"
-				},
-				{
-					"type": "Image",
-					"url": "https://picsum.photos/200/200?image=600"
-				},
-				{
-					"type": "Image",
-					"url": "https://picsum.photos/300/200?image=700"
-				},
-				{
-					"type": "Image",
-					"url": "https://picsum.photos/300/200?image=800"
-				},
-				{
-					"type": "Image",
-					"url": "https://picsum.photos/300/200?image=900"
-				}
-			]
-		}
-	]
-}
+{
+	"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
+	"type": "AdaptiveCard",
+	"version": "1.0",
+	"body": [
+		{
+			"type": "TextBlock",
+			"text": "Here are some cool photos",
+			"size": "large"
+		},
+		{
+			"type": "TextBlock",
+			"text": "Sorry some of them are repeats",
+			"size": "medium",
+			"weight": "lighter"
+		},
+		{
+			"type": "ImageSet",
+			"imageSize": "auto",
+			"images": [
+				{
+					"type": "Image",
+					"url": "https://picsum.photos/200/200?image=100"
+				},
+				{
+					"type": "Image",
+					"url": "https://picsum.photos/300/200?image=200"
+				},
+				{
+					"type": "Image",
+					"url": "https://picsum.photos/300/200?image=301"
+				},
+				{
+					"type": "Image",
+					"url": "https://picsum.photos/200/200?image=400"
+				},
+				{
+					"type": "Image",
+					"url": "https://picsum.photos/300/200?image=500"
+				},
+				{
+					"type": "Image",
+					"url": "https://picsum.photos/200/200?image=600"
+				},
+				{
+					"type": "Image",
+					"url": "https://picsum.photos/300/200?image=700"
+				},
+				{
+					"type": "Image",
+					"url": "https://picsum.photos/300/200?image=800"
+				},
+				{
+					"type": "Image",
+					"url": "https://picsum.photos/300/200?image=900"
+				}
+			]
+		}
+	]
+}
diff --git a/samples/Tests/ColumnSet.Empty.json → samples/v1.0/Tests/ColumnSet.Empty.json b/samples/Tests/ColumnSet.Empty.json → samples/v1.0/Tests/ColumnSet.Empty.json
diff --git a/...s/Tests/ColumnSet.ImplicitColumnType.json → ...0/Tests/ColumnSet.ImplicitColumnType.json b/...s/Tests/ColumnSet.ImplicitColumnType.json → ...0/Tests/ColumnSet.ImplicitColumnType.json
diff --git a/...ts/CustomParsingTestUsingProgressBar.json → ...ts/CustomParsingTestUsingProgressBar.json b/...ts/CustomParsingTestUsingProgressBar.json → ...ts/CustomParsingTestUsingProgressBar.json
diff --git a/samples/Tests/DateTimeTestTranslation.json → ...s/v1.0/Tests/DateTimeTestTranslation.json b/samples/Tests/DateTimeTestTranslation.json → ...s/v1.0/Tests/DateTimeTestTranslation.json
diff --git a/samples/Tests/FactSetWrapping.json → samples/v1.0/Tests/FactSetWrapping.json b/samples/Tests/FactSetWrapping.json → samples/v1.0/Tests/FactSetWrapping.json
diff --git a/samples/Tests/Feedback.json → samples/v1.0/Tests/Feedback.json b/samples/Tests/Feedback.json → samples/v1.0/Tests/Feedback.json
diff --git a/samples/Tests/FlightItinerary_en.json → samples/v1.0/Tests/FlightItinerary_en.json b/samples/Tests/FlightItinerary_en.json → samples/v1.0/Tests/FlightItinerary_en.json
diff --git a/samples/Tests/FlightItinerary_es.json → samples/v1.0/Tests/FlightItinerary_es.json b/samples/Tests/FlightItinerary_es.json → samples/v1.0/Tests/FlightItinerary_es.json
diff --git a/samples/Tests/FlightItinerary_es_fail.json → ...s/v1.0/Tests/FlightItinerary_es_fail.json b/samples/Tests/FlightItinerary_es_fail.json → ...s/v1.0/Tests/FlightItinerary_es_fail.json
diff --git a/samples/Tests/LongFactSet.json → samples/v1.0/Tests/LongFactSet.json b/samples/Tests/LongFactSet.json → samples/v1.0/Tests/LongFactSet.json
diff --git a/samples/Tests/NotificationCard.json → samples/v1.0/Tests/NotificationCard.json b/samples/Tests/NotificationCard.json → samples/v1.0/Tests/NotificationCard.json
diff --git a/samples/Tests/NumberedListTest.json → samples/v1.0/Tests/NumberedListTest.json b/samples/Tests/NumberedListTest.json → samples/v1.0/Tests/NumberedListTest.json
diff --git a/samples/Tests/SearchResults.json → samples/v1.0/Tests/SearchResults.json b/samples/Tests/SearchResults.json → samples/v1.0/Tests/SearchResults.json
diff --git a/samples/Tests/TypeIsRequired.json → samples/v1.0/Tests/TypeIsRequired.json b/samples/Tests/TypeIsRequired.json → samples/v1.0/Tests/TypeIsRequired.json
diff --git a/samples/Tests/AdaptiveCard.Version1.1.json → ...s/v1.1/Tests/AdaptiveCard.Version1.1.json b/samples/Tests/AdaptiveCard.Version1.1.json → ...s/v1.1/Tests/AdaptiveCard.Version1.1.json
diff --git a/samples/Tests/Column.Explicit.Size.json → samples/v1.1/Tests/Column.Explicit.Size.json b/samples/Tests/Column.Explicit.Size.json → samples/v1.1/Tests/Column.Explicit.Size.json
diff --git a/...ts/ColumnSet.FactSet.VerticalStretch.json → ...ts/ColumnSet.FactSet.VerticalStretch.json b/...ts/ColumnSet.FactSet.VerticalStretch.json → ...ts/ColumnSet.FactSet.VerticalStretch.json
diff --git a/...ests/ColumnSet.Image.VerticalStretch.json → ...ests/ColumnSet.Image.VerticalStretch.json b/...ests/ColumnSet.Image.VerticalStretch.json → ...ests/ColumnSet.Image.VerticalStretch.json
diff --git a/...s/ColumnSet.ImageSet.VerticalStretch.json → ...s/ColumnSet.ImageSet.VerticalStretch.json b/...s/ColumnSet.ImageSet.VerticalStretch.json → ...s/ColumnSet.ImageSet.VerticalStretch.json
diff --git a/...nSet.Input.ChoiceSet.VerticalStretch.json → ...nSet.Input.ChoiceSet.VerticalStretch.json b/...nSet.Input.ChoiceSet.VerticalStretch.json → ...nSet.Input.ChoiceSet.VerticalStretch.json
diff --git a/...ColumnSet.Input.Date.VerticalStretch.json → ...ColumnSet.Input.Date.VerticalStretch.json b/...ColumnSet.Input.Date.VerticalStretch.json → ...ColumnSet.Input.Date.VerticalStretch.json
diff --git a/...lumnSet.Input.Number.VerticalStretch.json → ...lumnSet.Input.Number.VerticalStretch.json b/...lumnSet.Input.Number.VerticalStretch.json → ...lumnSet.Input.Number.VerticalStretch.json
diff --git a/...ut.Text.InlineAction.VerticalStretch.json → ...ut.Text.InlineAction.VerticalStretch.json b/...ut.Text.InlineAction.VerticalStretch.json → ...ut.Text.InlineAction.VerticalStretch.json
diff --git a/...ColumnSet.Input.Text.VerticalStretch.json → ...ColumnSet.Input.Text.VerticalStretch.json b/...ColumnSet.Input.Text.VerticalStretch.json → ...ColumnSet.Input.Text.VerticalStretch.json
diff --git a/...ColumnSet.Input.Time.VerticalStretch.json → ...ColumnSet.Input.Time.VerticalStretch.json b/...ColumnSet.Input.Time.VerticalStretch.json → ...ColumnSet.Input.Time.VerticalStretch.json
diff --git a/...lumnSet.Input.Toggle.VerticalStretch.json → ...lumnSet.Input.Toggle.VerticalStretch.json b/...lumnSet.Input.Toggle.VerticalStretch.json → ...lumnSet.Input.Toggle.VerticalStretch.json
diff --git a/...ests/ColumnSet.Media.VerticalStretch.json → ...ests/ColumnSet.Media.VerticalStretch.json b/...ests/ColumnSet.Media.VerticalStretch.json → ...ests/ColumnSet.Media.VerticalStretch.json
diff --git a/samples/Tests/ColumnSet.VerticalStretch.json → ...v1.1/Tests/ColumnSet.VerticalStretch.json b/samples/Tests/ColumnSet.VerticalStretch.json → ...v1.1/Tests/ColumnSet.VerticalStretch.json
diff --git a/.../ColumnSet_Container.VerticalStretch.json → .../ColumnSet_Container.VerticalStretch.json b/.../ColumnSet_Container.VerticalStretch.json → .../ColumnSet_Container.VerticalStretch.json
diff --git a/...es/Tests/FactSet.MarkdownAndDateTime.json → ....1/Tests/FactSet.MarkdownAndDateTime.json b/...es/Tests/FactSet.MarkdownAndDateTime.json → ....1/Tests/FactSet.MarkdownAndDateTime.json
diff --git a/samples/Tests/IconsInSomeActions.json → samples/v1.1/Tests/IconsInSomeActions.json b/samples/Tests/IconsInSomeActions.json → samples/v1.1/Tests/IconsInSomeActions.json
diff --git a/samples/Tests/Image.BackgroundColor.json → ...les/v1.1/Tests/Image.BackgroundColor.json b/samples/Tests/Image.BackgroundColor.json → ...les/v1.1/Tests/Image.BackgroundColor.json
diff --git a/samples/Tests/Image.Explicit.Size.json → samples/v1.1/Tests/Image.Explicit.Size.json b/samples/Tests/Image.Explicit.Size.json → samples/v1.1/Tests/Image.Explicit.Size.json
diff --git a/samples/Tests/Image.ResouceResolver.json → ...les/v1.1/Tests/Image.ResouceResolver.json b/samples/Tests/Image.ResouceResolver.json → ...les/v1.1/Tests/Image.ResouceResolver.json
diff --git a/...es/Tests/InputsFormWithHeightStretch.json → ....1/Tests/InputsFormWithHeightStretch.json b/...es/Tests/InputsFormWithHeightStretch.json → ....1/Tests/InputsFormWithHeightStretch.json
diff --git a/samples/Tests/InvalidMediaMix.json → samples/v1.1/Tests/InvalidMediaMix.json b/samples/Tests/InvalidMediaMix.json → samples/v1.1/Tests/InvalidMediaMix.json
diff --git a/samples/Tests/MediaAudioInColumnSet.json → ...les/v1.1/Tests/MediaAudioInColumnSet.json b/samples/Tests/MediaAudioInColumnSet.json → ...les/v1.1/Tests/MediaAudioInColumnSet.json
diff --git a/samples/Tests/MediaInColumnSet.json → samples/v1.1/Tests/MediaInColumnSet.json b/samples/Tests/MediaInColumnSet.json → samples/v1.1/Tests/MediaInColumnSet.json
diff --git a/samples/Tests/VerticalStretch.json → samples/v1.1/Tests/VerticalStretch.json b/samples/Tests/VerticalStretch.json → samples/v1.1/Tests/VerticalStretch.json
diff --git a/...ments/Action.OpenUrl.IconUrl.DataUri.json → ...ments/Action.OpenUrl.IconUrl.DataUri.json b/...ments/Action.OpenUrl.IconUrl.DataUri.json → ...ments/Action.OpenUrl.IconUrl.DataUri.json
diff --git a/...AdaptiveCard.BackgroundImage.DataUri.json → ...AdaptiveCard.BackgroundImage.DataUri.json b/...AdaptiveCard.BackgroundImage.DataUri.json → ...AdaptiveCard.BackgroundImage.DataUri.json
diff --git a/.../Elements/Image.DataUri.Style.Person.json → .../Elements/Image.DataUri.Style.Person.json b/.../Elements/Image.DataUri.Style.Person.json → .../Elements/Image.DataUri.Style.Person.json
diff --git a/samples/v1.1/Elements/Image.DataUri.json → samples/v1.2/Elements/Image.DataUri.json b/samples/v1.1/Elements/Image.DataUri.json → samples/v1.2/Elements/Image.DataUri.json
diff --git a/samples/Tests/Action.DuplicateIds.json → samples/v1.2/Tests/Action.DuplicateIds.json b/samples/Tests/Action.DuplicateIds.json → samples/v1.2/Tests/Action.DuplicateIds.json
diff --git a/samples/Tests/Action.NestedDuplicateIds.json → ...v1.2/Tests/Action.NestedDuplicateIds.json b/samples/Tests/Action.NestedDuplicateIds.json → ...v1.2/Tests/Action.NestedDuplicateIds.json
diff --git a/samples/Tests/AdaptiveCard.Version1.2.json → ...s/v1.2/Tests/AdaptiveCard.Version1.2.json b/samples/Tests/AdaptiveCard.Version1.2.json → ...s/v1.2/Tests/AdaptiveCard.Version1.2.json
diff --git a/...Image.VerticalAndHorizontalAlignment.json → ...Image.VerticalAndHorizontalAlignment.json b/...Image.VerticalAndHorizontalAlignment.json → ...Image.VerticalAndHorizontalAlignment.json
diff --git a/samples/Tests/Bleed.Comprehensive.json → samples/v1.2/Tests/Bleed.Comprehensive.json b/samples/Tests/Bleed.Comprehensive.json → samples/v1.2/Tests/Bleed.Comprehensive.json
diff --git a/...AllElements.Stretch.HiddenVisibility.json → ...AllElements.Stretch.HiddenVisibility.json b/...AllElements.Stretch.HiddenVisibility.json → ...AllElements.Stretch.HiddenVisibility.json
diff --git a/...AllElements.Stretch.ToggleVisibility.json → ...AllElements.Stretch.ToggleVisibility.json b/...AllElements.Stretch.ToggleVisibility.json → ...AllElements.Stretch.ToggleVisibility.json
diff --git a/...s/Tests/Container.HideAndShowElement.json → ...2/Tests/Container.HideAndShowElement.json b/...s/Tests/Container.HideAndShowElement.json → ...2/Tests/Container.HideAndShowElement.json
diff --git a/samples/Tests/DeepFallback.json → samples/v1.2/Tests/DeepFallback.json b/samples/Tests/DeepFallback.json → samples/v1.2/Tests/DeepFallback.json
diff --git a/samples/Tests/Element.Requires.json → samples/v1.2/Tests/Element.Requires.json b/samples/Tests/Element.Requires.json → samples/v1.2/Tests/Element.Requires.json
diff --git a/samples/Tests/EmptyFallbackCard.json → samples/v1.2/Tests/EmptyFallbackCard.json b/samples/Tests/EmptyFallbackCard.json → samples/v1.2/Tests/EmptyFallbackCard.json
diff --git a/samples/Tests/FallbackParsing.json → samples/v1.2/Tests/FallbackParsing.json b/samples/Tests/FallbackParsing.json → samples/v1.2/Tests/FallbackParsing.json
diff --git a/...sts/HideFirstVisibleElementSeparator.json → ...sts/HideFirstVisibleElementSeparator.json b/...sts/HideFirstVisibleElementSeparator.json → ...sts/HideFirstVisibleElementSeparator.json
diff --git a/...les/Tests/Image.DataUri.InvalidChars.json → ...1.2/Tests/Image.DataUri.InvalidChars.json b/...les/Tests/Image.DataUri.InvalidChars.json → ...1.2/Tests/Image.DataUri.InvalidChars.json
diff --git a/...sts/Input.Text.InlineAction.ShowCard.json → ...sts/Input.Text.InlineAction.ShowCard.json b/...sts/Input.Text.InlineAction.ShowCard.json → ...sts/Input.Text.InlineAction.ShowCard.json
diff --git a/samples/Tests/RichTextBlock.Highlights.json → .../v1.2/Tests/RichTextBlock.Highlights.json b/samples/Tests/RichTextBlock.Highlights.json → .../v1.2/Tests/RichTextBlock.Highlights.json
diff --git a/.../RichTextBlock.TextRun.SelectActions.json → .../RichTextBlock.TextRun.SelectActions.json b/.../RichTextBlock.TextRun.SelectActions.json → .../RichTextBlock.TextRun.SelectActions.json
diff --git a/...s/Tests/ToggleVisibility.AllElements.json → ...2/Tests/ToggleVisibility.AllElements.json b/...s/Tests/ToggleVisibility.AllElements.json → ...2/Tests/ToggleVisibility.AllElements.json
diff --git a/samples/Tests/AdaptiveCard.Version1.3.json → ...s/v1.3/Tests/AdaptiveCard.Version1.3.json b/samples/Tests/AdaptiveCard.Version1.3.json → ...s/v1.3/Tests/AdaptiveCard.Version1.3.json
diff --git a/source/dotnet/Test/AdaptiveCards.Test/AllPayloadTests.cs b/source/dotnet/Test/AdaptiveCards.Test/AllPayloadTests.cs
@@ -48,7 +48,7 @@ private void TestPayloadsInDirectory(string path, string[] excludedCards)
                     {
                         // If the card is excluded we might not parse properly
                         // skip it if there was a parse failure.
-                        if(!excluded)
+                        if (!excluded)
                         {
                             throw;
                         }
@@ -94,46 +94,39 @@ private void TestPayloadsInDirectory(string path, string[] excludedCards)
         public void TestAllScenarios()
         {
             TestPayloadsInDirectory(Path.Combine(SamplesPath, "v1.0", "scenarios"), null);
+            TestPayloadsInDirectory(Path.Combine(SamplesPath, "v1.1", "scenarios"), null);
         }
 
         [TestMethod]
         public void TestAllElements()
         {
-            // TODO: bring this test back once I investigate the warnings
-            TestPayloadsInDirectory(Path.Combine(SamplesPath, "v1.0", "elements"),
-                new string[]
-                {
-                    "Container.Style",
-                    "Action.ShowCard.Style"
-                });
+            TestPayloadsInDirectory(Path.Combine(SamplesPath, "v1.0", "elements"), null);
+            TestPayloadsInDirectory(Path.Combine(SamplesPath, "v1.1", "elements"), null);
+            TestPayloadsInDirectory(Path.Combine(SamplesPath, "v1.2", "elements"), null);
         }
 
         [TestMethod]
         public void TestAllTestCards()
         {
-            // List of json payloads that are expected to fail parsing
-            TestPayloadsInDirectory(Path.Combine(SamplesPath, "tests"),
+
+            TestPayloadsInDirectory(Path.Combine(SamplesPath, "v1.0", "tests"),
                 new string[]
-                {
+                {   
                     // These cards are expected to fail
-                    "AdaptiveCard.UnknownElements",
-                    "AdditionalProperty",
-                    "CustomParsingTestUsingProgressBar",
                     "TypeIsRequired",
-                    "AdaptiveCard.MinVersion",
                     "AdaptiveCard.MissingVersion",
-                    "AdaptiveCard.Version1.3",
-                    "FlightItinerary_es_fail",
+                });
+
+            TestPayloadsInDirectory(Path.Combine(SamplesPath, "v1.1", "tests"), null);
+            TestPayloadsInDirectory(Path.Combine(SamplesPath, "v1.2", "tests"),
+                new string[]
+                {
+                    // These cards are expected to fail
                     "Action.DuplicateIds",
                     "Action.NestedDuplicateIds",
-                    "Action.CustomParsing",
-
-                    // These are cards that features haven't been implemented yet
-                    // <this space intentionally blank>
-
-                    // These cards have AdaptiveCards with styles on them
-                    "ColumnColumnSetContainer.Bleed",
                 });
+
+            TestPayloadsInDirectory(Path.Combine(SamplesPath, "v1.3", "tests"), null);
         }
     }
 }