Merge branch 'main' into nmshdb-124-extension-of-the-audit-log

nmshd · Jul 4, 2024 · 0f1d352 · 0f1d352
2 parents 1f691d9 + d7a15aa
commit 0f1d352
Show file tree

Hide file tree

Showing 25 changed files with 306 additions and 679 deletions.
diff --git a/AdminApi/src/AdminApi/AdminApi.csproj b/AdminApi/src/AdminApi/AdminApi.csproj
@@ -56,6 +56,11 @@
     <ItemGroup>
         <Folder Include="ClientApp\src\"/>
     </ItemGroup>
+    <ItemGroup>
+        <Content Include="..\..\..\appsettings.override.json" Condition="$(Configuration) == Debug">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+    </ItemGroup>
 
     <Target Name="DebugEnsureNodeEnv" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('$(SpaRoot)node_modules') ">
         <!-- Ensure Node.js is installed -->

diff --git a/AdminApi/src/AdminApi/Properties/launchSettings.json b/AdminApi/src/AdminApi/Properties/launchSettings.json
@@ -1,13 +1,14 @@
 {
-    "$schema": "http://json.schemastore.org/launchsettings.json",
-    "profiles": {
-        "Default": {
-            "commandName": "Project",
-            "environmentVariables": {
-                "ASPNETCORE_ENVIRONMENT": "Local",
-                "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy",
-              "ASPNETCORE_URLS": "http://*:8082"
-            }
-        }
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "Default": {
+      "commandName": "Project",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Local",
+        "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy",
+        "ASPNETCORE_URLS": "http://*:8082"
+      },
+      "workingDirectory": "bin/Debug/$(TargetFramework)"
     }
+  }
 }
diff --git a/AdminApi/src/AdminApi/appsettings.override.json b/AdminApi/src/AdminApi/appsettings.override.json
diff --git a/ConsumerApi/ConsumerApi.csproj b/ConsumerApi/ConsumerApi.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <UserSecretsId>f114fba8-95dd-4fee-8385-af8e8a343c68</UserSecretsId>
     </PropertyGroup>
-
+    
     <ItemGroup>
         <PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="8.0.2"/>
         <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0"/>
@@ -44,4 +44,9 @@
         <ProjectReference Include="..\Modules\Tokens\src\Tokens.ConsumerApi\Tokens.ConsumerApi.csproj"/>
     </ItemGroup>
 
+    <ItemGroup>
+        <Content Include="..\appsettings.override.json" Condition="$(Configuration) == Debug">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+    </ItemGroup>
 </Project>
diff --git a/ConsumerApi/Properties/launchSettings.json b/ConsumerApi/Properties/launchSettings.json
@@ -7,7 +7,8 @@
         "Modules__Files__Infrastructure__BlobStorage__ConnectionInfo": "DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://localhost:10000/devstoreaccount1;",
         "ASPNETCORE_ENVIRONMENT": "Local",
         "ASPNETCORE_URLS": "http://*:8081"
-      }
+      },
+      "workingDirectory": "bin/Debug/$(TargetFramework)"
     }
   }
 }
diff --git a/ConsumerApi/appsettings.override.json b/ConsumerApi/appsettings.override.json
diff --git a/DatabaseMigrator/DatabaseMigrator.csproj b/DatabaseMigrator/DatabaseMigrator.csproj
@@ -20,7 +20,7 @@
         <PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0"/>
         <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0"/>
         <PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0"/>
-        <PackageReference Include="Serilog.Sinks.Http" Version="9.0.0" />
+        <PackageReference Include="Serilog.Sinks.Http" Version="9.0.0"/>
         <PackageReference Include="Serilog.Sinks.Seq" Version="8.0.0"/>
         <PackageReference Include="System.Data.SqlClient" Version="4.8.6"/>
     </ItemGroup>
@@ -53,4 +53,10 @@
         <ProjectReference Include="..\Modules\Tokens\src\Tokens.Infrastructure.Database.SqlServer\Tokens.Infrastructure.Database.SqlServer.csproj"/>
         <ProjectReference Include="..\Modules\Tokens\src\Tokens.Infrastructure\Tokens.Infrastructure.csproj"/>
     </ItemGroup>
+
+    <ItemGroup>
+        <Content Include="..\appsettings.override.json" Condition="$(Configuration) == Debug">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+    </ItemGroup>
 </Project>
diff --git a/DatabaseMigrator/Properties/launchSettings.json b/DatabaseMigrator/Properties/launchSettings.json
@@ -3,7 +3,8 @@
   "profiles": {
     "Default": {
       "commandName": "Project",
-      "environmentVariables": {}
+      "environmentVariables": {},
+      "workingDirectory": "bin/Debug/$(TargetFramework)"
     }
   }
 }
diff --git a/DatabaseMigrator/appsettings.override.json b/DatabaseMigrator/appsettings.override.json