Fix the namespace for PagedModel (#14296)

* Fix the namespace for PagedModel

* Add compat suppressions

Author: kjac

src/Umbraco.Cms.Api.Delivery/Controllers/QueryContentApiController.cs

@@ -4,11 +4,11 @@
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.DeliveryApi;
+using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.DeliveryApi;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.Services.OperationStatus;
 using Umbraco.Extensions;
-using Umbraco.New.Cms.Core.Models;
 
 namespace Umbraco.Cms.Api.Delivery.Controllers;
 

src/Umbraco.Cms.Api.Delivery/Services/ApiContentQueryProvider.cs

@@ -3,9 +3,9 @@
 using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.DeliveryApi;
+using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Infrastructure.Examine;
 using Umbraco.Extensions;
-using Umbraco.New.Cms.Core.Models;
 
 namespace Umbraco.Cms.Api.Delivery.Services;
 

src/Umbraco.Cms.Api.Delivery/Services/ApiContentQueryService.cs

@@ -1,10 +1,10 @@
 using Umbraco.Cms.Api.Delivery.Indexing.Selectors;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.DeliveryApi;
+using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.Services.OperationStatus;
 using Umbraco.Extensions;
-using Umbraco.New.Cms.Core.Models;
 
 namespace Umbraco.Cms.Api.Delivery.Services;
 

src/Umbraco.Core/CompatibilitySuppressions.xml

@@ -1,6 +1,13 @@
 <?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:Umbraco.New.Cms.Core.Models.PagedModel`1</Target>
+    <Left>lib/net7.0/Umbraco.Core.dll</Left>
+    <Right>lib/net7.0/Umbraco.Core.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0005</DiagnosticId>
     <Target>M:Umbraco.Cms.Core.Models.PublishedContent.PublishedPropertyBase.GetDeliveryApiValue(System.Boolean,System.String,System.String)</Target>
@@ -36,4 +43,4 @@
     <Right>lib/net7.0/Umbraco.Core.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
-</Suppressions>
+</Suppressions>

src/Umbraco.Core/DeliveryApi/IApiContentQueryProvider.cs

@@ -1,4 +1,4 @@
-using Umbraco.New.Cms.Core.Models;
+using Umbraco.Cms.Core.Models;
 
 namespace Umbraco.Cms.Core.DeliveryApi;
 

src/Umbraco.Core/DeliveryApi/IApiContentQueryService.cs

@@ -1,5 +1,5 @@
+using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services.OperationStatus;
-using Umbraco.New.Cms.Core.Models;
 
 namespace Umbraco.Cms.Core.DeliveryApi;
 

src/Umbraco.Core/DeliveryApi/NoopApiContentQueryService.cs

@@ -1,5 +1,5 @@
+using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services.OperationStatus;
-using Umbraco.New.Cms.Core.Models;
 
 namespace Umbraco.Cms.Core.DeliveryApi;
 

src/Umbraco.Core/Models/PagedModel.cs

@@ -1,4 +1,4 @@
-namespace Umbraco.New.Cms.Core.Models;
+namespace Umbraco.Cms.Core.Models;
 
 public class PagedModel<T>
 {

src/Umbraco.Core/Services/ILocalizationService.cs

@@ -1,5 +1,4 @@
 using Umbraco.Cms.Core.Models;
-using Umbraco.New.Cms.Core.Models;
 
 namespace Umbraco.Cms.Core.Services;
 

src/Umbraco.Core/Services/ITrackedReferencesService.cs

@@ -1,5 +1,4 @@
 using Umbraco.Cms.Core.Models;
-using Umbraco.New.Cms.Core.Models;
 
 namespace Umbraco.Cms.Core.Services;