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 a89a7c4.
Softeq · Dec 20, 2023 · 84e4ef3 · 84e4ef3
1 parent 4fdd0da
commit 84e4ef3
Show file tree

Hide file tree

Showing 22 changed files with 100 additions and 89 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...q.XToolkit.WhiteLabel.Essentials.Droid/Softeq.XToolkit.WhiteLabel.Essentials.Droid.csproj b/...q.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
@@ -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
@@ -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
@@ -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>
diff --git 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>
diff --git 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>
diff --git a/nuget/Softeq.XToolkit.PushNotifications.nuspec b/nuget/Softeq.XToolkit.PushNotifications.nuspec
@@ -11,58 +11,55 @@
     <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" />
         <dependency id="Xamarin.AndroidX.Lifecycle.Process" version="2.5.1" />
         <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>
 
     <file src="../LICENSE" />
 
     <!-- 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>
diff --git 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>