Next 0.1.20 (#32)

* added version tag for similar types

* updated SDK to 0.1.20

Author: darkfriend77

DEVELOPMENT.md

@@ -17,7 +17,7 @@ set AJUNA_ROOT=D:\Ajuna.SDK
 set LOCAL_NUGET_ROOT=D:\NuGet
 set LOCAL_NUGET_CACHE=%SYSTEMDRIVE%\Users\%USERNAME%\.nuget\packages
 set LOCAL_NUGET_BINARY=nuget.exe
-set AJUNA_VERSION=0.1.19
+set AJUNA_VERSION=0.1.20
 
 cd %AJUNA_ROOT%
 dotnet build --configuration Release

README.md

@@ -54,7 +54,7 @@ Using a terminal of your choice, create a new directory for your project and exe
 ```sh
 dotnet new sln
 dotnet new ajuna \
-   --sdk_version 0.1.19 \
+   --sdk_version 0.1.20 \
    --rest_service AjunaExample.RestService \
    --net_api AjunaExample.NetApi \
    --rest_client AjunaExample.RestClient \

Tools/Ajuna.DotNet/Service/Node/Base/TypeBuilderBase.cs

@@ -1,6 +1,8 @@
 using Ajuna.DotNet.Extensions;
 using Ajuna.NetApi.Model.Meta;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
 
 namespace Ajuna.DotNet.Service.Node.Base
 {
@@ -12,9 +14,24 @@ public TypeBuilderBase(string projectName, uint id, NodeType typeDef, Dictionary
           : base(projectName, id, typeDict)
       {
          TypeDef = typeDef;
-         NamespaceName = typeDef.Path != null && typeDef.Path.Length > 1
-             ? $"{ProjectName}.Generated.Model.{typeDef.Path[0].MakeMethod()}"
-             : $"{ProjectName}.Generated.Model.Base";
+         NamespaceName = $"{ProjectName}.Generated.Model.{TypeNameSpace(typeDef.Path)}";
+      }
+
+      private string TypeNameSpace(string[] path)
+      {
+         if (path == null || path.Length < 2)
+         {
+            return "Base";
+         }
+
+         // heck if we have a versioned name space
+         IEnumerable<string> vWhere = path.Where(p => Regex.IsMatch(p, @"v[0-9]+"));
+         if (vWhere.Any())
+         {
+            return path[0].MakeMethod() + "." + vWhere.First().MakeMethod();
+         }
+
+         return path[0].MakeMethod();
       }
    }
 }

Version.props

@@ -4,9 +4,9 @@
       <!-- Configuration -->
       <VersionMajor>0</VersionMajor>
       <VersionMinor>1</VersionMinor>
-      <VersionPatch>19</VersionPatch>
+      <VersionPatch>20</VersionPatch>
       <AssemblyVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)</AssemblyVersion>
-      <AjunaPackageVersion>0.1.19</AjunaPackageVersion>
+      <AjunaPackageVersion>0.1.20</AjunaPackageVersion>
 
       <!-- Variables -->
       <AjunaVersion>$(AssemblyVersion)</AjunaVersion>