Merged conflicts from pulling down latest development

Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 16:29:27 -05:00
parent 40f9761f86 e9dd032a75
commit f47e71da36
119 changed files with 1006 additions and 1506 deletions
@@ -1,29 +1,12 @@
 {
-    "gem_name": "ScriptCanvasTesting",
-    "GemFormatVersion": 4,
-    "Uuid": "387b1b2d39ce45fbbfbb6faa5f902cac",
-    "Name": "ScriptCanvasTesting",
-    "DisplayName": "Script Canvas Testing",
-    "Version": "0.1.0",
-    "Summary": "Provides a framework for testing for and with ScriptCanvas",
-    "Tags": ["Scripting", "Testing"],
-    "IconPath": "preview.png",
-    "Modules": [
-        {
-            "Type": "EditorModule",
-            "Name": "Editor"
-        }
-    ],
-    "Dependencies" : [
-      {
-        "Uuid": "875b6fcbdeea44deaae7984ad9bb6cdc",
-        "VersionConstraints": [ ">=0.1.0" ],
-        "_comment": "GraphCanvas"
-      },
-      {
-        "Uuid": "869a0d0ec11a45c299917d45c81555e6",
-        "VersionConstraints": [ ">=0.1.0" ],
-        "_comment": "ScriptCanvas"
-      }
-    ]
+  "gem_name": "ScriptCanvasTesting",
+  "display_name": "Script Canvas Testing",
+  "license": "Apache-2.0 Or MIT",
+  "origin": "Open 3D Engine - o3de.org",
+  "type": "Tool",
+  "summary": "The Script Canvas Testing Gem provides a framework for testing for and with Script Canvas.",
+  "canonical_tags": ["Gem"],
+  "user_tags": ["Scripting", "Debug", "Framework"],
+  "icon_path": "preview.png",
+  "requirements": ""
 }