diff --git a/examples/RapidCMS.Example.Github/RapidCMS.Example.Github.csproj b/examples/RapidCMS.Example.Github/RapidCMS.Example.Github.csproj
index 71d1f047..13feb9df 100644
--- a/examples/RapidCMS.Example.Github/RapidCMS.Example.Github.csproj
+++ b/examples/RapidCMS.Example.Github/RapidCMS.Example.Github.csproj
@@ -16,15 +16,15 @@
     <Optimize>True</Optimize>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Blazored.LocalStorage" Version="4.1.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <PackageReference Include="Blazored.LocalStorage" Version="4.4.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.25" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.25" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
+    <PackageReference Include="System.Net.Http.Json" Version="6.0.25" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/examples/RapidCMS.Example.Maui/RapidCMS.Example.Maui.csproj b/examples/RapidCMS.Example.Maui/RapidCMS.Example.Maui.csproj
index a98807f5..609e6bfc 100644
--- a/examples/RapidCMS.Example.Maui/RapidCMS.Example.Maui.csproj
+++ b/examples/RapidCMS.Example.Maui/RapidCMS.Example.Maui.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0-maccatalyst</TargetFrameworks>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net6.0-windows10.0.19041</TargetFrameworks>
+    <TargetFramework>net6.0-maccatalyst</TargetFramework>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net6.0-windows10.0.19041</TargetFramework>
     <Nullable>enable</Nullable>
     <ProjectUISubcaption>Maui + Blazor WebAssembly</ProjectUISubcaption>
     <LangVersion>10.0</LangVersion>
diff --git a/examples/RapidCMS.Example.ModelMaker.Models/RapidCMS.Example.ModelMaker.Models.csproj b/examples/RapidCMS.Example.ModelMaker.Models/RapidCMS.Example.ModelMaker.Models.csproj
index 255d2b19..40f53db6 100644
--- a/examples/RapidCMS.Example.ModelMaker.Models/RapidCMS.Example.ModelMaker.Models.csproj
+++ b/examples/RapidCMS.Example.ModelMaker.Models/RapidCMS.Example.ModelMaker.Models.csproj
@@ -27,12 +27,12 @@
     <AdditionalFiles Include="RapidModels\modelmaker.one-to-one-one-bs.json" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.25">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.25" />
     <PackageReference Include="RapidCMS.ModelMaker.SourceGenerator.EFCore" Version="4.1.1" />
   </ItemGroup>
 
diff --git a/examples/RapidCMS.Example.ModelMaker.WebAssembly.API/RapidCMS.Example.ModelMaker.WebAssembly.API.csproj b/examples/RapidCMS.Example.ModelMaker.WebAssembly.API/RapidCMS.Example.ModelMaker.WebAssembly.API.csproj
index 534f2709..c7c741f4 100644
--- a/examples/RapidCMS.Example.ModelMaker.WebAssembly.API/RapidCMS.Example.ModelMaker.WebAssembly.API.csproj
+++ b/examples/RapidCMS.Example.ModelMaker.WebAssembly.API/RapidCMS.Example.ModelMaker.WebAssembly.API.csproj
@@ -6,12 +6,12 @@
     <ProjectUISubcaption>ASP.NET Core 6.0</ProjectUISubcaption>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.25">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.25" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/examples/RapidCMS.Example.ModelMaker.WebAssembly/RapidCMS.Example.ModelMaker.WebAssembly.csproj b/examples/RapidCMS.Example.ModelMaker.WebAssembly/RapidCMS.Example.ModelMaker.WebAssembly.csproj
index 1dd4e6d0..f8dc1363 100644
--- a/examples/RapidCMS.Example.ModelMaker.WebAssembly/RapidCMS.Example.ModelMaker.WebAssembly.csproj
+++ b/examples/RapidCMS.Example.ModelMaker.WebAssembly/RapidCMS.Example.ModelMaker.WebAssembly.csproj
@@ -6,10 +6,10 @@
     <ProjectUISubcaption>Blazor WebAssembly</ProjectUISubcaption>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
-    <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.25" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.25" PrivateAssets="all" />
+    <PackageReference Include="System.Net.Http.Json" Version="6.0.25" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/examples/RapidCMS.Example.ModelMaker/RapidCMS.Example.ModelMaker.csproj b/examples/RapidCMS.Example.ModelMaker/RapidCMS.Example.ModelMaker.csproj
index 766760bf..32af0098 100644
--- a/examples/RapidCMS.Example.ModelMaker/RapidCMS.Example.ModelMaker.csproj
+++ b/examples/RapidCMS.Example.ModelMaker/RapidCMS.Example.ModelMaker.csproj
@@ -22,11 +22,11 @@
     </Content>
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.25">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.25" />
   </ItemGroup>
 </Project>
diff --git a/examples/RapidCMS.Example.Server/RapidCMS.Example.Server.csproj b/examples/RapidCMS.Example.Server/RapidCMS.Example.Server.csproj
index 83b87a99..0f682efa 100644
--- a/examples/RapidCMS.Example.Server/RapidCMS.Example.Server.csproj
+++ b/examples/RapidCMS.Example.Server/RapidCMS.Example.Server.csproj
@@ -7,8 +7,8 @@
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.25" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/examples/RapidCMS.Example.Shared/RapidCMS.Example.Shared.csproj b/examples/RapidCMS.Example.Shared/RapidCMS.Example.Shared.csproj
index 4210390b..a60c16ae 100644
--- a/examples/RapidCMS.Example.Shared/RapidCMS.Example.Shared.csproj
+++ b/examples/RapidCMS.Example.Shared/RapidCMS.Example.Shared.csproj
@@ -10,11 +10,11 @@
     <SupportedPlatform Include="browser" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <PackageReference Include="FluentValidation" Version="10.3.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.25" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="6.0.25" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.25" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/examples/RapidCMS.Example.WebAssembly.API/RapidCMS.Example.WebAssembly.API.csproj b/examples/RapidCMS.Example.WebAssembly.API/RapidCMS.Example.WebAssembly.API.csproj
index 8ba99e82..391a3701 100644
--- a/examples/RapidCMS.Example.WebAssembly.API/RapidCMS.Example.WebAssembly.API.csproj
+++ b/examples/RapidCMS.Example.WebAssembly.API/RapidCMS.Example.WebAssembly.API.csproj
@@ -7,9 +7,9 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.25" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.25" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/examples/RapidCMS.Example.WebAssembly.FunctionAPI/RapidCMS.Example.WebAssembly.FunctionAPI.csproj b/examples/RapidCMS.Example.WebAssembly.FunctionAPI/RapidCMS.Example.WebAssembly.FunctionAPI.csproj
index 652b2b6a..7133da8e 100644
--- a/examples/RapidCMS.Example.WebAssembly.FunctionAPI/RapidCMS.Example.WebAssembly.FunctionAPI.csproj
+++ b/examples/RapidCMS.Example.WebAssembly.FunctionAPI/RapidCMS.Example.WebAssembly.FunctionAPI.csproj
@@ -9,7 +9,7 @@
     <_FunctionsSkipCleanOutput>true</_FunctionsSkipCleanOutput>
     <Nullable>enable</Nullable>
   </PropertyGroup>
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.6.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.0.13" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.3.0" OutputItemType="Analyzer" />
diff --git a/examples/RapidCMS.Example.WebAssembly/RapidCMS.Example.WebAssembly.csproj b/examples/RapidCMS.Example.WebAssembly/RapidCMS.Example.WebAssembly.csproj
index b13e0b00..403320cf 100644
--- a/examples/RapidCMS.Example.WebAssembly/RapidCMS.Example.WebAssembly.csproj
+++ b/examples/RapidCMS.Example.WebAssembly/RapidCMS.Example.WebAssembly.csproj
@@ -7,10 +7,10 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Authentication.WebAssembly.Msal" Version="6.0.0" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.25" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.25" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Authentication.WebAssembly.Msal" Version="6.0.25" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/RapidCMS.Api.Core/RapidCMS.Api.Core.csproj b/src/RapidCMS.Api.Core/RapidCMS.Api.Core.csproj
index 37ac476c..2d6e1348 100644
--- a/src/RapidCMS.Api.Core/RapidCMS.Api.Core.csproj
+++ b/src/RapidCMS.Api.Core/RapidCMS.Api.Core.csproj
@@ -33,9 +33,9 @@
     <NoWarn>1701;1702;1591</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <ProjectReference Include="..\RapidCMS.Core\RapidCMS.Core.csproj" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.25">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/RapidCMS.Api.Functions/RapidCMS.Api.Functions.csproj b/src/RapidCMS.Api.Functions/RapidCMS.Api.Functions.csproj
index 6d0da52e..4f020f00 100644
--- a/src/RapidCMS.Api.Functions/RapidCMS.Api.Functions.csproj
+++ b/src/RapidCMS.Api.Functions/RapidCMS.Api.Functions.csproj
@@ -33,7 +33,7 @@
     <NoWarn>1701;1702;1591</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <PackageReference Include="HttpMultipartParser" Version="5.0.1" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.6.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.0.13" />
diff --git a/src/RapidCMS.Api.WebApi/RapidCMS.Api.WebApi.csproj b/src/RapidCMS.Api.WebApi/RapidCMS.Api.WebApi.csproj
index cdafd426..75909e14 100644
--- a/src/RapidCMS.Api.WebApi/RapidCMS.Api.WebApi.csproj
+++ b/src/RapidCMS.Api.WebApi/RapidCMS.Api.WebApi.csproj
@@ -33,9 +33,9 @@
     <NoWarn>1701;1702;1591</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.25" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 
diff --git a/src/RapidCMS.Core.Tests/RapidCMS.Core.Tests.csproj b/src/RapidCMS.Core.Tests/RapidCMS.Core.Tests.csproj
index 74dd8219..564e77f3 100644
--- a/src/RapidCMS.Core.Tests/RapidCMS.Core.Tests.csproj
+++ b/src/RapidCMS.Core.Tests/RapidCMS.Core.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -6,9 +6,9 @@
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.25" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.25" />
     <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="nunit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0">
diff --git a/src/RapidCMS.Core/RapidCMS.Core.csproj b/src/RapidCMS.Core/RapidCMS.Core.csproj
index b708245e..a1a50cd2 100644
--- a/src/RapidCMS.Core/RapidCMS.Core.csproj
+++ b/src/RapidCMS.Core/RapidCMS.Core.csproj
@@ -33,18 +33,18 @@
     <SupportedPlatform Include="browser" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.0" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="6.0.25" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.25" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.25" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-    <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
-    <PackageReference Include="Tewr.Blazor.FileReader" Version="3.2.0.21211" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.25" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.25" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.25" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.25" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="System.Net.Http.Json" Version="6.0.25" />
+    <PackageReference Include="Tewr.Blazor.FileReader" Version="3.3.2.23201" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 
diff --git a/src/RapidCMS.ModelMaker.SourceGenerator.EFCore.Tests/RapidCMS.ModelMaker.SourceGenerator.EFCore.Tests.csproj b/src/RapidCMS.ModelMaker.SourceGenerator.EFCore.Tests/RapidCMS.ModelMaker.SourceGenerator.EFCore.Tests.csproj
index 5b77ce38..688aa985 100644
--- a/src/RapidCMS.ModelMaker.SourceGenerator.EFCore.Tests/RapidCMS.ModelMaker.SourceGenerator.EFCore.Tests.csproj
+++ b/src/RapidCMS.ModelMaker.SourceGenerator.EFCore.Tests/RapidCMS.ModelMaker.SourceGenerator.EFCore.Tests.csproj
@@ -81,7 +81,7 @@
     </Content>
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="nunit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0">
@@ -89,7 +89,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/RapidCMS.ModelMaker.SourceGenerator.EFCore/RapidCMS.ModelMaker.SourceGenerator.EFCore.csproj b/src/RapidCMS.ModelMaker.SourceGenerator.EFCore/RapidCMS.ModelMaker.SourceGenerator.EFCore.csproj
index 7c651c95..84356877 100644
--- a/src/RapidCMS.ModelMaker.SourceGenerator.EFCore/RapidCMS.ModelMaker.SourceGenerator.EFCore.csproj
+++ b/src/RapidCMS.ModelMaker.SourceGenerator.EFCore/RapidCMS.ModelMaker.SourceGenerator.EFCore.csproj
@@ -34,7 +34,7 @@
     <NoWarn>1701;1702;1591</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
@@ -51,7 +51,7 @@
 
   <ItemGroup>
     <!--Generator dependencies-->
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" GeneratePathProperty="true" PrivateAssets="all" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" GeneratePathProperty="true" PrivateAssets="all" />
     <None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
     <None Include="$(PkgNewtonsoft_Json)\lib\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
   </ItemGroup>
diff --git a/src/RapidCMS.ModelMaker.SourceGenerator/RapidCMS.ModelMaker.SourceGenerator.csproj b/src/RapidCMS.ModelMaker.SourceGenerator/RapidCMS.ModelMaker.SourceGenerator.csproj
index c575bf18..5c16636b 100644
--- a/src/RapidCMS.ModelMaker.SourceGenerator/RapidCMS.ModelMaker.SourceGenerator.csproj
+++ b/src/RapidCMS.ModelMaker.SourceGenerator/RapidCMS.ModelMaker.SourceGenerator.csproj
@@ -33,7 +33,7 @@
     <NoWarn>1701;1702;1591</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/RapidCMS.ModelMaker/RapidCMS.ModelMaker.csproj b/src/RapidCMS.ModelMaker/RapidCMS.ModelMaker.csproj
index eae514ed..9f74b6d5 100644
--- a/src/RapidCMS.ModelMaker/RapidCMS.ModelMaker.csproj
+++ b/src/RapidCMS.ModelMaker/RapidCMS.ModelMaker.csproj
@@ -37,10 +37,10 @@
     <SupportedPlatform Include="browser" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <PackageReference Include="FluentValidation" Version="10.3.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.25" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.25" />
     <ProjectReference Include="..\RapidCMS.Api.Core\RapidCMS.Api.Core.csproj" />
     <ProjectReference Include="..\RapidCMS.UI\RapidCMS.UI.csproj" />
   </ItemGroup>
diff --git a/src/RapidCMS.Repositories/RapidCMS.Repositories.csproj b/src/RapidCMS.Repositories/RapidCMS.Repositories.csproj
index 545edd02..6e72835b 100644
--- a/src/RapidCMS.Repositories/RapidCMS.Repositories.csproj
+++ b/src/RapidCMS.Repositories/RapidCMS.Repositories.csproj
@@ -45,16 +45,16 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Blazored.LocalStorage" Version="4.1.5" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <PackageReference Include="Blazored.LocalStorage" Version="4.4.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.25">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-    <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
+    <PackageReference Include="System.Net.Http.Json" Version="6.0.25" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/RapidCMS.UI.PublishableEntity/RapidCMS.UI.PublishableEntity.csproj b/src/RapidCMS.UI.PublishableEntity/RapidCMS.UI.PublishableEntity.csproj
index a4899e99..02732b11 100644
--- a/src/RapidCMS.UI.PublishableEntity/RapidCMS.UI.PublishableEntity.csproj
+++ b/src/RapidCMS.UI.PublishableEntity/RapidCMS.UI.PublishableEntity.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -9,8 +9,8 @@
     <SupportedPlatform Include="browser" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.0" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.25" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/RapidCMS.UI/RapidCMS.UI.csproj b/src/RapidCMS.UI/RapidCMS.UI.csproj
index 04662f5d..1a2bd428 100644
--- a/src/RapidCMS.UI/RapidCMS.UI.csproj
+++ b/src/RapidCMS.UI/RapidCMS.UI.csproj
@@ -32,13 +32,13 @@
   <ItemGroup>
     <SupportedPlatform Include="browser" />
   </ItemGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="Blazored.LocalStorage" Version="4.1.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.0" />
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <PackageReference Include="Blazored.LocalStorage" Version="4.4.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.25" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-    <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
+    <PackageReference Include="System.Net.Http.Json" Version="6.0.25" />
   </ItemGroup>
 
   <ItemGroup>