From c20f45dcfc1bd5ccd336a3c33648d774bfc5e0dc Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 9 Mar 2022 08:53:18 +0100
Subject: [PATCH 1/2] Fixed issue with pageindex (0-indexed) vs pagenumber (1
 indexed) (#12113)

---
 .../Services/Implement/TrackedReferencesService.cs          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Infrastructure/Services/Implement/TrackedReferencesService.cs b/src/Umbraco.Infrastructure/Services/Implement/TrackedReferencesService.cs
index 0f1eefb6f2..9a4cc8860e 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/TrackedReferencesService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/TrackedReferencesService.cs
@@ -23,7 +23,7 @@ namespace Umbraco.Cms.Core.Services.Implement
             using IScope scope = _scopeProvider.CreateScope(autoComplete: true);
             var items =  _trackedReferencesRepository.GetPagedRelationsForItems(ids, pageIndex, pageSize,  filterMustBeIsDependency, out var totalItems);
 
-            return new PagedResult<RelationItem>(totalItems, pageIndex, pageSize) { Items = items };
+            return new PagedResult<RelationItem>(totalItems, pageIndex+1, pageSize) { Items = items };
         }
 
         public PagedResult<RelationItem> GetPagedItemsWithRelations(int[] ids, long pageIndex, int pageSize, bool filterMustBeIsDependency)
@@ -31,7 +31,7 @@ namespace Umbraco.Cms.Core.Services.Implement
             using IScope scope = _scopeProvider.CreateScope(autoComplete: true);
             var items =  _trackedReferencesRepository.GetPagedItemsWithRelations(ids, pageIndex, pageSize,  filterMustBeIsDependency, out var totalItems);
 
-            return new PagedResult<RelationItem>(totalItems, pageIndex, pageSize) { Items = items };
+            return new PagedResult<RelationItem>(totalItems, pageIndex+1, pageSize) { Items = items };
         }
 
         public PagedResult<RelationItem> GetPagedDescendantsInReferences(int parentId, long pageIndex, int pageSize, bool filterMustBeIsDependency)
@@ -44,7 +44,7 @@ namespace Umbraco.Cms.Core.Services.Implement
                 pageSize,
                 filterMustBeIsDependency,
                 out var totalItems);
-            return new PagedResult<RelationItem>(totalItems, pageIndex, pageSize) { Items = items };
+            return new PagedResult<RelationItem>(totalItems, pageIndex+1, pageSize) { Items = items };
         }
     }
 }

From 5d9e2b0bb85e6165262cf90630b0fe3d5ba362c7 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Tue, 8 Mar 2022 16:33:43 +0100
Subject: [PATCH 2/2] Updates JSON schema to reference latest Forms and Deploy.
 (#12106)

---
 src/JsonSchema/AppSettings.cs    | 3 +++
 src/JsonSchema/JsonSchema.csproj | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/JsonSchema/AppSettings.cs b/src/JsonSchema/AppSettings.cs
index 73c5ea18f5..f9aa6b500c 100644
--- a/src/JsonSchema/AppSettings.cs
+++ b/src/JsonSchema/AppSettings.cs
@@ -3,6 +3,7 @@
 
 using Umbraco.Cms.Core.Configuration;
 using Umbraco.Cms.Core.Configuration.Models;
+using Umbraco.Deploy.Core.Configuration.DebugConfiguration;
 using Umbraco.Deploy.Core.Configuration.DeployConfiguration;
 using Umbraco.Deploy.Core.Configuration.DeployProjectConfiguration;
 using Umbraco.Forms.Core.Configuration;
@@ -127,6 +128,8 @@ namespace JsonSchema
                 public DeploySettings Settings { get; set; }
 
                 public DeployProjectConfig Project { get; set; }
+
+                public DebugSettings Debug { get; set; }
             }
         }
     }
diff --git a/src/JsonSchema/JsonSchema.csproj b/src/JsonSchema/JsonSchema.csproj
index c7cbbe1320..cd2e71830d 100644
--- a/src/JsonSchema/JsonSchema.csproj
+++ b/src/JsonSchema/JsonSchema.csproj
@@ -10,8 +10,8 @@
       <PackageReference Include="CommandLineParser" Version="2.8.0" />
       <PackageReference Include="NJsonSchema" Version="10.5.2" />
       <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
-      <PackageReference Include="Umbraco.Deploy.Core" Version="9.2.0" />
-      <PackageReference Include="Umbraco.Forms.Core" Version="9.2.0" />
+      <PackageReference Include="Umbraco.Deploy.Core" Version="9.3.0" />
+      <PackageReference Include="Umbraco.Forms.Core" Version="9.3.0" />
     </ItemGroup>
 
     <ItemGroup>