Merge branch 'main' into NMSHD-132-prevent-relationship-commands-with…

…-identities-to-be-deleted
nmshd · Jun 17, 2024 · 4fa34dd · 4fa34dd
2 parents 86bb3b3 + 292fa08
commit 4fa34dd
Show file tree

Hide file tree

Showing 29 changed files with 307 additions and 306 deletions.
diff --git a/.ci/integrationTest.postgres.sh b/.ci/integrationTest.postgres.sh
@@ -12,4 +12,4 @@ dotnet restore "Backbone.sln"
 dotnet build --no-restore "Backbone.sln"
 export CONSUMER_API_BASE_ADDRESS="http://localhost:5000"
 export ADMIN_API_BASE_ADDRESS="http://localhost:5173"
-dotnet test --no-restore --no-build --filter "Category=Integration&TestCategory!~ignore" --logger "GitHubActions;summary.includePassedTests=true" "Backbone.sln"
+dotnet test --no-restore --no-build --filter "Category=Integration&TestCategory!~ignore" --logger "GitHubActions;summary.includeNotFoundTests=false" "Backbone.sln"
diff --git a/.ci/integrationTest.sqlserver.sh b/.ci/integrationTest.sqlserver.sh
@@ -12,4 +12,4 @@ dotnet restore "Backbone.sln"
 dotnet build --no-restore "Backbone.sln"
 export CONSUMER_API_BASE_ADDRESS="http://localhost:5000"
 export ADMIN_API_BASE_ADDRESS="http://localhost:5173"
-dotnet test --no-restore --no-build --filter "Category=Integration&TestCategory!~ignore" --logger "GitHubActions;summary.includePassedTests=true" "Backbone.sln"
+dotnet test --no-restore --no-build --filter "Category=Integration&TestCategory!~ignore" --logger "GitHubActions;summary.includeNotFoundTests=false" "Backbone.sln"
diff --git a/.ci/test.sh b/.ci/test.sh
@@ -2,4 +2,4 @@
 
 dotnet restore "Backbone.sln"
 dotnet build --no-restore "Backbone.sln"
-dotnet test --no-restore --no-build --filter "Category!=Integration" --logger "GitHubActions;summary.includePassedTests=true" "Backbone.sln"
+dotnet test --no-restore --no-build --filter "Category!=Integration" --logger "GitHubActions;summary.includeNotFoundTests=false" "Backbone.sln"
diff --git a/AdminApi/src/AdminApi/AdminApi.csproj b/AdminApi/src/AdminApi/AdminApi.csproj
@@ -18,7 +18,7 @@
         <PackageReference Include="OpenIddict.EntityFrameworkCore" Version="5.6.0"/>
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2"/>
         <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
-        <PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.21.0" />
+        <PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.22.0" />
         <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
         <PackageReference Include="ReHackt.Extensions.Options.Validation" Version="8.0.2" />
         <PackageReference Include="Serilog" Version="4.0.0"/>

diff --git a/AdminApi/src/AdminApi/ClientApp/package-lock.json b/AdminApi/src/AdminApi/ClientApp/package-lock.json
diff --git a/AdminApi/src/AdminApi/ClientApp/package.json b/AdminApi/src/AdminApi/ClientApp/package.json
@@ -13,17 +13,17 @@
     },
     "private": true,
     "dependencies": {
-        "@angular/animations": "^18.0.2",
-        "@angular/cdk": "^18.0.2",
-        "@angular/common": "^18.0.2",
-        "@angular/compiler": "^18.0.2",
-        "@angular/core": "^18.0.2",
-        "@angular/forms": "^18.0.2",
-        "@angular/material": "^18.0.2",
-        "@angular/platform-browser": "^18.0.2",
-        "@angular/platform-browser-dynamic": "^18.0.2",
-        "@angular/platform-server": "^18.0.2",
-        "@angular/router": "^18.0.2",
+        "@angular/animations": "^18.0.3",
+        "@angular/cdk": "^18.0.3",
+        "@angular/common": "^18.0.3",
+        "@angular/compiler": "^18.0.3",
+        "@angular/core": "^18.0.3",
+        "@angular/forms": "^18.0.3",
+        "@angular/material": "^18.0.3",
+        "@angular/platform-browser": "^18.0.3",
+        "@angular/platform-browser-dynamic": "^18.0.3",
+        "@angular/platform-server": "^18.0.3",
+        "@angular/router": "^18.0.3",
         "@ngx-env/builder": "^18.0.1",
         "bootstrap": "^5.3.3",
         "jquery": "^3.7.1",
@@ -38,9 +38,9 @@
         "zone.js": "~0.14.7"
     },
     "devDependencies": {
-        "@angular-devkit/build-angular": "^18.0.3",
-        "@angular/cli": "^18.0.3",
-        "@angular/compiler-cli": "^18.0.2",
+        "@angular-devkit/build-angular": "^18.0.4",
+        "@angular/cli": "^18.0.4",
+        "@angular/compiler-cli": "^18.0.3",
         "@js-soft/eslint-config-ts": "^1.6.8",
         "@js-soft/license-check": "^1.0.9",
         "@types/jasmine": "~5.1.4",
@@ -53,7 +53,7 @@
         "karma-coverage": "~2.2.1",
         "karma-jasmine": "~5.1.0",
         "karma-jasmine-html-reporter": "^2.1.0",
-        "prettier": "^3.3.1",
+        "prettier": "^3.3.2",
         "typescript": "~5.4.5"
     },
     "overrides": {

diff --git a/AdminApi/test/AdminApi.Tests.Integration/AdminApi.Tests.Integration.csproj b/AdminApi/test/AdminApi.Tests.Integration/AdminApi.Tests.Integration.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
       <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0"/>
       <PackageReference Include="Newtonsoft.Json.Schema" Version="4.0.1"/>
-    <PackageReference Include="NJsonSchema.NewtonsoftJson" Version="11.0.0" />
+    <PackageReference Include="NJsonSchema.NewtonsoftJson" Version="11.0.1" />
     <PackageReference Include="ReHackt.Extensions.Options.Validation" Version="8.0.2" />
     <PackageReference Include="SolidToken.SpecFlow.DependencyInjection" Version="3.9.3" />
     <PackageReference Include="SpecFlow.Plus.LivingDocPlugin" Version="3.9.57" />

diff --git a/BuildingBlocks/src/BuildingBlocks.Application/BuildingBlocks.Application.csproj b/BuildingBlocks/src/BuildingBlocks.Application/BuildingBlocks.Application.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<ItemGroup>
-		<PackageReference Include="FluentValidation" Version="11.9.1" />
+		<PackageReference Include="FluentValidation" Version="11.9.2" />
         <PackageReference Include="MediatR" Version="12.3.0"/>
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6"/>
 	</ItemGroup>

diff --git a/BuildingBlocks/src/BuildingBlocks.SDK/BuildingBlocks.SDK.csproj b/BuildingBlocks/src/BuildingBlocks.SDK/BuildingBlocks.SDK.csproj
@@ -2,7 +2,7 @@
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.12.0" />
         <PackageReference Include="Newtonsoft.Json.Schema" Version="4.0.1"/>
-        <PackageReference Include="NJsonSchema.NewtonsoftJson" Version="11.0.0" />
+        <PackageReference Include="NJsonSchema.NewtonsoftJson" Version="11.0.1" />
     </ItemGroup>
     <ItemGroup>
       <ProjectReference Include="..\Tooling\Tooling.csproj" />

diff --git a/BuildingBlocks/src/UnitTestTools/UnitTestTools.csproj b/BuildingBlocks/src/UnitTestTools/UnitTestTools.csproj
@@ -8,7 +8,7 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="FluentValidation" Version="11.9.1"/>
+        <PackageReference Include="FluentValidation" Version="11.9.2"/>
         <PackageReference Include="MediatR" Version="12.3.0"/>
         <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.6"/>
         <PackageReference Include="xunit.assert" Version="2.8.1"/>

diff --git a/ConsumerApi.Tests.Integration/ConsumerApi.Tests.Integration.csproj b/ConsumerApi.Tests.Integration/ConsumerApi.Tests.Integration.csproj
@@ -13,7 +13,7 @@
         <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageReference Include="Newtonsoft.Json.Schema" Version="4.0.1" />
-        <PackageReference Include="NJsonSchema.NewtonsoftJson" Version="11.0.0" />
+        <PackageReference Include="NJsonSchema.NewtonsoftJson" Version="11.0.1" />
         <PackageReference Include="ReHackt.Extensions.Options.Validation" Version="8.0.2" />
         <PackageReference Include="SolidToken.SpecFlow.DependencyInjection" Version="3.9.3" />
         <PackageReference Include="SpecFlow.Plus.LivingDocPlugin" Version="3.9.57" />

diff --git a/ConsumerApi/ConsumerApi.csproj b/ConsumerApi/ConsumerApi.csproj
@@ -8,7 +8,7 @@
         <PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="8.0.2"/>
 		<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
         <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.6"/>
-		<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.21.0" />
+		<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.22.0" />
 		<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.6"/>
         <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1"/>

diff --git a/DatabaseMigrator/DatabaseMigrator.csproj b/DatabaseMigrator/DatabaseMigrator.csproj
@@ -19,7 +19,7 @@
         <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.1"/>
         <PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0"/>
         <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0"/>
-        <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0"/>
+        <PackageReference Include="Serilog.Sinks.Debug" Version="3.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"/>

diff --git a/DatabaseMigrator/Dockerfile b/DatabaseMigrator/Dockerfile
@@ -1,7 +1,7 @@
 FROM mcr.microsoft.com/dotnet/aspnet:8.0.5-alpine3.18 AS base
 WORKDIR /app
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0.301 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0.302 AS build
 WORKDIR /src
 
 COPY ["Directory.Build.props", "."]

diff --git a/EventHandlerService/src/EventHandlerService/Dockerfile b/EventHandlerService/src/EventHandlerService/Dockerfile
@@ -1,7 +1,7 @@
 FROM mcr.microsoft.com/dotnet/aspnet:8.0.6-alpine3.18 AS base
 WORKDIR /app
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0.301 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0.302 AS build
 WORKDIR /src
 
 COPY ["Directory.Build.props", "."]

diff --git a/Jobs/src/Job.IdentityDeletion/Dockerfile b/Jobs/src/Job.IdentityDeletion/Dockerfile
@@ -1,7 +1,7 @@
 FROM mcr.microsoft.com/dotnet/aspnet:8.0.6-alpine3.18 AS base
 WORKDIR /app
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0.301 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0.302 AS build
 WORKDIR /src
 
 COPY ["Directory.Build.props", "."]

diff --git a/Modules/Challenges/src/Challenges.Application/Challenges.Application.csproj b/Modules/Challenges/src/Challenges.Application/Challenges.Application.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<ItemGroup>
-		<PackageReference Include="FluentValidation" Version="11.9.1" />
-		<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.1" />
+		<PackageReference Include="FluentValidation" Version="11.9.2" />
+		<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.2" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/Modules/Devices/src/Devices.AdminCli/Dockerfile b/Modules/Devices/src/Devices.AdminCli/Dockerfile
@@ -1,7 +1,7 @@
 FROM mcr.microsoft.com/dotnet/runtime:8.0.6 AS base
 WORKDIR /app
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0.301 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0.302 AS build
 WORKDIR /src
 
 COPY ["Directory.Build.props", "."]

diff --git a/Modules/Devices/src/Devices.Application/Devices.Application.csproj b/Modules/Devices/src/Devices.Application/Devices.Application.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
-        <PackageReference Include="FluentValidation" Version="11.9.1" />
-        <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.1" />
+        <PackageReference Include="FluentValidation" Version="11.9.2" />
+        <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.2" />
         <PackageReference Include="OpenIddict.Core" Version="5.6.0" />
         <PackageReference Include="OpenIddict.EntityFrameworkCore" Version="5.6.0" />
     </ItemGroup>

diff --git a/Modules/Files/src/Files.Application/Files.Application.csproj b/Modules/Files/src/Files.Application/Files.Application.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<ItemGroup>
-		<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.1" />
+		<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.2" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/Modules/Messages/src/Messages.Application/Messages.Application.csproj b/Modules/Messages/src/Messages.Application/Messages.Application.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<ItemGroup>
-		<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.1" />
+		<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.2" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/Modules/Messages/src/Messages.Common/Messages.Common.csproj b/Modules/Messages/src/Messages.Common/Messages.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
-        <PackageReference Include="FluentValidation" Version="11.9.1" />
+        <PackageReference Include="FluentValidation" Version="11.9.2" />
     </ItemGroup>
 
 </Project>
diff --git a/Modules/Relationships/src/Relationships.Application/Relationships.Application.csproj b/Modules/Relationships/src/Relationships.Application/Relationships.Application.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<ItemGroup>
-		<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.1" />
+		<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.2" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/Modules/Relationships/src/Relationships.Common/Relationships.Common.csproj b/Modules/Relationships/src/Relationships.Common/Relationships.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
-        <PackageReference Include="FluentValidation" Version="11.9.1" />
+        <PackageReference Include="FluentValidation" Version="11.9.2" />
     </ItemGroup>
 
 </Project>
diff --git a/Modules/Synchronization/src/Synchronization.Application/Synchronization.Application.csproj b/Modules/Synchronization/src/Synchronization.Application/Synchronization.Application.csproj
@@ -6,8 +6,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="AutoMapper.Extensions.EnumMapping" Version="3.2.0" />
-		<PackageReference Include="FluentValidation" Version="11.9.1" />
-		<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.1" />
+		<PackageReference Include="FluentValidation" Version="11.9.2" />
+		<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.2" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/Modules/Tokens/src/Tokens.Application/Tokens.Application.csproj b/Modules/Tokens/src/Tokens.Application/Tokens.Application.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<ItemGroup>
-		<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.1" />
+		<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.2" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/Modules/Tokens/test/Tokens.Domain.Tests/Tokens.Domain.Tests.csproj b/Modules/Tokens/test/Tokens.Domain.Tests/Tokens.Domain.Tests.csproj
@@ -6,7 +6,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.12.0"/>
-        <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3">
+        <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/SseServer/src/SseServer/SseServer.csproj b/SseServer/src/SseServer/SseServer.csproj
@@ -3,7 +3,7 @@
     <ItemGroup>
         <PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="8.0.2"/>
         <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.6"/>
-        <PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.21.0"/>
+        <PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.22.0"/>
         <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0"/>
         <PackageReference Include="ReHackt.Extensions.Options.Validation" Version="8.0.2"/>
         <PackageReference Include="Serilog" Version="4.0.0"/>

diff --git a/SseServer/test/SseServerTests/SseServerTests.csproj b/SseServer/test/SseServerTests/SseServerTests.csproj
@@ -6,10 +6,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="coverlet.collector" Version="6.0.0"/>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
-        <PackageReference Include="xunit" Version="2.5.3"/>
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3"/>
+        <PackageReference Include="coverlet.collector" Version="6.0.2"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0"/>
+        <PackageReference Include="xunit" Version="2.8.1"/>
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1"/>
         <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>