From 61bd457f2b0ff4556befe8738c62100d84e78583 Mon Sep 17 00:00:00 2001 From: "Liu, Shabai" <SLiu@cvent.com> Date: Tue, 12 Aug 2014 10:09:51 -0400 Subject: [PATCH] Get ready for release --- .../Properties/AssemblyInfo.cs | 4 ++-- .../Properties/AssemblyInfo.cs | 4 ++-- .../Cvent.SchemaToPoco.Core/Properties/AssemblyInfo.cs | 4 ++-- .../Util/JsonSchemaResolverUtil.cs | 10 ++-------- Source/Test/Properties/AssemblyInfo.cs | 4 ++-- 5 files changed, 10 insertions(+), 16 deletions(-) diff --git a/Source/Cvent.SchemaToPoco.Console/Properties/AssemblyInfo.cs b/Source/Cvent.SchemaToPoco.Console/Properties/AssemblyInfo.cs index dec1f99..c72a2fc 100644 --- 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 index e282655..29c932d 100644 --- 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 index d83a971..2f834bb 100644 --- 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 index a3cdcad..a3f9c04 100644 --- 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 index 5070c75..0edaba7 100644 --- 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.*")]