Upgrade Xamarin Version to 5 -- only builds ok, not tested (#625)

OPCFoundation · Sep 13, 2024 · 625b1e9 · 625b1e9
1 parent bfb3cbe
commit 625b1e9
Show file tree

Hide file tree

Showing 8 changed files with 26,563 additions and 4,246 deletions.
diff --git a/Samples/XamarinClient/XamarinClient.Android/MainActivity.cs b/Samples/XamarinClient/XamarinClient.Android/MainActivity.cs
@@ -1,11 +1,13 @@
-using System;
+using System;
 
 using Android.App;
 using Android.Content.PM;
 using Android.Runtime;
 using Android.Views;
 using Android.Widget;
 using Android.OS;
+using Android;
+using Google.Android.Material.Snackbar;
 
 namespace XamarinClient.Droid
 {
@@ -21,7 +23,28 @@ protected override void OnCreate(Bundle bundle)
 
             global::Xamarin.Forms.Forms.Init(this, bundle);
             LoadApplication(new App());
+
+            //if (CheckSelfPermission(Manifest.Permission.ReadExternalStorage) == Permission.Denied)
+            //{
+            //    RequestPermissions(new string[] { Manifest.Permission.WriteExternalStorage }, 5);
+            //}
         }
+
+        //public override void OnRequestPermissionsResult(int requestCode, string[] permissions, Permission[] grantResults)
+        //{
+        //    if (requestCode == 5)
+        //    {
+        //        if (permissions.Length > 0 && permissions[0] == Manifest.Permission.ReadExternalStorage &&
+        //            grantResults.Length > 0 && grantResults[0] == Permission.Granted)
+        //        {
+        //            //Success
+        //        }
+        //        else
+        //        {
+        //            Toast.MakeText(this, "Failure to get Read Permission!", ToastLength.Long).Show();
+        //        }
+        //    }
+        //}
     }
 }
 
diff --git a/Samples/XamarinClient/XamarinClient.Android/Properties/AndroidManifest.xml b/Samples/XamarinClient/XamarinClient.Android/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.XamarinClient" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="15" />
+	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="33" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

diff --git a/Samples/XamarinClient/XamarinClient.Android/Resources/Resource.designer.cs b/Samples/XamarinClient/XamarinClient.Android/Resources/Resource.designer.cs
diff --git a/Samples/XamarinClient/XamarinClient.Android/UA Xamarin Client.Android.csproj b/Samples/XamarinClient/XamarinClient.Android/UA Xamarin Client.Android.csproj
@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>XamarinClient.Droid</RootNamespace>
     <AssemblyName>XamarinClient.Android</AssemblyName>
-    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v13.0</TargetFrameworkVersion>
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
@@ -31,6 +31,8 @@
     <EnableLLVM>false</EnableLLVM>
     <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
     <BundleAssemblies>false</BundleAssemblies>
+    <EmbedAssembliesIntoApk>false</EmbedAssembliesIntoApk>
+    <AndroidSupportedAbis>armeabi-v7a;x86_64;arm64-v8a</AndroidSupportedAbis>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -51,14 +53,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="System.Threading.Tasks.Extensions">
-      <Version>4.5.0</Version>
+      <Version>4.5.4</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.122203" />
-    <PackageReference Include="Xamarin.Android.Support.Design" Version="25.4.0.2" />
-    <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="25.4.0.2" />
-    <PackageReference Include="Xamarin.Android.Support.v4" Version="25.4.0.2" />
-    <PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="25.4.0.2" />
-    <PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="25.4.0.2" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2662" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssetService.cs" />

diff --git a/Samples/XamarinClient/XamarinClient.UWP/PathService.cs b/Samples/XamarinClient/XamarinClient.UWP/PathService.cs
@@ -1,4 +1,4 @@
-/* ========================================================================
+/* ========================================================================
  * Copyright (c) 2005-2019 The OPC Foundation, Inc. All rights reserved.
  *
  * OPC Foundation MIT License 1.00

diff --git a/Samples/XamarinClient/XamarinClient.UWP/UA Xamarin Client.UWP.csproj b/Samples/XamarinClient/XamarinClient.UWP/UA Xamarin Client.UWP.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>XamarinClient.UWP</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
@@ -154,7 +154,7 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.122203" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2662" />
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.14" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Samples/XamarinClient/XamarinClient.iOS/UA Xamarin Client.iOS.csproj b/Samples/XamarinClient/XamarinClient.iOS/UA Xamarin Client.iOS.csproj
@@ -124,7 +124,7 @@
     <Reference Include="Xamarin.iOS" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.122203" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2662" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <ItemGroup>

diff --git a/Samples/XamarinClient/XamarinClient/UA Xamarin Client.csproj b/Samples/XamarinClient/XamarinClient/UA Xamarin Client.csproj
@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2662" />
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client" Version="1.5.374.117-preview" />
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.122203" />
   </ItemGroup>
 
   <ItemGroup>