updated to 0.6.7 added new rust enum version (#83)

* updated to 0.6.7 added new rust enum version
updated net api to 24-rc5

* updated comments

Author: darkfriend77

README.md

@@ -56,7 +56,7 @@ Using a terminal of your choice, create a new directory for your project and exe
 ```sh
 dotnet new sln
 dotnet new substrate \
-   --sdk_version 0.6.6 \
+   --sdk_version 0.6.7 \
    --rest_service PROJECTNAME.RestService \
    --net_api PROJECTNAME.NetApiExt \
    --net_integration PROJECTNAME.Integration \
@@ -127,7 +127,7 @@ You can also watch our short step-by-step tutorial that guides you through the e
  - AstarNET
  ```sh
    dotnet new substrate \
-      --sdk_version 0.6.6 \  
+      --sdk_version 0.6.7 \  
       --rest_service AstarNET.RestService \  
       --net_api AstarNET.NetApiExt \  
       --net_api AstarNET.Integration \ 

Substrate.AspNetCore/Substrate.AspNetCore.csproj

@@ -11,7 +11,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
 	</ItemGroup>
 
 	<ItemGroup>

Substrate.ServiceLayer/Substrate.ServiceLayer.csproj

@@ -11,8 +11,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
-		<PackageReference Include="Substrate.NET.API" Version="0.9.24-rc1" />
+		<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
+		<PackageReference Include="Substrate.NET.API" Version="0.9.24-rc5" />
 		<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
 	</ItemGroup>
 

Tools/Substrate.DotNet.Template/templates/Substrate/.template.config/template.json

@@ -12,14 +12,14 @@
   "symbols": {
     "sdk_version": {
       "datatype": "string",
-      "defaultValue": "0.6.6",
+      "defaultValue": "0.6.7",
       "description": "Uses the given Substrate .NET Toolchain version.",
       "replaces": "SUBSTRATE_TOOLCHAIN_VERSION",
       "type": "parameter"
     },
     "api_version": {
       "datatype": "string",
-      "defaultValue": "0.9.24-rc1",
+      "defaultValue": "0.9.24-rc5",
       "description": "Uses the given Substrate .NET API version.",
       "replaces": "SUBSTRATE_NETAPI_VERSION",
       "type": "parameter"

Tools/Substrate.DotNet/Service/Node/Base/BuilderBase.cs

@@ -7,14 +7,13 @@
 
 namespace Substrate.DotNet.Service.Node.Base
 {
-
    public abstract class BuilderBase
    {
       public static readonly List<string> Files = new();
 
       public uint Id { get; }
-      
-      NodeTypeResolver Resolver { get; }
+
+      private NodeTypeResolver Resolver { get; }
 
       public bool Success { get; set; }
 
@@ -153,7 +152,7 @@ private string GetPath(string basePath)
 
          space.Add((FileName is null ? ClassName : FileName) + ".cs");
 
-         // Remove the first two parts of the namespace to avoid the files being created in the Substrate/NetApi sub folder. 
+         // Remove the first two parts of the namespace to avoid the files being created in the Substrate/NetApi sub folder.
          space = space.TakeLast(space.Count - 2).ToList();
 
          // Add base path at the beginning of the paths list
@@ -176,8 +175,25 @@ protected void AddTargetClassCustomAttributes(CodeTypeDeclaration targetClass, N
          targetClass.CustomAttributes.Add(new CodeAttributeDeclaration(new CodeTypeReference("SubstrateNodeType"), new CodeAttributeArgument(
             new CodeSnippetExpression($"TypeDefEnum.{typeDef.TypeDef}")
          )));
-
       }
 
+      public static string HandleReservedKeyword(string name)
+      {
+         // List of C# reserved keywords
+         var reservedKeywords = new HashSet<string>
+          {
+              "abstract", "as", "base", "bool", "break", "byte", "case", "catch", "char", "checked", "class",
+              "const", "continue", "decimal", "default", "delegate", "do", "double", "else", "enum", "event",
+              "explicit", "extern", "false", "finally", "fixed", "float", "for", "foreach", "goto", "if",
+              "implicit", "in", "int", "interface", "internal", "is", "lock", "long", "namespace", "new", "null",
+              "object", "operator", "out", "override", "params", "private", "protected", "public", "readonly",
+              "ref", "return", "sbyte", "sealed", "short", "sizeof", "stackalloc", "static", "string", "struct",
+              "switch", "this", "throw", "true", "try", "typeof", "uint", "ulong", "unchecked", "unsafe", "ushort",
+              "using", "virtual", "void", "volatile", "while"
+          };
+
+         // If the name is a reserved keyword, prepend with @
+         return reservedKeywords.Contains(name) ? $"@{name}" : name;
+      }
    }
 }

Tools/Substrate.DotNet/Service/Node/EnumBuilder.cs

@@ -39,8 +39,8 @@
    </ItemGroup>
 
    <ItemGroup>
-	   <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
-	   <PackageReference Include="Substrate.NET.API" Version="0.9.24-rc1" />
+	   <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
+	   <PackageReference Include="Substrate.NET.API" Version="0.9.24-rc5" />
       <PackageReference Include="System.CodeDom" Version="8.0.0" />
       <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
    </ItemGroup>

Tools/Substrate.DotNet/Substrate.DotNet.csproj

@@ -4,10 +4,10 @@
       <!-- Configuration -->
       <VersionMajor>0</VersionMajor>
       <VersionMinor>6</VersionMinor>
-      <VersionPatch>6</VersionPatch>
+      <VersionPatch>7</VersionPatch>
       <AssemblyVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)</AssemblyVersion>
 
-      <SubstratePackageVersion>0.6.6</SubstratePackageVersion>
+      <SubstratePackageVersion>0.6.7</SubstratePackageVersion>
 
       <!-- Variables -->
       <SubstrateVersion>$(AssemblyVersion)</SubstrateVersion>