Fix appsettings.json, appsettings.json.tmpl

Author: kapozade

SupremeDotnetApiTemplate.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <PackageType>Template</PackageType>
-    <PackageVersion>1.2.0-rc.1</PackageVersion>
+    <PackageVersion>1.2.0-rc.2</PackageVersion>
     <PackageId>Supreme.Dotnet.Api.Template</PackageId>
     <Title>Supreme API Template</Title>
     <Authors>Onur Kapçık</Authors>

templates/api/src/Supreme.Api/appsettings.json

@@ -5,7 +5,9 @@
   "Serilog": {
     "MinimumLevel": "Information",
     "Override": {
+//#if (enable-outbox-pattern)
       "DotNetCore.CAP.Internal.SubscribeDispatcher": "None",
+//#endif
       "Microsoft": "Warning",
       "Microsoft.Hosting.Lifetime": "Information"
     },
@@ -24,15 +26,6 @@
       "WithThreadId"
     ]
   },
-  //#if (enable-outbox-pattern)
-  "RabbitMqSettings": {
-    "Host": "localhost",
-    "Port": 5672,
-    "VirtualHost": "/",
-    "Username": "guest",
-    "Password": "guest"
-  },
-  //#endif
   "ApplicationSettings": {
   },
   "RedisSettings": {
@@ -42,6 +35,15 @@
     "User": "User",
     "Password": "Password"
   },
+  //#if (enable-outbox-pattern)
+  "RabbitMqSettings": {
+    "Host": "localhost",
+    "Port": 5672,
+    "VirtualHost": "/",
+    "Username": "guest",
+    "Password": "guest"
+  },
+  //#endif
   //#if (enable-open-telemetry)
   "JaegerSettings": {
     "Url": "http://localhost:4317"

templates/api/src/Supreme.Api/appsettings.json.tmpl

@@ -5,7 +5,9 @@
   "Serilog": {
     "MinimumLevel": "Information",
     "Override": {
+//#if (enable-outbox-pattern)
       "DotNetCore.CAP.Internal.SubscribeDispatcher": "None",
+//#endif
       "Microsoft": "Warning",
       "Microsoft.Hosting.Lifetime": "Information"
     },
@@ -24,15 +26,6 @@
       "WithThreadId"
     ]
   },
-  //#if (enable-outbox-pattern)
-  "RabbitMqSettings": {
-    "Host": "$RABBITMQ_HOST",
-    "Port": $RABBITMQ_PORT,
-    "VirtualHost": "$RABBITMQ_VHOST",
-    "Username": "$RABBITMQ_USERNAME",
-    "Password": "$RABBITMQ_PASSWORD",
-  },
-  //#endif
   "ApplicationSettings": {
   },
   "RedisSettings": {
@@ -42,9 +35,18 @@
     "User": "$REDIS_USER",
     "Password": "$REDIS_PASSWORD",
   },
-  //#if (enable-open-telemetry)
+//#if (enable-outbox-pattern)
+  "RabbitMqSettings": {
+    "Host": "$RABBITMQ_HOST",
+    "Port": $RABBITMQ_PORT,
+    "VirtualHost": "$RABBITMQ_VHOST",
+    "Username": "$RABBITMQ_USERNAME",
+    "Password": "$RABBITMQ_PASSWORD",
+  },
+//#endif
+//#if (enable-open-telemetry)
   "JaegerSettings": {
-    "Url": "$JAEGER_HOST",
+    "Url": "$JAEGER_HOST"
   }
-  //#endif
+//#endif
 }