From 84e4ef3189636da9f3428f742c57a901940879f7 Mon Sep 17 00:00:00 2001
From: Yauheni Pakala <evgeniy.pakalo@gmail.com>
Date: Wed, 20 Dec 2023 12:32:45 +0100
Subject: [PATCH] Improvements before migration to .NET8 (#539)

* Add supported os versions

* Bump year

* Update target framework for nuspecs

* Sync wl.essentials platform target frameworks

* Add install missed android sdk for api 32

* Bump android target api

* Revert "Add install missed android sdk for api 32"

This reverts commit a89a7c424a11e61181a1f391d2e6c51dd1d1fb61.
---
 .../Softeq.XToolkit.Bindings.Droid.csproj     |  3 ++-
 .../Softeq.XToolkit.Bindings.iOS.csproj       |  1 +
 .../Softeq.XToolkit.Common.Droid.Tests.csproj |  2 +-
 .../Softeq.XToolkit.Common.Droid.csproj       |  3 ++-
 .../Softeq.XToolkit.Common.iOS.csproj         |  1 +
 .../Softeq.XToolkit.Connectivity.iOS.csproj   |  1 +
 .../Softeq.XToolkit.Permissions.Droid.csproj  |  1 +
 .../Softeq.XToolkit.Permissions.iOS.csproj    |  1 +
 ...eq.XToolkit.PushNotifications.Droid.csproj |  3 ++-
 ...fteq.XToolkit.PushNotifications.iOS.csproj |  1 +
 .../Softeq.XToolkit.WhiteLabel.Droid.csproj   |  3 ++-
 ...Toolkit.WhiteLabel.Essentials.Droid.csproj |  3 ++-
 ....XToolkit.WhiteLabel.Essentials.iOS.csproj |  3 ++-
 .../Softeq.XToolkit.WhiteLabel.iOS.csproj     |  1 +
 nuget/Softeq.XToolkit.Bindings.nuspec         | 24 ++++++++---------
 nuget/Softeq.XToolkit.Common.nuspec           | 24 ++++++++---------
 nuget/Softeq.XToolkit.Permissions.nuspec      | 24 ++++++++---------
 .../Softeq.XToolkit.PushNotifications.nuspec  | 27 +++++++++----------
 nuget/Softeq.XToolkit.Remote.nuspec           |  6 ++---
 ...fteq.XToolkit.WhiteLabel.Essentials.nuspec | 25 ++++++++---------
 nuget/Softeq.XToolkit.WhiteLabel.Forms.nuspec |  8 +++---
 nuget/Softeq.XToolkit.WhiteLabel.nuspec       | 24 ++++++++---------
 22 files changed, 100 insertions(+), 89 deletions(-)

diff --git a/Softeq.XToolkit.Bindings.Droid/Softeq.XToolkit.Bindings.Droid.csproj b/Softeq.XToolkit.Bindings.Droid/Softeq.XToolkit.Bindings.Droid.csproj
index 5b875deae..da03e628b 100644
--- a/Softeq.XToolkit.Bindings.Droid/Softeq.XToolkit.Bindings.Droid.csproj
+++ b/Softeq.XToolkit.Bindings.Droid/Softeq.XToolkit.Bindings.Droid.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-android32.0</TargetFramework>
+    <TargetFramework>net6.0-android33.0</TargetFramework>
+    <SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/Softeq.XToolkit.Bindings.iOS/Softeq.XToolkit.Bindings.iOS.csproj b/Softeq.XToolkit.Bindings.iOS/Softeq.XToolkit.Bindings.iOS.csproj
index 4393f4b45..960ce8b26 100644
--- a/Softeq.XToolkit.Bindings.iOS/Softeq.XToolkit.Bindings.iOS.csproj
+++ b/Softeq.XToolkit.Bindings.iOS/Softeq.XToolkit.Bindings.iOS.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0-ios12.0</TargetFramework>
+    <SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
     <CreatePackage>false</CreatePackage>
   </PropertyGroup>
 
diff --git a/Softeq.XToolkit.Common.Droid.Tests/Softeq.XToolkit.Common.Droid.Tests.csproj b/Softeq.XToolkit.Common.Droid.Tests/Softeq.XToolkit.Common.Droid.Tests.csproj
index 75be754c3..fc09041e2 100644
--- a/Softeq.XToolkit.Common.Droid.Tests/Softeq.XToolkit.Common.Droid.Tests.csproj
+++ b/Softeq.XToolkit.Common.Droid.Tests/Softeq.XToolkit.Common.Droid.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0-android32.0</TargetFramework>
+        <TargetFramework>net6.0-android33.0</TargetFramework>
         <OutputType>Exe</OutputType>
         <UseMaui>true</UseMaui>
         <SingleProject>true</SingleProject>
diff --git a/Softeq.XToolkit.Common.Droid/Softeq.XToolkit.Common.Droid.csproj b/Softeq.XToolkit.Common.Droid/Softeq.XToolkit.Common.Droid.csproj
index 0a1d306e8..606e94b19 100644
--- a/Softeq.XToolkit.Common.Droid/Softeq.XToolkit.Common.Droid.csproj
+++ b/Softeq.XToolkit.Common.Droid/Softeq.XToolkit.Common.Droid.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-android32.0</TargetFramework>
+    <TargetFramework>net6.0-android33.0</TargetFramework>
+    <SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/Softeq.XToolkit.Common.iOS/Softeq.XToolkit.Common.iOS.csproj b/Softeq.XToolkit.Common.iOS/Softeq.XToolkit.Common.iOS.csproj
index 55767c699..2c95cc8d7 100644
--- a/Softeq.XToolkit.Common.iOS/Softeq.XToolkit.Common.iOS.csproj
+++ b/Softeq.XToolkit.Common.iOS/Softeq.XToolkit.Common.iOS.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0-ios12.0</TargetFramework>
+    <SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
     <CreatePackage>false</CreatePackage>
   </PropertyGroup>
 
diff --git a/Softeq.XToolkit.Connectivity.iOS/Softeq.XToolkit.Connectivity.iOS.csproj b/Softeq.XToolkit.Connectivity.iOS/Softeq.XToolkit.Connectivity.iOS.csproj
index b2b3e0cc4..89e81ee1f 100644
--- a/Softeq.XToolkit.Connectivity.iOS/Softeq.XToolkit.Connectivity.iOS.csproj
+++ b/Softeq.XToolkit.Connectivity.iOS/Softeq.XToolkit.Connectivity.iOS.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0-ios12.0</TargetFramework>
+    <SupportedOSPlatformVersion>12.0</SupportedOSPlatformVersion>
     <UseMauiEssentials>true</UseMauiEssentials>
     <CreatePackage>false</CreatePackage>
   </PropertyGroup>
diff --git a/Softeq.XToolkit.Permissions.Droid/Softeq.XToolkit.Permissions.Droid.csproj b/Softeq.XToolkit.Permissions.Droid/Softeq.XToolkit.Permissions.Droid.csproj
index a206ccda0..07c4191b9 100644
--- a/Softeq.XToolkit.Permissions.Droid/Softeq.XToolkit.Permissions.Droid.csproj
+++ b/Softeq.XToolkit.Permissions.Droid/Softeq.XToolkit.Permissions.Droid.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0-android33.0</TargetFramework>
+    <SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
     <UseMauiEssentials>true</UseMauiEssentials>
   </PropertyGroup>
 
diff --git a/Softeq.XToolkit.Permissions.iOS/Softeq.XToolkit.Permissions.iOS.csproj b/Softeq.XToolkit.Permissions.iOS/Softeq.XToolkit.Permissions.iOS.csproj
index fa4e2a115..7e5b55bc6 100644
--- a/Softeq.XToolkit.Permissions.iOS/Softeq.XToolkit.Permissions.iOS.csproj
+++ b/Softeq.XToolkit.Permissions.iOS/Softeq.XToolkit.Permissions.iOS.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0-ios13.0</TargetFramework>
+    <SupportedOSPlatformVersion>13.0</SupportedOSPlatformVersion>
     <UseMauiEssentials>true</UseMauiEssentials>
     <CreatePackage>false</CreatePackage>
   </PropertyGroup>
diff --git a/Softeq.XToolkit.PushNotifications.Droid/Softeq.XToolkit.PushNotifications.Droid.csproj b/Softeq.XToolkit.PushNotifications.Droid/Softeq.XToolkit.PushNotifications.Droid.csproj
index 50dcfe3db..63dd6c269 100644
--- a/Softeq.XToolkit.PushNotifications.Droid/Softeq.XToolkit.PushNotifications.Droid.csproj
+++ b/Softeq.XToolkit.PushNotifications.Droid/Softeq.XToolkit.PushNotifications.Droid.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-android32.0</TargetFramework>
+    <TargetFramework>net6.0-android33.0</TargetFramework>
+    <SupportedOSPlatformVersion>26.0</SupportedOSPlatformVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/Softeq.XToolkit.PushNotifications.iOS/Softeq.XToolkit.PushNotifications.iOS.csproj b/Softeq.XToolkit.PushNotifications.iOS/Softeq.XToolkit.PushNotifications.iOS.csproj
index 145be86a8..0394fd5a0 100644
--- a/Softeq.XToolkit.PushNotifications.iOS/Softeq.XToolkit.PushNotifications.iOS.csproj
+++ b/Softeq.XToolkit.PushNotifications.iOS/Softeq.XToolkit.PushNotifications.iOS.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0-ios10.0</TargetFramework>
+    <SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
     <CreatePackage>false</CreatePackage>
   </PropertyGroup>
 
diff --git a/Softeq.XToolkit.WhiteLabel.Droid/Softeq.XToolkit.WhiteLabel.Droid.csproj b/Softeq.XToolkit.WhiteLabel.Droid/Softeq.XToolkit.WhiteLabel.Droid.csproj
index e2ad7ec51..fc258d188 100644
--- a/Softeq.XToolkit.WhiteLabel.Droid/Softeq.XToolkit.WhiteLabel.Droid.csproj
+++ b/Softeq.XToolkit.WhiteLabel.Droid/Softeq.XToolkit.WhiteLabel.Droid.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-android32.0</TargetFramework>
+    <TargetFramework>net6.0-android33.0</TargetFramework>
+    <SupportedOSPlatformVersion>24.0</SupportedOSPlatformVersion>
     <UseMauiEssentials>true</UseMauiEssentials>
   </PropertyGroup>
 
diff --git a/Softeq.XToolkit.WhiteLabel.Essentials.Droid/Softeq.XToolkit.WhiteLabel.Essentials.Droid.csproj b/Softeq.XToolkit.WhiteLabel.Essentials.Droid/Softeq.XToolkit.WhiteLabel.Essentials.Droid.csproj
index 4d18917b6..20ecd8b01 100644
--- a/Softeq.XToolkit.WhiteLabel.Essentials.Droid/Softeq.XToolkit.WhiteLabel.Essentials.Droid.csproj
+++ b/Softeq.XToolkit.WhiteLabel.Essentials.Droid/Softeq.XToolkit.WhiteLabel.Essentials.Droid.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-android32.0</TargetFramework>
+    <TargetFramework>net6.0-android33.0</TargetFramework>
+    <SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
     <UseMauiEssentials>true</UseMauiEssentials>
   </PropertyGroup>
 
diff --git a/Softeq.XToolkit.WhiteLabel.Essentials.iOS/Softeq.XToolkit.WhiteLabel.Essentials.iOS.csproj b/Softeq.XToolkit.WhiteLabel.Essentials.iOS/Softeq.XToolkit.WhiteLabel.Essentials.iOS.csproj
index ea273283e..b98d14c9d 100644
--- a/Softeq.XToolkit.WhiteLabel.Essentials.iOS/Softeq.XToolkit.WhiteLabel.Essentials.iOS.csproj
+++ b/Softeq.XToolkit.WhiteLabel.Essentials.iOS/Softeq.XToolkit.WhiteLabel.Essentials.iOS.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-ios12.0</TargetFramework>
+    <TargetFramework>net6.0-ios13.0</TargetFramework>
+    <SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
     <UseMauiEssentials>true</UseMauiEssentials>
     <CreatePackage>false</CreatePackage>
   </PropertyGroup>
diff --git a/Softeq.XToolkit.WhiteLabel.iOS/Softeq.XToolkit.WhiteLabel.iOS.csproj b/Softeq.XToolkit.WhiteLabel.iOS/Softeq.XToolkit.WhiteLabel.iOS.csproj
index aff63a8b2..1e8b40e7c 100644
--- a/Softeq.XToolkit.WhiteLabel.iOS/Softeq.XToolkit.WhiteLabel.iOS.csproj
+++ b/Softeq.XToolkit.WhiteLabel.iOS/Softeq.XToolkit.WhiteLabel.iOS.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0-ios12.0</TargetFramework>
+    <SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
     <UseMauiEssentials>true</UseMauiEssentials>
     <CreatePackage>false</CreatePackage>
   </PropertyGroup>
diff --git a/nuget/Softeq.XToolkit.Bindings.nuspec b/nuget/Softeq.XToolkit.Bindings.nuspec
index e36c23400..1bab00941 100644
--- a/nuget/Softeq.XToolkit.Bindings.nuspec
+++ b/nuget/Softeq.XToolkit.Bindings.nuspec
@@ -11,18 +11,18 @@
     <projectUrl>https://softeq.github.io/XToolkit.WhiteLabel/articles/xtoolkit/bindings.html</projectUrl>
     <repository type="git" url="https://github.com/Softeq/XToolkit.WhiteLabel.git" />
     <description>Bindings implementation based on INotifyPropertyChanged interface.</description>
-    <copyright>Copyright 2022 Softeq Development Corp.</copyright>
+    <copyright>Copyright 2023 Softeq Development Corp.</copyright>
     <tags>softeq, xtoolkit, xamarin, ios, android, mvvm, bindings</tags>
     <releaseNotes>Releases: https://github.com/Softeq/XToolkit.WhiteLabel/releases</releaseNotes>
     <dependencies>
-     <group targetFramework="netstandard2.1">
+     <group targetFramework="net6.0">
         <dependency id="Softeq.XToolkit.Common" version="1.3.0" />
       </group>
-     <group targetFramework="MonoAndroid12.0">
+     <group targetFramework="net6.0-android33.0">
         <dependency id="Softeq.XToolkit.Common" version="1.3.0" />
         <dependency id="Xamarin.AndroidX.RecyclerView" version="1.2.1.7" />
       </group>
-     <group targetFramework="Xamarin.iOS10">
+     <group targetFramework="net6.0-ios12.0">
         <dependency id="Softeq.XToolkit.Common" version="1.3.0" />
       </group>
    </dependencies>
@@ -33,29 +33,29 @@
 
     <!-- Core -->
     <file
-      src="../Softeq.XToolkit.Bindings/bin/Release/netstandard2.1/Softeq.XToolkit.Bindings.*"
+      src="../Softeq.XToolkit.Bindings/bin/Release/net6.0/Softeq.XToolkit.Bindings.*"
       exclude="**/*.deps.json"
-      target="lib\netstandard2.1" />
+      target="lib\net6.0" />
 
     <!-- Droid -->
     <file
-      src="../Softeq.XToolkit.Bindings/bin/Release/netstandard2.1/Softeq.XToolkit.Bindings.*"
+      src="../Softeq.XToolkit.Bindings/bin/Release/net6.0/Softeq.XToolkit.Bindings.*"
       exclude="**/*.deps.json"
-      target="lib\MonoAndroid12.0" />
+      target="lib\net6.0-android33.0" />
     <file
       src="../Softeq.XToolkit.Bindings.Droid/bin/Release/Softeq.XToolkit.Bindings.Droid.*"
       exclude="**/*.deps.json"
-      target="lib\MonoAndroid12.0" />
+      target="lib\net6.0-android33.0" />
 
     <!-- iOS -->
     <file
-      src="../Softeq.XToolkit.Bindings/bin/Release/netstandard2.1/Softeq.XToolkit.Bindings.*"
+      src="../Softeq.XToolkit.Bindings/bin/Release/net6.0/Softeq.XToolkit.Bindings.*"
       exclude="**/*.deps.json"
-      target="lib\Xamarin.iOS10" />
+      target="lib\net6.0-ios12.0" />
     <file
       src="../Softeq.XToolkit.Bindings.iOS/bin/Release/Softeq.XToolkit.Bindings.iOS.*"
       exclude="**/*.deps.json"
-      target="lib\Xamarin.iOS10" />
+      target="lib\net6.0-ios12.0" />
 
   </files>
 </package>
\ No newline at end of file
diff --git a/nuget/Softeq.XToolkit.Common.nuspec b/nuget/Softeq.XToolkit.Common.nuspec
index e097aec1b..c99771411 100644
--- a/nuget/Softeq.XToolkit.Common.nuspec
+++ b/nuget/Softeq.XToolkit.Common.nuspec
@@ -11,13 +11,13 @@
     <projectUrl>https://softeq.github.io/XToolkit.WhiteLabel/articles/xtoolkit/common.html</projectUrl>
     <repository type="git" url="https://github.com/Softeq/XToolkit.WhiteLabel.git" />
     <description>The most common components without dependencies that can be reused in any project.</description>
-    <copyright>Copyright 2022 Softeq Development Corp.</copyright>
+    <copyright>Copyright 2023 Softeq Development Corp.</copyright>
     <tags>softeq, xtoolkit, xamarin, ios, android, mvvm, toolkit, kit</tags>
     <releaseNotes>Releases: https://github.com/Softeq/XToolkit.WhiteLabel/releases</releaseNotes>
     <dependencies>
-      <group targetFramework="netstandard2.1" />
-      <group targetFramework="MonoAndroid12.0" />
-      <group targetFramework="Xamarin.iOS10" />
+      <group targetFramework="net6.0" />
+      <group targetFramework="net6.0-android33.0" />
+      <group targetFramework="net6.0-ios12.0" />
     </dependencies>
   </metadata>
   <files>
@@ -26,29 +26,29 @@
 
     <!-- Core -->
     <file
-      src="../Softeq.XToolkit.Common/bin/Release/netstandard2.1/Softeq.XToolkit.Common.*"
+      src="../Softeq.XToolkit.Common/bin/Release/net6.0/Softeq.XToolkit.Common.*"
       exclude="**/*.deps.json"
-      target="lib\netstandard2.1" />
+      target="lib\net6.0" />
 
     <!-- Droid -->
     <file
-      src="../Softeq.XToolkit.Common/bin/Release/netstandard2.1/Softeq.XToolkit.Common.*"
+      src="../Softeq.XToolkit.Common/bin/Release/net6.0/Softeq.XToolkit.Common.*"
       exclude="**/*.deps.json"
-      target="lib\MonoAndroid12.0" />
+      target="lib\net6.0-android33.0" />
     <file
       src="../Softeq.XToolkit.Common.Droid/bin/Release/Softeq.XToolkit.Common.Droid.*"
       exclude="**/*.deps.json"
-      target="lib\MonoAndroid12.0" />
+      target="lib\net6.0-android33.0" />
 
     <!-- iOS -->
     <file
-      src="../Softeq.XToolkit.Common/bin/Release/netstandard2.1/Softeq.XToolkit.Common.*"
+      src="../Softeq.XToolkit.Common/bin/Release/net6.0/Softeq.XToolkit.Common.*"
       exclude="**/*.deps.json"
-      target="lib\Xamarin.iOS10" />
+      target="lib\net6.0-ios12.0" />
     <file
       src="../Softeq.XToolkit.Common.iOS/bin/Release/Softeq.XToolkit.Common.iOS.*"
       exclude="**/*.deps.json"
-      target="lib\Xamarin.iOS10" />
+      target="lib\net6.0-ios12.0" />
 
   </files>
 </package>
\ No newline at end of file
diff --git a/nuget/Softeq.XToolkit.Permissions.nuspec b/nuget/Softeq.XToolkit.Permissions.nuspec
index 9fd96131d..310aaa272 100644
--- a/nuget/Softeq.XToolkit.Permissions.nuspec
+++ b/nuget/Softeq.XToolkit.Permissions.nuspec
@@ -11,18 +11,18 @@
     <projectUrl>https://softeq.github.io/XToolkit.WhiteLabel/articles/xtoolkit/permissions.html</projectUrl>
     <repository type="git" url="https://github.com/Softeq/XToolkit.WhiteLabel.git" />
     <description>Simple cross platform plugin to request and check permissions for Android and iOS.</description>
-    <copyright>Copyright 2022 Softeq Development Corp.</copyright>
+    <copyright>Copyright 2023 Softeq Development Corp.</copyright>
     <tags>softeq, xtoolkit, xamarin, ios, android, permissions</tags>
     <releaseNotes/>
     <dependencies>
-      <group targetFramework="netstandard2.1">
+      <group targetFramework="net6.0">
         <dependency id="Xamarin.Essentials" version="1.7.3" />
       </group>
-      <group targetFramework="MonoAndroid12.0">
+      <group targetFramework="net6.0-android33.0">
         <dependency id="Xamarin.Essentials" version="1.7.3" />
         <dependency id="Softeq.XToolkit.Common" version="1.3.0" />
       </group>
-      <group targetFramework="Xamarin.iOS10">
+      <group targetFramework="net6.0-ios13.0">
         <dependency id="Xamarin.Essentials" version="1.7.3" />
       </group>
     </dependencies>
@@ -33,29 +33,29 @@
 
     <!-- Core -->
     <file
-      src="../Softeq.XToolkit.Permissions/bin/Release/netstandard2.1/Softeq.XToolkit.Permissions.*"
+      src="../Softeq.XToolkit.Permissions/bin/Release/net6.0/Softeq.XToolkit.Permissions.*"
       exclude="**/*.deps.json"
-      target="lib\netstandard2.1"/>
+      target="lib\net6.0"/>
 
     <!-- Droid -->
     <file
-      src="../Softeq.XToolkit.Permissions/bin/Release/netstandard2.1/Softeq.XToolkit.Permissions.*"
+      src="../Softeq.XToolkit.Permissions/bin/Release/net6.0/Softeq.XToolkit.Permissions.*"
       exclude="**/*.deps.json"
-      target="lib\MonoAndroid12.0"/>
+      target="lib\net6.0-android33.0"/>
     <file
       src="../Softeq.XToolkit.Permissions.Droid/bin/Release/Softeq.XToolkit.Permissions.Droid.*"
       exclude="**/*.deps.json"
-      target="lib\MonoAndroid12.0"/>
+      target="lib\net6.0-android33.0"/>
 
     <!-- iOS -->
     <file
-      src="../Softeq.XToolkit.Permissions/bin/Release/netstandard2.1/Softeq.XToolkit.Permissions.*"
+      src="../Softeq.XToolkit.Permissions/bin/Release/net6.0/Softeq.XToolkit.Permissions.*"
       exclude="**/*.deps.json"
-      target="lib\Xamarin.iOS10"/>
+      target="lib\net6.0-ios13.0"/>
     <file
       src="../Softeq.XToolkit.Permissions.iOS/bin/Release/Softeq.XToolkit.Permissions.iOS.*"
       exclude="**/*.deps.json"
-      target="lib\Xamarin.iOS10"/>
+      target="lib\net6.0-ios13.0"/>
 
   </files>
 </package>
\ No newline at end of file
diff --git a/nuget/Softeq.XToolkit.PushNotifications.nuspec b/nuget/Softeq.XToolkit.PushNotifications.nuspec
index 02642ee93..569d55e25 100644
--- a/nuget/Softeq.XToolkit.PushNotifications.nuspec
+++ b/nuget/Softeq.XToolkit.PushNotifications.nuspec
@@ -11,14 +11,14 @@
     <projectUrl>https://softeq.github.io/XToolkit.WhiteLabel/articles/xtoolkit/push-notifications.html</projectUrl>
     <repository type="git" url="https://github.com/Softeq/XToolkit.WhiteLabel.git" />
     <description>Simple cross platform plugin to use push-notifications for Android and iOS.</description>
-    <copyright>Copyright 2022 Softeq Development Corp.</copyright>
+    <copyright>Copyright 2023 Softeq Development Corp.</copyright>
     <tags>softeq, xtoolkit, xamarin, ios, android, push-notifications, firebase, apns, fcm</tags>
     <releaseNotes>Releases: https://github.com/Softeq/XToolkit.WhiteLabel/releases</releaseNotes>
     <dependencies>
-      <group targetFramework="netstandard2.1">
+      <group targetFramework="net6.0">
         <dependency id="Softeq.XToolkit.Common" version="1.3.0" />
       </group>
-      <group targetFramework="MonoAndroid12.0">
+      <group targetFramework="net6.0-android33.0">
         <dependency id="Softeq.XToolkit.Common" version="1.3.0" />
         <!-- Android specific: -->
         <dependency id="Xamarin.AndroidX.AppCompat" version="1.5.0" />
@@ -26,13 +26,10 @@
         <dependency id="Xamarin.Firebase.Messaging" version="123.0.8" />
         <dependency id="Xamarin.ShortcutBadger" version="1.1.21" />
       </group>
-      <group targetFramework="Xamarin.iOS10">
+      <group targetFramework="net6.0-ios10.0">
         <dependency id="Softeq.XToolkit.Common" version="1.3.0" />
       </group>
     </dependencies>
-    <frameworkAssemblies>
-      <frameworkAssembly assemblyName="Mono.Android.Export" targetFramework="MonoAndroid12.0" />
-    </frameworkAssemblies>
   </metadata>
   <files>
 
@@ -40,29 +37,29 @@
 
     <!-- Core -->
     <file
-      src="../Softeq.XToolkit.PushNotifications/bin/Release/netstandard2.1/Softeq.XToolkit.PushNotifications.*"
+      src="../Softeq.XToolkit.PushNotifications/bin/Release/net6.0/Softeq.XToolkit.PushNotifications.*"
       exclude="**/*.deps.json"
-      target="lib\netstandard2.1" />
+      target="lib\net6.0" />
 
     <!-- Droid -->
     <file
-      src="../Softeq.XToolkit.PushNotifications/bin/Release/netstandard2.1/Softeq.XToolkit.PushNotifications.*"
+      src="../Softeq.XToolkit.PushNotifications/bin/Release/net6.0/Softeq.XToolkit.PushNotifications.*"
       exclude="**/*.deps.json"
-      target="lib\MonoAndroid12.0" />
+      target="lib\net6.0-android33.0" />
     <file
       src="../Softeq.XToolkit.PushNotifications.Droid/bin/Release/Softeq.XToolkit.PushNotifications.Droid.*"
       exclude="**/*.deps.json"
-      target="lib\MonoAndroid12.0" />
+      target="lib\net6.0-android33.0" />
 
     <!-- iOS -->
     <file
-      src="../Softeq.XToolkit.PushNotifications/bin/Release/netstandard2.1/Softeq.XToolkit.PushNotifications.*"
+      src="../Softeq.XToolkit.PushNotifications/bin/Release/net6.0/Softeq.XToolkit.PushNotifications.*"
       exclude="**/*.deps.json"
-      target="lib\Xamarin.iOS10" />
+      target="lib\net6.0-ios10.0" />
     <file
       src="../Softeq.XToolkit.PushNotifications.iOS/bin/Release/Softeq.XToolkit.PushNotifications.iOS.*"
       exclude="**/*.deps.json"
-      target="lib\Xamarin.iOS10" />
+      target="lib\net6.0-ios10.0" />
 
   </files>
 </package>
\ No newline at end of file
diff --git a/nuget/Softeq.XToolkit.Remote.nuspec b/nuget/Softeq.XToolkit.Remote.nuspec
index 4b1bee3ba..c371da4c5 100644
--- a/nuget/Softeq.XToolkit.Remote.nuspec
+++ b/nuget/Softeq.XToolkit.Remote.nuspec
@@ -11,7 +11,7 @@
     <projectUrl>https://softeq.github.io/XToolkit.WhiteLabel/articles/xtoolkit/remote.html</projectUrl>
     <repository type="git" url="https://github.com/Softeq/XToolkit.WhiteLabel.git" />
     <description>Advanced HttpClient infrastructure for mobile applications.</description>
-    <copyright>Copyright 2022 Softeq Development Corp.</copyright>
+    <copyright>Copyright 2023 Softeq Development Corp.</copyright>
     <tags>softeq, xtoolkit, xamarin, ios, android, mvvm, toolkit, remote, http, rest, api, auth</tags>
     <releaseNotes>Releases: https://github.com/Softeq/XToolkit.WhiteLabel/releases</releaseNotes>
     <dependencies>
@@ -28,8 +28,8 @@
 
     <!-- Core -->
     <file
-      src="../Softeq.XToolkit.Remote/bin/Release/netstandard2.1/Softeq.XToolkit.Remote.*"
+      src="../Softeq.XToolkit.Remote/bin/Release/net6.0/Softeq.XToolkit.Remote.*"
       exclude="**/*.deps.json"
-      target="lib\netstandard2.1" />
+      target="lib\net6.0" />
   </files>
 </package>
\ No newline at end of file
diff --git a/nuget/Softeq.XToolkit.WhiteLabel.Essentials.nuspec b/nuget/Softeq.XToolkit.WhiteLabel.Essentials.nuspec
index f1717d9a7..b1b804652 100644
--- a/nuget/Softeq.XToolkit.WhiteLabel.Essentials.nuspec
+++ b/nuget/Softeq.XToolkit.WhiteLabel.Essentials.nuspec
@@ -11,16 +11,16 @@
     <projectUrl>https://softeq.github.io/XToolkit.WhiteLabel/articles/xtoolkit/whitelabel/essentials.html</projectUrl>
     <repository type="git" url="https://github.com/Softeq/XToolkit.WhiteLabel.git" />
     <description>Library over the Softeq.XToolkit.WhiteLabel that contains optional components for any application.</description>
-    <copyright>Copyright 2022 Softeq Development Corp.</copyright>
+    <copyright>Copyright 2023 Softeq Development Corp.</copyright>
     <tags>softeq, xtoolkit, android, ios, whitelabel, xamarin, essentials, imagepicker, picker</tags>
     <releaseNotes>Releases: https://github.com/Softeq/XToolkit.WhiteLabel/releases</releaseNotes>
     <dependencies>
-     <group targetFramework="netstandard2.1">
+     <group targetFramework="net6.0">
         <!-- XToolkit: -->
         <dependency id="Softeq.XToolkit.Permissions" version="2.1.0" />
         <dependency id="Softeq.XToolkit.WhiteLabel" version="[2.0.0-beta10]" />
       </group>
-     <group targetFramework="MonoAndroid12.0">
+     <group targetFramework="net6.0-android33.0">
         <dependency id="Xamarin.FFImageLoading" version="2.4.11.982" />
         <!-- XToolkit: -->
         <dependency id="Softeq.XToolkit.Permissions" version="2.1.0" />
@@ -28,7 +28,7 @@
         <!-- Android specific: -->
         <dependency id="Xamarin.AndroidX.AppCompat" version="1.5.0" />
       </group>
-     <group targetFramework="Xamarin.iOS10">
+     <group targetFramework="net6.0-ios13.0">
         <dependency id="Xamarin.FFImageLoading" version="2.4.11.982" />
         <!-- XToolkit: -->
         <dependency id="Softeq.XToolkit.Permissions" version="2.1.0" />
@@ -42,28 +42,29 @@
 
     <!-- Core -->
     <file
-      src="../Softeq.XToolkit.WhiteLabel.Essentials/bin/Release/netstandard2.1/Softeq.XToolkit.WhiteLabel.Essentials.*"
+      src="../Softeq.XToolkit.WhiteLabel.Essentials/bin/Release/net6.0/Softeq.XToolkit.WhiteLabel.Essentials.*"
       exclude="**/*.deps.json"
-      target="lib\netstandard2.1" />
+      target="lib\net6.0" />
 
     <!-- Droid -->
     <file
-      src="../Softeq.XToolkit.WhiteLabel.Essentials/bin/Release/netstandard2.1/Softeq.XToolkit.WhiteLabel.Essentials.*"
+      src="../Softeq.XToolkit.WhiteLabel.Essentials/bin/Release/net6.0/Softeq.XToolkit.WhiteLabel.Essentials.*"
       exclude="**/*.deps.json"
-      target="lib\MonoAndroid12.0" />
+      target="lib\net6.0-android33.0" />
     <file
       src="../Softeq.XToolkit.WhiteLabel.Essentials.Droid/bin/Release/Softeq.XToolkit.WhiteLabel.Essentials.Droid.*"
       exclude="**/*.deps.json"
-      target="lib\MonoAndroid12.0" />
+      target="lib\net6.0-android33.0" />
+
     <!-- iOS -->
     <file
-      src="../Softeq.XToolkit.WhiteLabel.Essentials/bin/Release/netstandard2.1/Softeq.XToolkit.WhiteLabel.Essentials.*"
+      src="../Softeq.XToolkit.WhiteLabel.Essentials/bin/Release/net6.0/Softeq.XToolkit.WhiteLabel.Essentials.*"
       exclude="**/*.deps.json"
-      target="lib\Xamarin.iOS10" />
+      target="lib\net6.0-ios13.0" />
     <file
       src="../Softeq.XToolkit.WhiteLabel.Essentials.iOS/bin/Release/Softeq.XToolkit.WhiteLabel.Essentials.iOS.*"
       exclude="**/*.deps.json"
-      target="lib\Xamarin.iOS10" />
+      target="lib\net6.0-ios13.0" />
 
   </files>
 </package>
diff --git a/nuget/Softeq.XToolkit.WhiteLabel.Forms.nuspec b/nuget/Softeq.XToolkit.WhiteLabel.Forms.nuspec
index 2385c68b0..6596141ca 100644
--- a/nuget/Softeq.XToolkit.WhiteLabel.Forms.nuspec
+++ b/nuget/Softeq.XToolkit.WhiteLabel.Forms.nuspec
@@ -11,11 +11,11 @@
     <projectUrl>https://softeq.github.io/XToolkit.WhiteLabel/articles/xtoolkit/whitelabel/forms.html</projectUrl>
     <repository type="git" url="https://github.com/Softeq/XToolkit.WhiteLabel.git" />
     <description>Integration library for using Softeq.XToolkit.WhiteLabel in Xamarin.Forms projects.</description>
-    <copyright>Copyright 2022 Softeq Development Corp.</copyright>
+    <copyright>Copyright 2023 Softeq Development Corp.</copyright>
     <tags>softeq, xtoolkit, whitelabel, xamarin, forms, xamarinforms, xamarin.forms</tags>
     <releaseNotes>Releases: https://github.com/Softeq/XToolkit.WhiteLabel/releases</releaseNotes>
     <dependencies>
-     <group targetFramework="netstandard2.1">
+     <group targetFramework="net6.0">
         <dependency id="Xamarin.Forms" version="5.0.0.2515" />
         <!-- XToolkit -->
         <dependency id="Softeq.XToolkit.WhiteLabel" version="[2.0.0-beta10]" />
@@ -28,9 +28,9 @@
 
     <!-- Core -->
     <file
-      src="../Softeq.XToolkit.WhiteLabel.Forms/bin/Release/netstandard2.1/Softeq.XToolkit.WhiteLabel.Forms.*"
+      src="../Softeq.XToolkit.WhiteLabel.Forms/bin/Release/net6.0/Softeq.XToolkit.WhiteLabel.Forms.*"
       exclude="**/*.deps.json"
-      target="lib\netstandard2.1" />
+      target="lib\net6.0" />
 
   </files>
 </package>
diff --git a/nuget/Softeq.XToolkit.WhiteLabel.nuspec b/nuget/Softeq.XToolkit.WhiteLabel.nuspec
index 216b94893..4a51b69e3 100644
--- a/nuget/Softeq.XToolkit.WhiteLabel.nuspec
+++ b/nuget/Softeq.XToolkit.WhiteLabel.nuspec
@@ -11,18 +11,18 @@
     <projectUrl>https://softeq.github.io/XToolkit.WhiteLabel/articles/xtoolkit/whitelabel.html</projectUrl>
     <repository type="git" url="https://github.com/Softeq/XToolkit.WhiteLabel.git" />
     <description>XToolkit.WhiteLabel is a collection of "lego" components for fast create cross-platform mobile applications with Xamarin, based on XToolkit.</description>
-    <copyright>Copyright 2022 Softeq Development Corp.</copyright>
+    <copyright>Copyright 2023 Softeq Development Corp.</copyright>
     <tags>softeq, xtoolkit, xamarin, ios, android, mvvm, toolkit, whitelabel</tags>
     <releaseNotes>Releases: https://github.com/Softeq/XToolkit.WhiteLabel/releases</releaseNotes>
     <dependencies>
-     <group targetFramework="netstandard2.1">
+     <group targetFramework="net6.0">
         <dependency id="DryIoc.dll" version="5.2.2" />
         <dependency id="Newtonsoft.Json" version="12.0.3" />
         <dependency id="Xamarin.Essentials" version="1.7.3" />
         <!-- XToolkit: -->
         <dependency id="Softeq.XToolkit.Common" version="1.3.0" />
       </group>
-     <group targetFramework="MonoAndroid12.0">
+     <group targetFramework="net6.0-android33.0">
         <dependency id="DryIoc.dll" version="5.2.2" />
         <dependency id="Newtonsoft.Json" version="12.0.3" />
         <dependency id="Xamarin.Essentials" version="1.7.3" />
@@ -34,7 +34,7 @@
         <dependency id="Softeq.XToolkit.Common" version="1.3.0" />
         <dependency id="Softeq.XToolkit.Bindings" version="2.1.0" />
       </group>
-     <group targetFramework="Xamarin.iOS10">
+     <group targetFramework="net6.0-ios12.0">
         <dependency id="DryIoc.dll" version="5.2.2" />
         <dependency id="Newtonsoft.Json" version="12.0.3" />
         <dependency id="Xamarin.Essentials" version="1.7.3" />
@@ -51,29 +51,29 @@
 
     <!-- Core -->
     <file
-      src="../Softeq.XToolkit.WhiteLabel/bin/Release/netstandard2.1/Softeq.XToolkit.WhiteLabel.*"
+      src="../Softeq.XToolkit.WhiteLabel/bin/Release/net6.0/Softeq.XToolkit.WhiteLabel.*"
       exclude="**/*.deps.json"
-      target="lib\netstandard2.1" />
+      target="lib\net6.0" />
 
     <!-- Droid -->
     <file
-      src="../Softeq.XToolkit.WhiteLabel/bin/Release/netstandard2.1/Softeq.XToolkit.WhiteLabel.*"
+      src="../Softeq.XToolkit.WhiteLabel/bin/Release/net6.0/Softeq.XToolkit.WhiteLabel.*"
       exclude="**/*.deps.json"
-      target="lib\MonoAndroid12.0" />
+      target="lib\net6.0-android33.0" />
     <file
       src="../Softeq.XToolkit.WhiteLabel.Droid/bin/Release/Softeq.XToolkit.WhiteLabel.Droid.*"
       exclude="**/*.deps.json"
-      target="lib\MonoAndroid12.0" />
+      target="lib\net6.0-android33.0" />
 
     <!-- iOS -->
     <file
-      src="../Softeq.XToolkit.WhiteLabel/bin/Release/netstandard2.1/Softeq.XToolkit.WhiteLabel.*"
+      src="../Softeq.XToolkit.WhiteLabel/bin/Release/net6.0/Softeq.XToolkit.WhiteLabel.*"
       exclude="**/*.deps.json"
-      target="lib\Xamarin.iOS10" />
+      target="lib\net6.0-ios12.0" />
     <file
       src="../Softeq.XToolkit.WhiteLabel.iOS/bin/Release/Softeq.XToolkit.WhiteLabel.iOS.*"
       exclude="**/*.deps.json"
-      target="lib\Xamarin.iOS10" />
+      target="lib\net6.0-ios12.0" />
 
   </files>
 </package>