Get ready for release

cvent · Aug 12, 2014 · 61bd457 · 61bd457
1 parent f0b7def
commit 61bd457
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 16 deletions.
diff --git a/Source/Cvent.SchemaToPoco.Console/Properties/AssemblyInfo.cs b/Source/Cvent.SchemaToPoco.Console/Properties/AssemblyInfo.cs
@@ -11,5 +11,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("d81b81d4-c2b9-4c31-b372-bd2c23fd7191")]
-[assembly: AssemblyVersion("1.1.*")]
-[assembly: AssemblyFileVersion("1.1.*")]
+[assembly: AssemblyVersion("1.2.*")]
+[assembly: AssemblyFileVersion("1.2.*")]
diff --git a/Source/Cvent.SchemaToPoco.Core.UnitTests/Properties/AssemblyInfo.cs b/Source/Cvent.SchemaToPoco.Core.UnitTests/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.1.*")]
-[assembly: AssemblyFileVersion("1.1.*")]
+[assembly: AssemblyVersion("1.2.*")]
+[assembly: AssemblyFileVersion("1.2.*")]
diff --git a/Source/Cvent.SchemaToPoco.Core/Properties/AssemblyInfo.cs b/Source/Cvent.SchemaToPoco.Core/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.1.*")]
-[assembly: AssemblyFileVersion("1.1.*")]
+[assembly: AssemblyVersion("1.2.*")]
+[assembly: AssemblyFileVersion("1.2.*")]
diff --git a/Source/Cvent.SchemaToPoco.Core/Util/JsonSchemaResolverUtil.cs b/Source/Cvent.SchemaToPoco.Core/Util/JsonSchemaResolverUtil.cs
@@ -147,15 +147,9 @@ private JsonSchemaWrapper ResolveSchemaHelper(Uri curr, Uri parent, string data)
                         var isProp = prop.Name.Equals("properties");
                         var isItem = prop.Name.Equals("items");
 
-                        if (isProp || isItem)
+                        // TODO ehhhh let's avoid hardcoding this
+                        if (isProp || (isItem && prop.Value.ToString().Contains("\"properties\"")))
                         {
-                            // If it's an array, also check that it needs to be created
-                            // TODO ehhhh let's avoid hardcoding this
-                            if (isItem && !prop.Value.ToString().Contains("\"properties\""))
-                            {
-                                break;
-                            }
-
                             var propData = isProp ? s.Value.ToString() : prop.Value.ToString();
 
                             // Create dummy internal Uri

diff --git a/Source/Test/Properties/AssemblyInfo.cs b/Source/Test/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.1.*")]
-[assembly: AssemblyFileVersion("1.1.*")]
+[assembly: AssemblyVersion("1.2.*")]
+[assembly: AssemblyFileVersion("1.2.*")]