From a2d45c09ad7fc245f4f81af1486118b6331dcf6c Mon Sep 17 00:00:00 2001
From: Justin Baur <19896123+justindbaur@users.noreply.github.com>
Date: Mon, 24 Apr 2023 13:51:08 -0400
Subject: [PATCH] Fix Organization License Sync (#2864)
---
...cial.Infrastructure.EntityFramework.csproj | 2 +-
.../packages.lock.json | 14 ++++++-------
bitwarden_license/src/Scim/packages.lock.json | 12 +++++------
bitwarden_license/src/Sso/packages.lock.json | 12 +++++------
.../Scim.IntegrationTest/packages.lock.json | 12 +++++------
.../test/Scim.Test/packages.lock.json | 12 +++++------
src/Admin/packages.lock.json | 12 +++++------
src/Api/packages.lock.json | 14 ++++++-------
src/Billing/packages.lock.json | 12 +++++------
src/Events/packages.lock.json | 12 +++++------
src/EventsProcessor/packages.lock.json | 12 +++++------
src/Icons/packages.lock.json | 12 +++++------
src/Identity/packages.lock.json | 12 +++++------
.../Infrastructure.EntityFramework.csproj | 2 +-
.../Models/Organization.cs | 9 ++++++++
.../Repositories/OrganizationRepository.cs | 21 +++++++------------
.../packages.lock.json | 12 +++++------
src/Notifications/packages.lock.json | 12 +++++------
src/SharedWeb/packages.lock.json | 12 +++++------
test/Api.IntegrationTest/packages.lock.json | 14 ++++++-------
test/Api.Test/packages.lock.json | 14 ++++++-------
test/Billing.Test/packages.lock.json | 12 +++++------
test/Icons.Test/packages.lock.json | 12 +++++------
.../packages.lock.json | 12 +++++------
test/Identity.Test/packages.lock.json | 12 +++++------
.../packages.lock.json | 12 +++++------
.../packages.lock.json | 12 +++++------
test/IntegrationTestCommon/packages.lock.json | 12 +++++------
util/MySqlMigrations/packages.lock.json | 12 +++++------
util/PostgresMigrations/packages.lock.json | 12 +++++------
util/SqlServerEFScaffold/packages.lock.json | 14 ++++++-------
util/SqliteMigrations/packages.lock.json | 12 +++++------
32 files changed, 191 insertions(+), 189 deletions(-)
diff --git a/bitwarden_license/src/Commercial.Infrastructure.EntityFramework/Commercial.Infrastructure.EntityFramework.csproj b/bitwarden_license/src/Commercial.Infrastructure.EntityFramework/Commercial.Infrastructure.EntityFramework.csproj
index 7e94399c03..e8d2b507ff 100644
--- a/bitwarden_license/src/Commercial.Infrastructure.EntityFramework/Commercial.Infrastructure.EntityFramework.csproj
+++ b/bitwarden_license/src/Commercial.Infrastructure.EntityFramework/Commercial.Infrastructure.EntityFramework.csproj
@@ -4,7 +4,7 @@
enable
-
+
diff --git a/bitwarden_license/src/Commercial.Infrastructure.EntityFramework/packages.lock.json b/bitwarden_license/src/Commercial.Infrastructure.EntityFramework/packages.lock.json
index aefe4b6582..8c22aac980 100644
--- a/bitwarden_license/src/Commercial.Infrastructure.EntityFramework/packages.lock.json
+++ b/bitwarden_license/src/Commercial.Infrastructure.EntityFramework/packages.lock.json
@@ -4,11 +4,11 @@
"net6.0": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Direct",
- "requested": "[11.0.0, )",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "requested": "[12.0.1, )",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -34,8 +34,8 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
@@ -2782,7 +2782,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",
diff --git a/bitwarden_license/src/Scim/packages.lock.json b/bitwarden_license/src/Scim/packages.lock.json
index d9a9099e26..e53e007446 100644
--- a/bitwarden_license/src/Scim/packages.lock.json
+++ b/bitwarden_license/src/Scim/packages.lock.json
@@ -24,18 +24,18 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -2793,7 +2793,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",
diff --git a/bitwarden_license/src/Sso/packages.lock.json b/bitwarden_license/src/Sso/packages.lock.json
index 1fcf421d45..750a13b70d 100644
--- a/bitwarden_license/src/Sso/packages.lock.json
+++ b/bitwarden_license/src/Sso/packages.lock.json
@@ -36,18 +36,18 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -2952,7 +2952,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",
diff --git a/bitwarden_license/test/Scim.IntegrationTest/packages.lock.json b/bitwarden_license/test/Scim.IntegrationTest/packages.lock.json
index fd17eea09b..4a1d7324fb 100644
--- a/bitwarden_license/test/Scim.IntegrationTest/packages.lock.json
+++ b/bitwarden_license/test/Scim.IntegrationTest/packages.lock.json
@@ -105,18 +105,18 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -3211,7 +3211,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",
diff --git a/bitwarden_license/test/Scim.Test/packages.lock.json b/bitwarden_license/test/Scim.Test/packages.lock.json
index 41549ffe83..9b4e5e1a8f 100644
--- a/bitwarden_license/test/Scim.Test/packages.lock.json
+++ b/bitwarden_license/test/Scim.Test/packages.lock.json
@@ -93,18 +93,18 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -3048,7 +3048,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",
diff --git a/src/Admin/packages.lock.json b/src/Admin/packages.lock.json
index 3b8a0ba64a..5b57e3b372 100644
--- a/src/Admin/packages.lock.json
+++ b/src/Admin/packages.lock.json
@@ -44,18 +44,18 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -2889,7 +2889,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",
diff --git a/src/Api/packages.lock.json b/src/Api/packages.lock.json
index 1cdcfc8247..265ff8d618 100644
--- a/src/Api/packages.lock.json
+++ b/src/Api/packages.lock.json
@@ -47,18 +47,18 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -2804,7 +2804,7 @@
"commercial.infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Infrastructure.EntityFramework": "2023.3.0"
}
@@ -2861,7 +2861,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",
diff --git a/src/Billing/packages.lock.json b/src/Billing/packages.lock.json
index d9a9099e26..e53e007446 100644
--- a/src/Billing/packages.lock.json
+++ b/src/Billing/packages.lock.json
@@ -24,18 +24,18 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -2793,7 +2793,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",
diff --git a/src/Events/packages.lock.json b/src/Events/packages.lock.json
index d9a9099e26..e53e007446 100644
--- a/src/Events/packages.lock.json
+++ b/src/Events/packages.lock.json
@@ -24,18 +24,18 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -2793,7 +2793,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",
diff --git a/src/EventsProcessor/packages.lock.json b/src/EventsProcessor/packages.lock.json
index d9a9099e26..e53e007446 100644
--- a/src/EventsProcessor/packages.lock.json
+++ b/src/EventsProcessor/packages.lock.json
@@ -24,18 +24,18 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -2793,7 +2793,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",
diff --git a/src/Icons/packages.lock.json b/src/Icons/packages.lock.json
index 851ec55509..0538d0f74f 100644
--- a/src/Icons/packages.lock.json
+++ b/src/Icons/packages.lock.json
@@ -34,18 +34,18 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -2803,7 +2803,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",
diff --git a/src/Identity/packages.lock.json b/src/Identity/packages.lock.json
index c7aae15dcd..3c35872042 100644
--- a/src/Identity/packages.lock.json
+++ b/src/Identity/packages.lock.json
@@ -33,18 +33,18 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -2815,7 +2815,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",
diff --git a/src/Infrastructure.EntityFramework/Infrastructure.EntityFramework.csproj b/src/Infrastructure.EntityFramework/Infrastructure.EntityFramework.csproj
index 5aaac6649a..1766078d25 100644
--- a/src/Infrastructure.EntityFramework/Infrastructure.EntityFramework.csproj
+++ b/src/Infrastructure.EntityFramework/Infrastructure.EntityFramework.csproj
@@ -1,7 +1,7 @@
-
+
diff --git a/src/Infrastructure.EntityFramework/Models/Organization.cs b/src/Infrastructure.EntityFramework/Models/Organization.cs
index d1679b4d6e..d7410cf4a7 100644
--- a/src/Infrastructure.EntityFramework/Models/Organization.cs
+++ b/src/Infrastructure.EntityFramework/Models/Organization.cs
@@ -1,4 +1,6 @@
using AutoMapper;
+using Bit.Core.Enums;
+using Bit.Core.Models.Data.Organizations;
using Bit.Infrastructure.EntityFramework.Auth.Models;
using Bit.Infrastructure.EntityFramework.Vault.Models;
@@ -24,5 +26,12 @@ public class OrganizationMapperProfile : Profile
public OrganizationMapperProfile()
{
CreateMap().ReverseMap();
+ CreateProjection()
+ .ForMember(sd => sd.CollectionCount, opt => opt.MapFrom(o => o.Collections.Count))
+ .ForMember(sd => sd.GroupCount, opt => opt.MapFrom(o => o.Groups.Count))
+ .ForMember(sd => sd.OccupiedSeatCount, opt => opt.MapFrom(o => o.OrganizationUsers.Count(ou => ou.Status >= OrganizationUserStatusType.Invited)))
+ .ForMember(sd => sd.OrganizationUsers, opt => opt.MapFrom(o => o.OrganizationUsers))
+ .ForMember(sd => sd.ScimConnections, opt => opt.MapFrom(o => o.Connections.Where(c => c.Type == OrganizationConnectionType.Scim)))
+ .ForMember(sd => sd.SsoConfig, opt => opt.MapFrom(o => o.SsoConfigs.SingleOrDefault()));
}
}
diff --git a/src/Infrastructure.EntityFramework/Repositories/OrganizationRepository.cs b/src/Infrastructure.EntityFramework/Repositories/OrganizationRepository.cs
index c353b13667..045ac881ee 100644
--- a/src/Infrastructure.EntityFramework/Repositories/OrganizationRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/OrganizationRepository.cs
@@ -1,4 +1,5 @@
using AutoMapper;
+using AutoMapper.QueryableExtensions;
using Bit.Core.Enums;
using Bit.Core.Models.Data.Organizations;
using Bit.Core.Repositories;
@@ -197,22 +198,14 @@ public class OrganizationRepository : Repository(organization);
+ var selfHostedOrganization = await dbContext.Organizations
+ .Where(o => o.Id == id)
+ .AsSplitQuery()
+ .ProjectTo(Mapper.ConfigurationProvider)
+ .SingleOrDefaultAsync();
- selfHostOrganization.OccupiedSeatCount =
- organization.OrganizationUsers.Count(ou => ou.Status >= OrganizationUserStatusType.Invited);
- selfHostOrganization.CollectionCount = organization.Collections?.Count ?? 0;
- selfHostOrganization.GroupCount = organization?.Groups.Count ?? 0;
- selfHostOrganization.SsoConfig = organization.SsoConfigs.SingleOrDefault();
- selfHostOrganization.ScimConnections = organization.Connections.Where(c => c.Type == OrganizationConnectionType.Scim);
-
- return selfHostOrganization;
+ return selfHostedOrganization;
}
}
}
diff --git a/src/Infrastructure.EntityFramework/packages.lock.json b/src/Infrastructure.EntityFramework/packages.lock.json
index a49b129491..825938b003 100644
--- a/src/Infrastructure.EntityFramework/packages.lock.json
+++ b/src/Infrastructure.EntityFramework/packages.lock.json
@@ -4,11 +4,11 @@
"net6.0": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Direct",
- "requested": "[11.0.0, )",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "requested": "[12.0.1, )",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -97,8 +97,8 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
diff --git a/src/Notifications/packages.lock.json b/src/Notifications/packages.lock.json
index 1f39f708c5..19c6dc1354 100644
--- a/src/Notifications/packages.lock.json
+++ b/src/Notifications/packages.lock.json
@@ -45,18 +45,18 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -2843,7 +2843,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",
diff --git a/src/SharedWeb/packages.lock.json b/src/SharedWeb/packages.lock.json
index 109b435f00..d6dfb7ff41 100644
--- a/src/SharedWeb/packages.lock.json
+++ b/src/SharedWeb/packages.lock.json
@@ -24,18 +24,18 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -2793,7 +2793,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",
diff --git a/test/Api.IntegrationTest/packages.lock.json b/test/Api.IntegrationTest/packages.lock.json
index eb0a893075..d464a72320 100644
--- a/test/Api.IntegrationTest/packages.lock.json
+++ b/test/Api.IntegrationTest/packages.lock.json
@@ -84,18 +84,18 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -3187,7 +3187,7 @@
"commercial.infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Infrastructure.EntityFramework": "2023.3.0"
}
@@ -3264,7 +3264,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",
diff --git a/test/Api.Test/packages.lock.json b/test/Api.Test/packages.lock.json
index 298a305d75..da16df5d7b 100644
--- a/test/Api.Test/packages.lock.json
+++ b/test/Api.Test/packages.lock.json
@@ -94,18 +94,18 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -3066,7 +3066,7 @@
"commercial.infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Infrastructure.EntityFramework": "2023.3.0"
}
@@ -3149,7 +3149,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",
diff --git a/test/Billing.Test/packages.lock.json b/test/Billing.Test/packages.lock.json
index f550505161..456fad9598 100644
--- a/test/Billing.Test/packages.lock.json
+++ b/test/Billing.Test/packages.lock.json
@@ -94,18 +94,18 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -3056,7 +3056,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",
diff --git a/test/Icons.Test/packages.lock.json b/test/Icons.Test/packages.lock.json
index e00a2a8153..5584303deb 100644
--- a/test/Icons.Test/packages.lock.json
+++ b/test/Icons.Test/packages.lock.json
@@ -75,18 +75,18 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -2986,7 +2986,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",
diff --git a/test/Identity.IntegrationTest/packages.lock.json b/test/Identity.IntegrationTest/packages.lock.json
index 4c92142029..c7feb90f13 100644
--- a/test/Identity.IntegrationTest/packages.lock.json
+++ b/test/Identity.IntegrationTest/packages.lock.json
@@ -105,18 +105,18 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -3211,7 +3211,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",
diff --git a/test/Identity.Test/packages.lock.json b/test/Identity.Test/packages.lock.json
index 9b6f6a5ef8..aae8c8e33f 100644
--- a/test/Identity.Test/packages.lock.json
+++ b/test/Identity.Test/packages.lock.json
@@ -94,18 +94,18 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -3078,7 +3078,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",
diff --git a/test/Infrastructure.EFIntegration.Test/packages.lock.json b/test/Infrastructure.EFIntegration.Test/packages.lock.json
index 468ef1647b..b14044d349 100644
--- a/test/Infrastructure.EFIntegration.Test/packages.lock.json
+++ b/test/Infrastructure.EFIntegration.Test/packages.lock.json
@@ -105,18 +105,18 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -3074,7 +3074,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",
diff --git a/test/Infrastructure.IntegrationTest/packages.lock.json b/test/Infrastructure.IntegrationTest/packages.lock.json
index 53af3110eb..34c6b87a97 100644
--- a/test/Infrastructure.IntegrationTest/packages.lock.json
+++ b/test/Infrastructure.IntegrationTest/packages.lock.json
@@ -96,18 +96,18 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -2908,7 +2908,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",
diff --git a/test/IntegrationTestCommon/packages.lock.json b/test/IntegrationTestCommon/packages.lock.json
index c88d43629c..aefb843b5b 100644
--- a/test/IntegrationTestCommon/packages.lock.json
+++ b/test/IntegrationTestCommon/packages.lock.json
@@ -81,18 +81,18 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -3197,7 +3197,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",
diff --git a/util/MySqlMigrations/packages.lock.json b/util/MySqlMigrations/packages.lock.json
index e13a01e420..5e97b54a6b 100644
--- a/util/MySqlMigrations/packages.lock.json
+++ b/util/MySqlMigrations/packages.lock.json
@@ -34,18 +34,18 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -2796,7 +2796,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",
diff --git a/util/PostgresMigrations/packages.lock.json b/util/PostgresMigrations/packages.lock.json
index e13a01e420..5e97b54a6b 100644
--- a/util/PostgresMigrations/packages.lock.json
+++ b/util/PostgresMigrations/packages.lock.json
@@ -34,18 +34,18 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -2796,7 +2796,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",
diff --git a/util/SqlServerEFScaffold/packages.lock.json b/util/SqlServerEFScaffold/packages.lock.json
index 614d2fe5cc..4e04168d02 100644
--- a/util/SqlServerEFScaffold/packages.lock.json
+++ b/util/SqlServerEFScaffold/packages.lock.json
@@ -34,18 +34,18 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -2828,7 +2828,7 @@
"commercial.infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Infrastructure.EntityFramework": "2023.3.0"
}
@@ -2885,7 +2885,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",
diff --git a/util/SqliteMigrations/packages.lock.json b/util/SqliteMigrations/packages.lock.json
index e13a01e420..5e97b54a6b 100644
--- a/util/SqliteMigrations/packages.lock.json
+++ b/util/SqliteMigrations/packages.lock.json
@@ -34,18 +34,18 @@
},
"AutoMapper": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
+ "resolved": "12.0.1",
+ "contentHash": "hvV62vl6Hp/WfQ24yzo3Co9+OPl8wH8hApwVtgWpiAynVJkUcs7xvehnSftawL8Pe8FrPffBRM3hwzLQqWDNjA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
- "resolved": "11.0.0",
- "contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
+ "resolved": "12.0.1",
+ "contentHash": "+g/K+Vpe3gGMKGzjslMOdqNlkikScDjWfVvmWTayrDHaG/n2pPmFBMa+jKX1r/h6BDGFdkyRjAuhFE3ykW+r1g==",
"dependencies": {
- "AutoMapper": "11.0.0",
+ "AutoMapper": "[12.0.1]",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -2796,7 +2796,7 @@
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
- "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0",
+ "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1",
"Core": "2023.3.0",
"Microsoft.EntityFrameworkCore.Relational": "6.0.12",
"Microsoft.EntityFrameworkCore.SqlServer": "6.0.12",