Migrate to .NET8 (#536)

* Bump dotnet version * Bump target framework to .net8 * Migrate Microsoft.Maui.Essentials to use as explicit NuGet packages * Remove obsoleted binary serialization for BiDictionary * Cleanup * Migrate Maui to use as explicit NuGet package * Sync target frameworks and min supported os * Use the same MAUI version in all projects * Bump .NET8 to stable * Update pipelines env * Bump iOS target framework for latest maui & essentials * Resolve warnings related to supported versions * Update nuget package * Sync versions
Softeq · Dec 27, 2023 · 1e59f30 · 1e59f30
1 parent 84e4ef3
commit 1e59f30
Show file tree

Hide file tree

Showing 39 changed files with 85 additions and 142 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,9 +2,10 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <LangVersion>10.0</LangVersion>
+    <LangVersion>12.0</LangVersion>
     <Nullable>enable</Nullable>
     <DebugType>portable</DebugType>
+    <MauiVersion>8.0.3</MauiVersion>
   </PropertyGroup>
 
   <!-- Assembly Info -->

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,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-android33.0</TargetFramework>
+    <TargetFramework>net8.0-android34.0</TargetFramework>
     <SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
   </PropertyGroup>
 

diff --git a/Softeq.XToolkit.Bindings.Tests/Softeq.XToolkit.Bindings.Tests.csproj b/Softeq.XToolkit.Bindings.Tests/Softeq.XToolkit.Bindings.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <Nullable>disable</Nullable>
   </PropertyGroup>

diff --git a/Softeq.XToolkit.Bindings.iOS/Softeq.XToolkit.Bindings.iOS.csproj b/Softeq.XToolkit.Bindings.iOS/Softeq.XToolkit.Bindings.iOS.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-ios12.0</TargetFramework>
+    <TargetFramework>net8.0-ios12.0</TargetFramework>
     <SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
     <CreatePackage>false</CreatePackage>
   </PropertyGroup>

diff --git a/Softeq.XToolkit.Bindings/Softeq.XToolkit.Bindings.csproj b/Softeq.XToolkit.Bindings/Softeq.XToolkit.Bindings.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <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,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0-android33.0</TargetFramework>
+        <TargetFramework>net8.0-android34.0</TargetFramework>
         <OutputType>Exe</OutputType>
-        <UseMaui>true</UseMaui>
         <SingleProject>true</SingleProject>
         <ImplicitUsings>disable</ImplicitUsings>
 
@@ -36,16 +35,14 @@
 
     <ItemGroup>
         <PackageReference Include="Xunit.Combinatorial" Version="1.5.25" />
+        <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
+        <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
     </ItemGroup>
 
     <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
         <ProjectReference Include="..\Softeq.XToolkit.Common.Droid\Softeq.XToolkit.Common.Droid.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-      <MauiPlatformSpecificFolder Remove="Platforms\iOS\" />
-    </ItemGroup>
-
     <Import Project="..\_Tests.Platform.targets" />
 
 </Project>
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,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-android33.0</TargetFramework>
+    <TargetFramework>net8.0-android34.0</TargetFramework>
     <SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
   </PropertyGroup>
 

diff --git a/Softeq.XToolkit.Common.Tests/Collections/BiDictionaryTests/BiDictionaryTests.cs b/Softeq.XToolkit.Common.Tests/Collections/BiDictionaryTests/BiDictionaryTests.cs
@@ -3,10 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Runtime.Serialization.Formatters.Binary;
 using System.Text;
-using Softeq.XToolkit.Common.Collections;
 using Xunit;
 
 namespace Softeq.XToolkit.Common.Tests.Collections.BiDictionaryTests
@@ -141,29 +138,6 @@ public void Remove_Negative()
             Assert.Equal("[0, 0],[1, 1]-[0, 0],[1, 1]", dictionary.GetResult());
         }
 
-        [Fact]
-        public void Serialization()
-        {
-            var dictionary = BiDictionaryHelper.CreateWithTwoItems();
-
-            var sb = new StringBuilder();
-
-            using (var memoryStream = new MemoryStream())
-            {
-                var binaryFormatter = new BinaryFormatter();
-                binaryFormatter.Serialize(memoryStream, dictionary);
-                memoryStream.Position = 0;
-
-                var newDict = (BiDictionary<int, string>) binaryFormatter.Deserialize(memoryStream);
-
-                sb.AppendJoin(",", newDict);
-                sb.Append("-");
-                sb.AppendJoin(",", newDict.Reverse);
-            }
-
-            Assert.Equal("[0, 0],[1, 1]-[0, 0],[1, 1]", sb.ToString());
-        }
-
         [Fact]
         public void Set()
         {

diff --git a/Softeq.XToolkit.Common.Tests/Softeq.XToolkit.Common.Tests.csproj b/Softeq.XToolkit.Common.Tests/Softeq.XToolkit.Common.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Softeq.XToolkit.Common.iOS.Tests/Softeq.XToolkit.Common.iOS.Tests.csproj b/Softeq.XToolkit.Common.iOS.Tests/Softeq.XToolkit.Common.iOS.Tests.csproj
@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0-ios15.0</TargetFramework>
+        <TargetFramework>net8.0-ios17.0</TargetFramework>
         <OutputType>Exe</OutputType>
-        <UseMaui>true</UseMaui>
         <SingleProject>true</SingleProject>
         <ImplicitUsings>disable</ImplicitUsings>
 
@@ -36,6 +35,8 @@
 
     <ItemGroup>
         <PackageReference Include="Xunit.Combinatorial" Version="1.5.25" />
+        <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
+        <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
     </ItemGroup>
 
     <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">

diff --git a/Softeq.XToolkit.Common.iOS/Softeq.XToolkit.Common.iOS.csproj b/Softeq.XToolkit.Common.iOS/Softeq.XToolkit.Common.iOS.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-ios12.0</TargetFramework>
+    <TargetFramework>net8.0-ios12.0</TargetFramework>
     <SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
     <CreatePackage>false</CreatePackage>
   </PropertyGroup>

diff --git a/Softeq.XToolkit.Common/Collections/BiDictionary.cs b/Softeq.XToolkit.Common/Collections/BiDictionary.cs
@@ -4,20 +4,14 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.IO;
-using System.Runtime.Serialization;
-using System.Runtime.Serialization.Formatters.Binary;
-using System.Security.Permissions;
 
 #pragma warning disable CS1591
 
 namespace Softeq.XToolkit.Common.Collections
 {
-    [Serializable]
     public class BiDictionary<TFirst, TSecond> :
         IDictionary<TFirst, TSecond>, IReadOnlyDictionary<TFirst, TSecond>,
-        IDictionary,
-        ISerializable
+        IDictionary
     {
         private readonly IDictionary<TFirst, TSecond> _firstToSecond = new Dictionary<TFirst, TSecond>();
 
@@ -33,24 +27,6 @@ public BiDictionary()
             _reverseDictionary = new ReverseDictionary(this);
         }
 
-        protected BiDictionary(SerializationInfo info, StreamingContext context)
-        {
-            if (info == null)
-            {
-                throw new ArgumentNullException(nameof(info));
-            }
-
-            var data = (byte[]) info.GetValue("firstToSecond", typeof(byte[]));
-            using (var memoryStream = new MemoryStream(data))
-            {
-                var binaryFormatter = new BinaryFormatter();
-                _firstToSecond = (Dictionary<TFirst, TSecond>) binaryFormatter.Deserialize(memoryStream);
-            }
-
-            _secondToFirst = new Dictionary<TSecond, TFirst>();
-            _reverseDictionary = new ReverseDictionary(this);
-        }
-
         public int Count => _firstToSecond.Count;
 
         public bool IsReadOnly => _firstToSecond.IsReadOnly || _secondToFirst.IsReadOnly;
@@ -196,35 +172,6 @@ void ICollection<KeyValuePair<TFirst, TSecond>>.CopyTo(KeyValuePair<TFirst, TSec
             _firstToSecond.CopyTo(array, arrayIndex);
         }
 
-        [SecurityPermission(
-            SecurityAction.LinkDemand,
-            Flags = SecurityPermissionFlag.SerializationFormatter)]
-        public virtual void GetObjectData(SerializationInfo info, StreamingContext context)
-        {
-            if (info == null)
-            {
-                throw new ArgumentNullException(nameof(info));
-            }
-
-            using (var memoryStream = new MemoryStream())
-            {
-                var binaryFormatter = new BinaryFormatter();
-                binaryFormatter.Serialize(memoryStream, _firstToSecond);
-                var array = memoryStream.ToArray();
-                info.AddValue("firstToSecond", array, typeof(byte[]));
-            }
-        }
-
-        [OnDeserialized]
-        internal void OnDeserialized(StreamingContext context)
-        {
-            _secondToFirst.Clear();
-            foreach (var item in _firstToSecond)
-            {
-                _secondToFirst.Add(item.Value, item.Key);
-            }
-        }
-
         private static KeyValuePair<TItem, TKey> ReverseItem<TKey, TItem>(KeyValuePair<TKey, TItem> item)
         {
             return new KeyValuePair<TItem, TKey>(item.Value, item.Key);

diff --git a/Softeq.XToolkit.Common/Softeq.XToolkit.Common.csproj b/Softeq.XToolkit.Common/Softeq.XToolkit.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/Softeq.XToolkit.Connectivity.iOS/Softeq.XToolkit.Connectivity.iOS.csproj b/Softeq.XToolkit.Connectivity.iOS/Softeq.XToolkit.Connectivity.iOS.csproj
@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-ios12.0</TargetFramework>
+    <TargetFramework>net8.0-ios17.0</TargetFramework>
     <SupportedOSPlatformVersion>12.0</SupportedOSPlatformVersion>
-    <UseMauiEssentials>true</UseMauiEssentials>
     <CreatePackage>false</CreatePackage>
   </PropertyGroup>
 
@@ -20,4 +19,8 @@
     <ProjectReference Include="..\Softeq.XToolkit.Connectivity\Softeq.XToolkit.Connectivity.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Maui.Essentials" Version="$(MauiVersion)" />
+  </ItemGroup>
+
 </Project>
diff --git a/Softeq.XToolkit.Connectivity/Softeq.XToolkit.Connectivity.csproj b/Softeq.XToolkit.Connectivity/Softeq.XToolkit.Connectivity.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <UseMauiEssentials>true</UseMauiEssentials>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -13,4 +12,8 @@
     <ProjectReference Include="..\Softeq.XToolkit.Common\Softeq.XToolkit.Common.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Maui.Essentials" Version="$(MauiVersion)" />
+  </ItemGroup>
+
 </Project>
diff --git a/Softeq.XToolkit.Permissions.Droid/Permissions/Notifications.cs b/Softeq.XToolkit.Permissions.Droid/Permissions/Notifications.cs
@@ -16,6 +16,7 @@ public override (string, bool)[] RequiredPermissions
             get
             {
 #if __ANDROID_33__
+#pragma warning disable CA1416
                 var isSupport =
                     SdkVersion.IsBuildVersionAtLeast(BuildVersionCodes.Tiramisu) &&
                     SdkVersion.IsDeviceVersionAtLeast(BuildVersionCodes.Tiramisu) &&
@@ -24,10 +25,11 @@ public override (string, bool)[] RequiredPermissions
                 return isSupport ?
                     new (string, bool)[] { (Manifest.Permission.PostNotifications, true) } :
                     System.Array.Empty<(string, bool)>();
+#pragma warning restore CA1416
 #else
                 return new (string, bool)[] { };
 #endif
             }
         }
     }
-}
+}
diff --git a/Softeq.XToolkit.Permissions.Droid/Softeq.XToolkit.Permissions.Droid.csproj b/Softeq.XToolkit.Permissions.Droid/Softeq.XToolkit.Permissions.Droid.csproj
@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-android33.0</TargetFramework>
+    <TargetFramework>net8.0-android34.0</TargetFramework>
     <SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
-    <UseMauiEssentials>true</UseMauiEssentials>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -24,4 +23,8 @@
     <ProjectReference Include="..\Softeq.XToolkit.Permissions\Softeq.XToolkit.Permissions.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Maui.Essentials" Version="$(MauiVersion)" />
+  </ItemGroup>
+
 </Project>
diff --git a/Softeq.XToolkit.Permissions.iOS/Softeq.XToolkit.Permissions.iOS.csproj b/Softeq.XToolkit.Permissions.iOS/Softeq.XToolkit.Permissions.iOS.csproj
@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-ios13.0</TargetFramework>
+    <TargetFramework>net8.0-ios17.0</TargetFramework>
     <SupportedOSPlatformVersion>13.0</SupportedOSPlatformVersion>
-    <UseMauiEssentials>true</UseMauiEssentials>
     <CreatePackage>false</CreatePackage>
   </PropertyGroup>
 
@@ -22,5 +21,6 @@
 
   <ItemGroup>
     <PackageReference Include="System.Reactive" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Maui.Essentials" Version="$(MauiVersion)" />
   </ItemGroup>
 </Project>
diff --git a/Softeq.XToolkit.Permissions/Softeq.XToolkit.Permissions.csproj b/Softeq.XToolkit.Permissions/Softeq.XToolkit.Permissions.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <UseMauiEssentials>true</UseMauiEssentials>
-  </PropertyGroup>
-
-  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
     <ProduceReferenceAssembly>True</ProduceReferenceAssembly>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Maui.Essentials" Version="$(MauiVersion)" />
+  </ItemGroup>
+
 </Project>
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,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-android33.0</TargetFramework>
+    <TargetFramework>net8.0-android34.0</TargetFramework>
     <SupportedOSPlatformVersion>26.0</SupportedOSPlatformVersion>
   </PropertyGroup>
 
@@ -27,7 +27,7 @@
     <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.5.0" />
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.Process" Version="2.5.1" />
     <PackageReference Include="Xamarin.Firebase.Messaging" Version="123.0.8" />
-    <PackageReference Include="Xamarin.ShortcutBadger" Version="1.1.21" />
+    <PackageReference Include="Xamarin.ShortcutBadger" Version="1.1.21.80" />
   </ItemGroup>
 
 </Project>