Remove EntityFramework dependency from HealthChecks.UI.Core (#763)

Xabaril · Dec 25, 2022 · af47efa · af47efa
1 parent d759df1
commit af47efa
Show file tree

Hide file tree

Showing 70 changed files with 137 additions and 84 deletions.
diff --git a/.github/workflows/healthchecks_ui_cd.yml b/.github/workflows/healthchecks_ui_cd.yml
@@ -25,6 +25,8 @@ jobs:
         run: dotnet restore ./src/HealthChecks.UI.Client/HealthChecks.UI.Client.csproj
       - name: Restore UI.Core
         run: dotnet restore ./src/HealthChecks.UI.Core/HealthChecks.UI.Core.csproj
+      - name: Restore UI.Data
+        run: dotnet restore ./src/HealthChecks.UI.Data/HealthChecks.UI.Data.csproj
       - name: Restore UI.InMemory.Storage
         run: dotnet restore ./src/HealthChecks.UI.InMemory.Storage/HealthChecks.UI.InMemory.Storage.csproj
       - name: Restore UI.MySql.Storage
@@ -43,6 +45,8 @@ jobs:
         run: dotnet build --no-restore ./src/HealthChecks.UI.Client/HealthChecks.UI.Client.csproj -c $BUILD_CONFIG
       - name: Build UI.Core
         run: dotnet build --no-restore ./src/HealthChecks.UI.Core/HealthChecks.UI.Core.csproj -c $BUILD_CONFIG
+      - name: Build UI.Data
+        run: dotnet build --no-restore ./src/HealthChecks.UI.Data/HealthChecks.UI.Data.csproj -c $BUILD_CONFIG
       - name: Build UI.InMemory.Storage
         run: dotnet build --no-restore ./src/HealthChecks.UI.InMemory.Storage/HealthChecks.UI.InMemory.Storage.csproj -c $BUILD_CONFIG
       - name: Build UI.MySql.Storage
@@ -61,6 +65,8 @@ jobs:
         run: dotnet pack --no-build ./src/HealthChecks.UI.Client/HealthChecks.UI.Client.csproj -c $BUILD_CONFIG -o ./artifacts
       - name: Pack UI.Core
         run: dotnet pack --no-build ./src/HealthChecks.UI.Core/HealthChecks.UI.Core.csproj -c $BUILD_CONFIG -o ./artifacts
+      - name: Pack UI.Data
+        run: dotnet pack --no-build ./src/HealthChecks.UI.Data/HealthChecks.UI.Data.csproj -c $BUILD_CONFIG -o ./artifacts
       - name: Pack UI.InMemory.Storage
         run: dotnet pack --no-build ./src/HealthChecks.UI.InMemory.Storage/HealthChecks.UI.InMemory.Storage.csproj -c $BUILD_CONFIG -o ./artifacts
       - name: Pack UI.MySql.Storage
@@ -79,6 +85,8 @@ jobs:
         run: dotnet nuget push ./artifacts/AspNetCore.HealthChecks.UI.Client.*.nupkg -k ${{secrets.NUGET_API_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate
       - name: Publish UI.Core Health Check
         run: dotnet nuget push ./artifacts/AspNetCore.HealthChecks.UI.Core.*.nupkg -k ${{secrets.NUGET_API_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate
+      - name: Publish UI.Data Health Check
+        run: dotnet nuget push ./artifacts/AspNetCore.HealthChecks.UI.Data.*.nupkg -k ${{secrets.NUGET_API_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate
       - name: Publish UI.InMemory.Storage Health Check
         run: dotnet nuget push ./artifacts/AspNetCore.HealthChecks.UI.InMemory.Storage.*.nupkg -k ${{secrets.NUGET_API_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate
       - name: Publish UI.MySql.Storage Health Check

diff --git a/.github/workflows/healthchecks_ui_cd_preview.yml b/.github/workflows/healthchecks_ui_cd_preview.yml
@@ -26,6 +26,8 @@ jobs:
         run: dotnet restore ./src/HealthChecks.UI.Client/HealthChecks.UI.Client.csproj
       - name: Restore UI.Core
         run: dotnet restore ./src/HealthChecks.UI.Core/HealthChecks.UI.Core.csproj
+      - name: Restore UI.Data
+        run: dotnet restore ./src/HealthChecks.UI.Data/HealthChecks.UI.Data.csproj
       - name: Restore UI.InMemory.Storage
         run: dotnet restore ./src/HealthChecks.UI.InMemory.Storage/HealthChecks.UI.InMemory.Storage.csproj
       - name: Restore UI.MySql.Storage
@@ -44,6 +46,8 @@ jobs:
         run: dotnet build --no-restore ./src/HealthChecks.UI.Client/HealthChecks.UI.Client.csproj -c $BUILD_CONFIG
       - name: Build UI.Core
         run: dotnet build --no-restore ./src/HealthChecks.UI.Core/HealthChecks.UI.Core.csproj -c $BUILD_CONFIG
+      - name: Build UI.Data
+        run: dotnet build --no-restore ./src/HealthChecks.UI.Data/HealthChecks.UI.Data.csproj -c $BUILD_CONFIG
       - name: Build UI.InMemory.Storage
         run: dotnet build --no-restore ./src/HealthChecks.UI.InMemory.Storage/HealthChecks.UI.InMemory.Storage.csproj -c $BUILD_CONFIG
       - name: Build UI.MySql.Storage
@@ -62,6 +66,8 @@ jobs:
         run: dotnet pack --no-build ./src/HealthChecks.UI.Client/HealthChecks.UI.Client.csproj --version-suffix $VERSION_SUFFIX -c $BUILD_CONFIG -o ./artifacts
       - name: Pack UI.Core
         run: dotnet pack --no-build ./src/HealthChecks.UI.Core/HealthChecks.UI.Core.csproj --version-suffix $VERSION_SUFFIX -c $BUILD_CONFIG -o ./artifacts
+      - name: Pack UI.Data
+        run: dotnet pack --no-build ./src/HealthChecks.UI.Data/HealthChecks.UI.Data.csproj --version-suffix $VERSION_SUFFIX -c $BUILD_CONFIG -o ./artifacts
       - name: Pack UI.InMemory.Storage
         run: dotnet pack --no-build ./src/HealthChecks.UI.InMemory.Storage/HealthChecks.UI.InMemory.Storage.csproj --version-suffix $VERSION_SUFFIX -c $BUILD_CONFIG -o ./artifacts
       - name: Pack UI.MySql.Storage
@@ -80,6 +86,8 @@ jobs:
         run: dotnet nuget push ./artifacts/AspNetCore.HealthChecks.UI.Client.*.nupkg -k ${{secrets.NUGET_API_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate
       - name: Publish UI.Core Health Check
         run: dotnet nuget push ./artifacts/AspNetCore.HealthChecks.UI.Core.*.nupkg -k ${{secrets.NUGET_API_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate
+      - name: Publish UI.Data Health Check
+        run: dotnet nuget push ./artifacts/AspNetCore.HealthChecks.UI.Data.*.nupkg -k ${{secrets.NUGET_API_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate
       - name: Publish UI.InMemory.Storage Health Check
         run: dotnet nuget push ./artifacts/AspNetCore.HealthChecks.UI.InMemory.Storage.*.nupkg -k ${{secrets.NUGET_API_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate
       - name: Publish UI.MySql.Storage Health Check

diff --git a/.github/workflows/healthchecks_ui_ci.yml b/.github/workflows/healthchecks_ui_ci.yml
@@ -66,6 +66,8 @@ jobs:
         run: dotnet restore ./src/HealthChecks.UI.Client/HealthChecks.UI.Client.csproj
       - name: Restore UI.Core
         run: dotnet restore ./src/HealthChecks.UI.Core/HealthChecks.UI.Core.csproj
+      - name: Restore UI.Data
+        run: dotnet restore ./src/HealthChecks.UI.Data/HealthChecks.UI.Data.csproj
       - name: Restore UI.InMemory.Storage
         run: dotnet restore ./src/HealthChecks.UI.InMemory.Storage/HealthChecks.UI.InMemory.Storage.csproj
       - name: Restore UI.MySql.Storage
@@ -85,6 +87,8 @@ jobs:
         run: dotnet format --no-restore --verify-no-changes --severity warn ./src/HealthChecks.UI.Client/HealthChecks.UI.Client.csproj || (echo "Run 'dotnet format' to fix issues" && exit 1)
       - name: Check formatting UI.Core
         run: dotnet format --no-restore --verify-no-changes --severity warn ./src/HealthChecks.UI.Core/HealthChecks.UI.Core.csproj || (echo "Run 'dotnet format' to fix issues" && exit 1)
+      - name: Check formatting UI.Data
+        run: dotnet format --no-restore --verify-no-changes --severity warn ./src/HealthChecks.UI.Data/HealthChecks.UI.Data.csproj || (echo "Run 'dotnet format' to fix issues" && exit 1)
       - name: Check formatting UI.InMemory.Storage
         run: dotnet format --no-restore --verify-no-changes --severity warn ./src/HealthChecks.UI.InMemory.Storage/HealthChecks.UI.InMemory.Storage.csproj || (echo "Run 'dotnet format' to fix issues" && exit 1)
       - name: Check formatting UI.MySql.Storage
@@ -104,6 +108,8 @@ jobs:
         run: dotnet build --no-restore ./src/HealthChecks.UI.Client/HealthChecks.UI.Client.csproj
       - name: Build UI.Core
         run: dotnet build --no-restore ./src/HealthChecks.UI.Core/HealthChecks.UI.Core.csproj
+      - name: Build UI.Data
+        run: dotnet build --no-restore ./src/HealthChecks.UI.Data/HealthChecks.UI.Data.csproj
       - name: Build UI.InMemory.Storage
         run: dotnet build --no-restore ./src/HealthChecks.UI.InMemory.Storage/HealthChecks.UI.InMemory.Storage.csproj
       - name: Build UI.MySql.Storage

diff --git a/AspNetCore.Diagnostics.HealthChecks.sln b/AspNetCore.Diagnostics.HealthChecks.sln
@@ -416,10 +416,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HealthChecks.EventStore.gRP
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HealthChecks.EventStore.gRPC", "src\HealthChecks.EventStore.gRPC\HealthChecks.EventStore.gRPC.csproj", "{30B12BAB-F5DA-48D8-A706-6D9904C196A7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HealthChecks.UI.Core.Tests", "test\HealthChecks.UI.Core.Tests\HealthChecks.UI.Core.Tests.csproj", "{3B32DF1F-03AA-4625-8694-E427C51E2398}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HealthChecks.UI.Client.Tests", "test\HealthChecks.UI.Client.Tests\HealthChecks.UI.Client.Tests.csproj", "{711762D3-0A1E-4859-81F1-94C8E8E82610}"
-EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HealthChecks.UI.Core.Tests", "test\HealthChecks.UI.Core.Tests\HealthChecks.UI.Core.Tests.csproj", "{3B32DF1F-03AA-4625-8694-E427C51E2398}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HealthChecks.UI.Client.Tests", "test\HealthChecks.UI.Client.Tests\HealthChecks.UI.Client.Tests.csproj", "{711762D3-0A1E-4859-81F1-94C8E8E82610}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HealthChecks.UI.Data", "src\HealthChecks.UI.Data\HealthChecks.UI.Data.csproj", "{51F0A996-9C63-4C59-85E0-D91B6A58C653}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -890,14 +892,18 @@ Global
 		{30B12BAB-F5DA-48D8-A706-6D9904C196A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{30B12BAB-F5DA-48D8-A706-6D9904C196A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{30B12BAB-F5DA-48D8-A706-6D9904C196A7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3B32DF1F-03AA-4625-8694-E427C51E2398}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3B32DF1F-03AA-4625-8694-E427C51E2398}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3B32DF1F-03AA-4625-8694-E427C51E2398}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3B32DF1F-03AA-4625-8694-E427C51E2398}.Release|Any CPU.Build.0 = Release|Any CPU
-		{711762D3-0A1E-4859-81F1-94C8E8E82610}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{711762D3-0A1E-4859-81F1-94C8E8E82610}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{711762D3-0A1E-4859-81F1-94C8E8E82610}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{711762D3-0A1E-4859-81F1-94C8E8E82610}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3B32DF1F-03AA-4625-8694-E427C51E2398}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3B32DF1F-03AA-4625-8694-E427C51E2398}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3B32DF1F-03AA-4625-8694-E427C51E2398}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3B32DF1F-03AA-4625-8694-E427C51E2398}.Release|Any CPU.Build.0 = Release|Any CPU
+		{711762D3-0A1E-4859-81F1-94C8E8E82610}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{711762D3-0A1E-4859-81F1-94C8E8E82610}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{711762D3-0A1E-4859-81F1-94C8E8E82610}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{711762D3-0A1E-4859-81F1-94C8E8E82610}.Release|Any CPU.Build.0 = Release|Any CPU
+		{51F0A996-9C63-4C59-85E0-D91B6A58C653}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{51F0A996-9C63-4C59-85E0-D91B6A58C653}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{51F0A996-9C63-4C59-85E0-D91B6A58C653}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{51F0A996-9C63-4C59-85E0-D91B6A58C653}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1020,8 +1026,9 @@ Global
 		{555D90D5-22C7-433D-B908-2DFFF98ED08C} = {FF4414C2-8863-4ADA-8A1D-4B9F25C361FE}
 		{8F174B4B-9F70-4309-B716-02B0D862FA00} = {FF4414C2-8863-4ADA-8A1D-4B9F25C361FE}
 		{30B12BAB-F5DA-48D8-A706-6D9904C196A7} = {2A3FD988-2BB8-43CF-B3A2-B70E648259D4}
-		{3B32DF1F-03AA-4625-8694-E427C51E2398} = {FF4414C2-8863-4ADA-8A1D-4B9F25C361FE}
-		{711762D3-0A1E-4859-81F1-94C8E8E82610} = {FF4414C2-8863-4ADA-8A1D-4B9F25C361FE}
+		{3B32DF1F-03AA-4625-8694-E427C51E2398} = {FF4414C2-8863-4ADA-8A1D-4B9F25C361FE}
+		{711762D3-0A1E-4859-81F1-94C8E8E82610} = {FF4414C2-8863-4ADA-8A1D-4B9F25C361FE}
+		{51F0A996-9C63-4C59-85E0-D91B6A58C653} = {2A3FD988-2BB8-43CF-B3A2-B70E648259D4}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {2B8C62A1-11B6-469F-874C-A02443256568}

diff --git a/build/docker-images/HealthChecks.UI.Image/PushService/HealthChecksPushService.cs b/build/docker-images/HealthChecks.UI.Image/PushService/HealthChecksPushService.cs
@@ -1,4 +1,4 @@
-using HealthChecks.UI.Core.Data;
+using HealthChecks.UI.Data;
 using Microsoft.EntityFrameworkCore;
 
 namespace HealthChecks.UI.Image.PushService

diff --git a/build/versions.props b/build/versions.props
@@ -53,6 +53,7 @@
     <HealthCheckUI>7.0.0</HealthCheckUI>
     <HealthCheckUIClient>7.0.0</HealthCheckUIClient>
     <HealthCheckUICore>7.0.0</HealthCheckUICore>
+    <HealthCheckUIData>7.0.0</HealthCheckUIData>
     <HealthCheckUIInMemoryStorage>7.0.0</HealthCheckUIInMemoryStorage>
     <HealthCheckUIMySqlStorage>7.0.0</HealthCheckUIMySqlStorage>
     <HealthCheckUISQLiteStorage>7.0.0</HealthCheckUISQLiteStorage>

diff --git a/src/HealthChecks.UI.Core/HealthChecks.UI.Core.csproj b/src/HealthChecks.UI.Core/HealthChecks.UI.Core.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.1" />
     <PackageReference Include="System.Text.Json" Version="7.0.1" />
   </ItemGroup>

diff --git a/...figuration/HealthCheckConfigurationMap.cs → ...figuration/HealthCheckConfigurationMap.cs b/...figuration/HealthCheckConfigurationMap.cs → ...figuration/HealthCheckConfigurationMap.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace HealthChecks.UI.Core.Data.Configuration
+namespace HealthChecks.UI.Data.Configuration
 {
     internal class HealthCheckConfigurationMap
         : IEntityTypeConfiguration<HealthCheckConfiguration>

diff --git a/...iguration/HealthCheckExecutionEntryMap.cs → ...iguration/HealthCheckExecutionEntryMap.cs b/...iguration/HealthCheckExecutionEntryMap.cs → ...iguration/HealthCheckExecutionEntryMap.cs
@@ -3,7 +3,7 @@
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace HealthChecks.UI.Core.Data.Configuration
+namespace HealthChecks.UI.Data.Configuration
 {
     internal class HealthCheckExecutionEntryMap
         : IEntityTypeConfiguration<HealthCheckExecutionEntry>

diff --git a/...uration/HealthCheckExecutionHistoryMap.cs → ...uration/HealthCheckExecutionHistoryMap.cs b/...uration/HealthCheckExecutionHistoryMap.cs → ...uration/HealthCheckExecutionHistoryMap.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace HealthChecks.UI.Core.Data.Configuration
+namespace HealthChecks.UI.Data.Configuration
 {
     internal class HealthCheckExecutionHistoryMap
         : IEntityTypeConfiguration<HealthCheckExecutionHistory>

diff --git a/.../Configuration/HealthCheckExecutionMap.cs → .../Configuration/HealthCheckExecutionMap.cs b/.../Configuration/HealthCheckExecutionMap.cs → .../Configuration/HealthCheckExecutionMap.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace HealthChecks.UI.Core.Data.Configuration
+namespace HealthChecks.UI.Data.Configuration
 {
     internal class HealthCheckExecutionMap
         : IEntityTypeConfiguration<HealthCheckExecution>

diff --git a/...ion/HealthCheckFailureNotificationsMap.cs → ...ion/HealthCheckFailureNotificationsMap.cs b/...ion/HealthCheckFailureNotificationsMap.cs → ...ion/HealthCheckFailureNotificationsMap.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace HealthChecks.UI.Core.Data.Configuration
+namespace HealthChecks.UI.Data.Configuration
 {
     public class HealthCheckFailureNotificationsMap
         : IEntityTypeConfiguration<HealthCheckFailureNotification>

diff --git a/....UI.Core/Data/HealthCheckConfiguration.cs → ...hecks.UI.Data/HealthCheckConfiguration.cs b/....UI.Core/Data/HealthCheckConfiguration.cs → ...hecks.UI.Data/HealthCheckConfiguration.cs
@@ -1,4 +1,4 @@
-namespace HealthChecks.UI.Core.Data
+namespace HealthChecks.UI.Data
 {
     public class HealthCheckConfiguration
     {

diff --git a/...ecks.UI.Core/Data/HealthCheckExecution.cs → ...lthChecks.UI.Data/HealthCheckExecution.cs b/...ecks.UI.Core/Data/HealthCheckExecution.cs → ...lthChecks.UI.Data/HealthCheckExecution.cs
@@ -1,4 +1,6 @@
-namespace HealthChecks.UI.Core.Data
+using HealthChecks.UI.Core;
+
+namespace HealthChecks.UI.Data
 {
     public class HealthCheckExecution
     {

diff --git a/...UI.Core/Data/HealthCheckExecutionEntry.cs → ...ecks.UI.Data/HealthCheckExecutionEntry.cs b/...UI.Core/Data/HealthCheckExecutionEntry.cs → ...ecks.UI.Data/HealthCheckExecutionEntry.cs
@@ -1,4 +1,6 @@
-namespace HealthChecks.UI.Core.Data
+using HealthChecks.UI.Core;
+
+namespace HealthChecks.UI.Data
 {
     public class HealthCheckExecutionEntry
     {

diff --git a/...e/Data/HealthCheckFailureNotifications.cs → ...I.Data/HealthCheckFailureNotifications.cs b/...e/Data/HealthCheckFailureNotifications.cs → ...I.Data/HealthCheckFailureNotifications.cs
@@ -1,4 +1,4 @@
-namespace HealthChecks.UI.Core.Data
+namespace HealthChecks.UI.Data
 {
     public class HealthCheckFailureNotification
     {

diff --git a/....UI.Core/Data/HealthCheckStatusHistory.cs → ...hecks.UI.Data/HealthCheckStatusHistory.cs b/....UI.Core/Data/HealthCheckStatusHistory.cs → ...hecks.UI.Data/HealthCheckStatusHistory.cs
@@ -1,4 +1,6 @@
-namespace HealthChecks.UI.Core.Data
+using HealthChecks.UI.Core;
+
+namespace HealthChecks.UI.Data
 {
     public class HealthCheckExecutionHistory
     {

diff --git a/src/HealthChecks.UI.Data/HealthChecks.UI.Data.csproj b/src/HealthChecks.UI.Data/HealthChecks.UI.Data.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <PackageTags>$(PackageTags);Data</PackageTags>
+    <Description>HealthChecks.UI.Data package containing data models and database context definition</Description>
+    <VersionPrefix>$(HealthCheckUIData)</VersionPrefix>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.1" />
+    <PackageReference Include="System.Text.Json" Version="7.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\HealthChecks.UI.Core\HealthChecks.UI.Core.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/...althChecks.UI.Core/Data/HealthChecksDb.cs → src/HealthChecks.UI.Data/HealthChecksDb.cs b/...althChecks.UI.Core/Data/HealthChecksDb.cs → src/HealthChecks.UI.Data/HealthChecksDb.cs
@@ -1,7 +1,7 @@
-using HealthChecks.UI.Core.Data.Configuration;
+using HealthChecks.UI.Data.Configuration;
 using Microsoft.EntityFrameworkCore;
 
-namespace HealthChecks.UI.Core.Data
+namespace HealthChecks.UI.Data
 {
     public class HealthChecksDb
         : DbContext

diff --git a/src/HealthChecks.UI.InMemory.Storage/HealthChecks.UI.InMemory.Storage.csproj b/src/HealthChecks.UI.InMemory.Storage/HealthChecks.UI.InMemory.Storage.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\HealthChecks.UI.Core\HealthChecks.UI.Core.csproj" />
+    <ProjectReference Include="..\HealthChecks.UI.Data\HealthChecks.UI.Data.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/HealthChecks.UI.InMemory.Storage/HealthChecksUIBuilderExtensions.cs b/src/HealthChecks.UI.InMemory.Storage/HealthChecksUIBuilderExtensions.cs
@@ -1,4 +1,4 @@
-using HealthChecks.UI.Core.Data;
+using HealthChecks.UI.Data;
 using Microsoft.EntityFrameworkCore;
 
 namespace Microsoft.Extensions.DependencyInjection

diff --git a/src/HealthChecks.UI.MySql.Storage/HealthChecks.UI.MySql.Storage.csproj b/src/HealthChecks.UI.MySql.Storage/HealthChecks.UI.MySql.Storage.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\HealthChecks.UI.Core\HealthChecks.UI.Core.csproj" />
+    <ProjectReference Include="..\HealthChecks.UI.Data\HealthChecks.UI.Data.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/HealthChecks.UI.MySql.Storage/HealthChecksUIBuilderExtensions.cs b/src/HealthChecks.UI.MySql.Storage/HealthChecksUIBuilderExtensions.cs
@@ -1,4 +1,4 @@
-using HealthChecks.UI.Core.Data;
+using HealthChecks.UI.Data;
 using Microsoft.EntityFrameworkCore;
 
 namespace Microsoft.Extensions.DependencyInjection

diff --git a/src/HealthChecks.UI.MySql.Storage/Migrations/20200415105900_initial.Designer.cs b/src/HealthChecks.UI.MySql.Storage/Migrations/20200415105900_initial.Designer.cs
diff --git a/src/HealthChecks.UI.MySql.Storage/Migrations/20200915214722_3.1.2-changes.Designer.cs b/src/HealthChecks.UI.MySql.Storage/Migrations/20200915214722_3.1.2-changes.Designer.cs
diff --git a/src/HealthChecks.UI.MySql.Storage/Migrations/HealthChecksDbModelSnapshot.cs b/src/HealthChecks.UI.MySql.Storage/Migrations/HealthChecksDbModelSnapshot.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using HealthChecks.UI.Core.Data;
+using HealthChecks.UI.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;

diff --git a/src/HealthChecks.UI.PostgreSQL.Storage/HealthChecks.UI.PostgreSQL.Storage.csproj b/src/HealthChecks.UI.PostgreSQL.Storage/HealthChecks.UI.PostgreSQL.Storage.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\HealthChecks.UI.Core\HealthChecks.UI.Core.csproj" />
+    <ProjectReference Include="..\HealthChecks.UI.Data\HealthChecks.UI.Data.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/HealthChecks.UI.PostgreSQL.Storage/HealthChecksUIBuilderExtensions.cs b/src/HealthChecks.UI.PostgreSQL.Storage/HealthChecksUIBuilderExtensions.cs
@@ -1,4 +1,4 @@
-using HealthChecks.UI.Core.Data;
+using HealthChecks.UI.Data;
 using Microsoft.EntityFrameworkCore;
 
 namespace Microsoft.Extensions.DependencyInjection

diff --git a/src/HealthChecks.UI.PostgreSQL.Storage/Migrations/20200410133103_initial.Designer.cs b/src/HealthChecks.UI.PostgreSQL.Storage/Migrations/20200410133103_initial.Designer.cs
diff --git a/src/HealthChecks.UI.PostgreSQL.Storage/Migrations/20200915213546_3.1.2-changes.Designer.cs b/src/HealthChecks.UI.PostgreSQL.Storage/Migrations/20200915213546_3.1.2-changes.Designer.cs
diff --git a/src/HealthChecks.UI.PostgreSQL.Storage/Migrations/HealthChecksDbModelSnapshot.cs b/src/HealthChecks.UI.PostgreSQL.Storage/Migrations/HealthChecksDbModelSnapshot.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using HealthChecks.UI.Core.Data;
+using HealthChecks.UI.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;

diff --git a/src/HealthChecks.UI.SQLite.Storage/HealthChecks.UI.SQLite.Storage.csproj b/src/HealthChecks.UI.SQLite.Storage/HealthChecks.UI.SQLite.Storage.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\HealthChecks.UI.Core\HealthChecks.UI.Core.csproj" />
+    <ProjectReference Include="..\HealthChecks.UI.Data\HealthChecks.UI.Data.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/HealthChecks.UI.SQLite.Storage/HealthChecksUIBuilderExtensions.cs b/src/HealthChecks.UI.SQLite.Storage/HealthChecksUIBuilderExtensions.cs
@@ -1,4 +1,4 @@
-using HealthChecks.UI.Core.Data;
+using HealthChecks.UI.Data;
 using Microsoft.EntityFrameworkCore;
 
 namespace Microsoft.Extensions.DependencyInjection