diff --git a/Directory.Build.props b/Directory.Build.props
index fce744b0..92a20655 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -15,6 +15,8 @@
 
 		<PackageIcon>usync-logo.png</PackageIcon>
 
+		<NoWarn>CS0618</NoWarn>
+
 		<PackageReleaseNotes>
 	<![CDATA[9.0 : Dotnet core version
  - 9.1 : Net 5/6 targets
diff --git a/dist/build-package.ps1 b/dist/build-package.ps1
index 71098d9d..53502f83 100644
--- a/dist/build-package.ps1
+++ b/dist/build-package.ps1
@@ -51,11 +51,13 @@ Write-Host "Config   :" $env
 Write-Host "Folder   :" $outFolder
 "----------------------------------"; ""
 
+$sln_name = "..\uSync_12.sln";
+
 ""; "##### Restoring project"; "--------------------------------"; ""
 dotnet restore ..
 
 ""; "##### Building project"; "--------------------------------"; ""
-dotnet build ..\uSync.sln -c $env -p:Version=$fullVersion -p:ContinuousIntegrationBuild=true
+dotnet build $sln_name -c $env -p:Version=$fullVersion -p:ContinuousIntegrationBuild=true
 
 ""; "##### Generating the json schema"; "----------------------------------" ; ""
 dotnet run -c $env --project ..\uSync.SchemaGenerator\uSync.SchemaGenerator.csproj --no-build
diff --git a/uSync.BackOffice/CompatibilitySuppressions.xml b/uSync.BackOffice/CompatibilitySuppressions.xml
index d2d148cb..49fa3918 100644
--- a/uSync.BackOffice/CompatibilitySuppressions.xml
+++ b/uSync.BackOffice/CompatibilitySuppressions.xml
@@ -1,24 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
 <Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:uSync.BackOffice.Notifications.uSyncApplicationStartingHandler</Target>
-    <Left>lib/net6.0/uSync.BackOffice.dll</Left>
-    <Right>lib/net6.0/uSync.BackOffice.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:uSync.BackOffice.Notifications.uSyncServerVariablesHandler</Target>
-    <Left>lib/net6.0/uSync.BackOffice.dll</Left>
-    <Right>lib/net6.0/uSync.BackOffice.dll</Right>
+    <Target>T:uSync.BackOffice.Controllers.Trees.uSyncTreeController</Target>
+    <Left>lib/net7.0/uSync.BackOffice.dll</Left>
+    <Right>lib/net7.0/uSync.BackOffice.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:uSync.BackOffice.Controllers.uSyncDashboardApiController.#ctor(Microsoft.Extensions.Configuration.IConfiguration,Umbraco.Cms.Core.Cache.AppCaches,Microsoft.AspNetCore.Hosting.IWebHostEnvironment,Umbraco.Cms.Core.Services.ILocalizedTextService,Microsoft.Extensions.Logging.ILogger{uSync.BackOffice.Controllers.uSyncDashboardApiController},Umbraco.Cms.Core.Composing.ITypeFinder,uSync.BackOffice.uSyncService,uSync.BackOffice.SyncHandlers.SyncHandlerFactory,Microsoft.AspNetCore.SignalR.IHubContext{uSync.BackOffice.Hubs.SyncHub},uSync.BackOffice.Configuration.uSyncConfigService)</Target>
-    <Left>lib/net6.0/uSync.BackOffice.dll</Left>
-    <Right>lib/net6.0/uSync.BackOffice.dll</Right>
+    <Target>M:uSync.BackOffice.uSyncService.#ctor(Microsoft.Extensions.Logging.ILogger{uSync.BackOffice.uSyncService},Umbraco.Cms.Core.Events.IEventAggregator,uSync.BackOffice.Configuration.uSyncConfigService,uSync.BackOffice.SyncHandlers.SyncHandlerFactory,uSync.BackOffice.Services.SyncFileService,uSync.BackOffice.Services.uSyncEventService,Umbraco.Cms.Core.Cache.AppCaches,Umbraco.Cms.Core.Scoping.ICoreScopeProvider)</Target>
+    <Left>lib/net7.0/uSync.BackOffice.dll</Left>
+    <Right>lib/net7.0/uSync.BackOffice.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
 </Suppressions>
\ No newline at end of file
diff --git a/uSync.BackOffice/uSync.BackOffice.csproj b/uSync.BackOffice/uSync.BackOffice.csproj
index 1adfbe2b..086451c2 100644
--- a/uSync.BackOffice/uSync.BackOffice.csproj
+++ b/uSync.BackOffice/uSync.BackOffice.csproj
@@ -43,12 +43,12 @@
 
 
 	<!-- Package Validation -->
-	<!--
 	<PropertyGroup>
+		<GenerateCompatibilitySuppressionFile>true</GenerateCompatibilitySuppressionFile>
+
 		<EnablePackageValidation>true</EnablePackageValidation>
 		<PackageValidationBaselineVersion>12.0.0</PackageValidationBaselineVersion>
 		<EnableStrictModeForCompatibleFrameworksInPackage>true</EnableStrictModeForCompatibleFrameworksInPackage>
 		<EnableStrictModeForCompatibleTfms>true</EnableStrictModeForCompatibleTfms> 
 	</PropertyGroup>
-	-->
 </Project>
diff --git a/uSync.Core/uSync.Core.csproj b/uSync.Core/uSync.Core.csproj
index e97c1e60..32eb5704 100644
--- a/uSync.Core/uSync.Core.csproj
+++ b/uSync.Core/uSync.Core.csproj
@@ -27,8 +27,10 @@
 
 	<!-- Package Validation -->
 	<PropertyGroup>
+		<GenerateCompatibilitySuppressionFile>true</GenerateCompatibilitySuppressionFile>
+
 		<EnablePackageValidation>true</EnablePackageValidation>
-		<PackageValidationBaselineVersion>11.0.0</PackageValidationBaselineVersion>
+		<PackageValidationBaselineVersion>12.0.0</PackageValidationBaselineVersion>
 		<EnableStrictModeForCompatibleFrameworksInPackage>true</EnableStrictModeForCompatibleFrameworksInPackage>
 		<EnableStrictModeForCompatibleTfms>true</EnableStrictModeForCompatibleTfms>
 	</PropertyGroup>