diff --git a/azure-pipelines-integrationtests.yml b/azure-pipelines-integrationtests.yml
index 939d09c959..39923ca781 100644
--- a/azure-pipelines-integrationtests.yml
+++ b/azure-pipelines-integrationtests.yml
@@ -5,15 +5,15 @@ jobs:
 
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 6.0.404'
+    displayName: 'Use .NET Core SDK 6.0.415'
     inputs:
-      version: 6.0.404
+      version: 6.0.415
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 7.0.101'
+    displayName: 'Use .NET Core SDK 7.0.402'
     inputs:
-      version: 7.0.101
-      
+      version: 7.0.402
+
   - script: system_profiler SPDisplaysDataType |grep Resolution
     displayName: 'Get Resolution'
   
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 12cfdd015f..345378dbf2 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -30,14 +30,14 @@ jobs:
     vmImage: 'ubuntu-20.04'
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 6.0.404'
+    displayName: 'Use .NET Core SDK 6.0.415'
     inputs:
-      version: 6.0.404
+      version: 6.0.415
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 7.0.101'
+    displayName: 'Use .NET Core SDK 7.0.402'
     inputs:
-      version: 7.0.101
+      version: 7.0.402
 
   - task: CmdLine@2
     displayName: 'Install Workloads'
diff --git a/nukebuild/ApiDiffValidation.cs b/nukebuild/ApiDiffValidation.cs
index 2a73dd278c..c8115a8113 100644
--- a/nukebuild/ApiDiffValidation.cs
+++ b/nukebuild/ApiDiffValidation.cs
@@ -13,10 +13,11 @@ public static class ApiDiffValidation
 {
     private static readonly HttpClient s_httpClient = new();
 
-    private static readonly Dictionary<(string target, string asmName), (string target, string asmName)> s_assemblyRedirects = new()
+    private static readonly (string oldTfm, string newTfm)[] s_tfmRedirects = new[]
     {
-        [("net6.0-android31.0", "Avalonia.Android.dll")] = ("net7.0-android33.0", "Avalonia.Android.dll"),
-        [("net6.0-ios16.1", "Avalonia.iOS.dll")] = ("net7.0-ios16.1", "Avalonia.iOS.dll")
+        // We use StartsWith below comparing these tfm, as we ignore platform versions (like, net6.0-ios16.1)
+        ("net6.0-android", "net7.0-android"),
+        ("net6.0-ios", "net7.0-ios")
     };
 
     public static async Task ValidatePackage(
@@ -64,13 +65,14 @@ public static class ApiDiffValidation
                     await baselineDll.entry.Open().CopyToAsync(baselineDllFile);
                 }
 
-                if (!s_assemblyRedirects.TryGetValue((baselineDll.target, baselineDll.entry.Name), out var lookupPair))
+                var targetTfm = baselineDll.target;
+                if (s_tfmRedirects.FirstOrDefault(t => baselineDll.target.StartsWith(t.oldTfm)).newTfm is {} newTfm)
                 {
-                    lookupPair = (baselineDll.target, baselineDll.entry.Name);
+                    targetTfm = newTfm;
                 }
 
                 var targetDll = targetDlls.FirstOrDefault(e =>
-                    e.target == lookupPair.target && e.entry.Name == lookupPair.asmName);
+                    e.target.StartsWith(targetTfm) && e.entry.Name == baselineDll.entry.Name);
                 if (targetDll.entry is null)
                 {
                     throw new InvalidOperationException($"Some assemblies are missing in the new package {packageId}: {baselineDll.entry.Name} for {baselineDll.target}");
diff --git a/src/Android/Avalonia.Android/Avalonia.Android.csproj b/src/Android/Avalonia.Android/Avalonia.Android.csproj
index a5990a5f10..363ab2bc23 100644
--- a/src/Android/Avalonia.Android/Avalonia.Android.csproj
+++ b/src/Android/Avalonia.Android/Avalonia.Android.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0-android</TargetFramework>
+    <TargetFramework>net7.0-android33</TargetFramework>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
diff --git a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
index abb8f42977..49a122b8e1 100644
--- a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
+++ b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0-ios</TargetFramework>
+    <TargetFramework>net7.0-ios16.0</TargetFramework>
     <SupportedOSPlatformVersion>13.0</SupportedOSPlatformVersion>
     <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
   </PropertyGroup>