Skip to content

Commit 1986c62

Browse files
diescalodiescalo
committed
packets: update the Nuget packages of all the projects within the solution
- Updated the version of all the Nuget packages to the latest compatible one in the library and example projects. - Removed unused Nuget packages from the projects. - Updated the Android target version of the examples to 29. - Updated some API to accomodate the new package updates. - Replaced the 'FilePicker' plugin with the native 'FilePicker' implementation of the Xamarin.Essentials package. https://onedigi.atlassian.net/browse/XBCSL-60 Signed-off-by: Diego Escalona <diego.escalona@digi.com>
1 parent 82f3188 commit 1986c62

File tree

37 files changed

+230
-242
lines changed

37 files changed

+230
-242
lines changed

‎XBeeLibrary.Xamarin/XBeeLibrary.Xamarin.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
<ItemGroup>
4141
<PackageReference Include="Common.Logging" Version="3.4.1" />
42-
<PackageReference Include="Plugin.BLE" Version="2.1.1" />
42+
<PackageReference Include="Plugin.BLE" Version="2.1.3" />
4343
</ItemGroup>
4444

4545
<ItemGroup>

‎XBeeLibrary.sln‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AgricultureDemo", "Agricult
6161
EndProjectSection
6262
EndProject
6363
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgricultureDemo", "examples\xamarin\AgricultureDemo\AgricultureDemo\AgricultureDemo.csproj", "{FF632E32-38AB-487D-A776-E247B9C972CE}"
64+
ProjectSection(ProjectDependencies) = postProject
65+
{136E00A4-29B0-4981-8213-0F49A87E4084} = {136E00A4-29B0-4981-8213-0F49A87E4084}
66+
EndProjectSection
6467
EndProject
6568
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgricultureDemo.Android", "examples\xamarin\AgricultureDemo\AgricultureDemo.Android\AgricultureDemo.Android.csproj", "{A48E4CE6-DA61-429A-A154-9271A5910FCC}"
6669
EndProject
@@ -85,8 +88,16 @@ EndProject
8588
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InterfacesConfigurationSample.Android", "examples\xamarin\InterfacesConfigurationSample\InterfacesConfigurationSample.Android\InterfacesConfigurationSample.Android.csproj", "{21698BF3-2AF2-44DA-AD07-70E7C1DC1873}"
8689
EndProject
8790
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InterfacesConfigurationSample.iOS", "examples\xamarin\InterfacesConfigurationSample\InterfacesConfigurationSample.iOS\InterfacesConfigurationSample.iOS.csproj", "{3B9BE251-0A14-4C04-AF97-2A60C97A1A04}"
91+
ProjectSection(ProjectDependencies) = postProject
92+
{40993E66-FEBC-42C4-AEAD-A04838145207} = {40993E66-FEBC-42C4-AEAD-A04838145207}
93+
{136E00A4-29B0-4981-8213-0F49A87E4084} = {136E00A4-29B0-4981-8213-0F49A87E4084}
94+
EndProjectSection
8895
EndProject
8996
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InterfacesConfigurationSample", "examples\xamarin\InterfacesConfigurationSample\InterfacesConfigurationSample\InterfacesConfigurationSample.csproj", "{2DB03613-576F-41E3-B56E-10BC551BE833}"
97+
ProjectSection(ProjectDependencies) = postProject
98+
{40993E66-FEBC-42C4-AEAD-A04838145207} = {40993E66-FEBC-42C4-AEAD-A04838145207}
99+
{136E00A4-29B0-4981-8213-0F49A87E4084} = {136E00A4-29B0-4981-8213-0F49A87E4084}
100+
EndProjectSection
90101
EndProject
91102
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "InterfacesConfigurationSample", "InterfacesConfigurationSample", "{913CD284-92E1-4617-ACE3-1A2D366B7067}"
92103
ProjectSection(SolutionItems) = preProject
@@ -702,6 +713,7 @@ Global
702713
{3B9BE251-0A14-4C04-AF97-2A60C97A1A04}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
703714
{3B9BE251-0A14-4C04-AF97-2A60C97A1A04}.Debug|iPhone.ActiveCfg = Debug|iPhone
704715
{3B9BE251-0A14-4C04-AF97-2A60C97A1A04}.Debug|iPhone.Build.0 = Debug|iPhone
716+
{3B9BE251-0A14-4C04-AF97-2A60C97A1A04}.Debug|iPhone.Deploy.0 = Debug|iPhone
705717
{3B9BE251-0A14-4C04-AF97-2A60C97A1A04}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
706718
{3B9BE251-0A14-4C04-AF97-2A60C97A1A04}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
707719
{3B9BE251-0A14-4C04-AF97-2A60C97A1A04}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator

‎examples/xamarin/AgricultureDemo/AgricultureDemo.Android/AgricultureDemo.Android.csproj‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,24 +66,18 @@
6666
</ItemGroup>
6767
<ItemGroup>
6868
<PackageReference Include="Acr.UserDialogs">
69-
<Version>7.1.0.446</Version>
69+
<Version>7.2.0.564</Version>
7070
</PackageReference>
7171
<PackageReference Include="Newtonsoft.Json">
72-
<Version>12.0.3</Version>
72+
<Version>13.0.1</Version>
7373
</PackageReference>
7474
<PackageReference Include="Rg.Plugins.Popup">
75-
<Version>2.0.0.4</Version>
75+
<Version>2.1.0</Version>
7676
</PackageReference>
77-
<PackageReference Include="Xamarin.Forms" Version="4.6.0.1141" />
78-
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
77+
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
78+
<PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
7979
<PackageReference Include="Xamarin.Forms.Maps">
80-
<Version>4.6.0.1141</Version>
81-
</PackageReference>
82-
<PackageReference Include="XBeeLibrary.Core">
83-
<Version>1.0.2</Version>
84-
</PackageReference>
85-
<PackageReference Include="XBeeLibrary.Xamarin">
86-
<Version>1.0.1</Version>
80+
<Version>5.0.0.2515</Version>
8781
</PackageReference>
8882
</ItemGroup>
8983
<ItemGroup>
@@ -139,6 +133,14 @@
139133
<AndroidResource Include="Resources\drawable\map_view.png" />
140134
</ItemGroup>
141135
<ItemGroup>
136+
<ProjectReference Include="..\..\..\..\XBeeLibrary.Core\XBeeLibrary.Core.csproj">
137+
<Project>{40993e66-febc-42c4-aead-a04838145207}</Project>
138+
<Name>XBeeLibrary.Core</Name>
139+
</ProjectReference>
140+
<ProjectReference Include="..\..\..\..\XBeeLibrary.Xamarin\XBeeLibrary.Xamarin.csproj">
141+
<Project>{136e00a4-29b0-4981-8213-0f49a87e4084}</Project>
142+
<Name>XBeeLibrary.Xamarin</Name>
143+
</ProjectReference>
142144
<ProjectReference Include="..\AgricultureDemo\AgricultureDemo.csproj">
143145
<Project>{ff632e32-38ab-487d-a776-e247b9c972ce}</Project>
144146
<Name>AgricultureDemo</Name>

‎examples/xamarin/AgricultureDemo/AgricultureDemo.Android/MainActivity.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected override void OnCreate(Bundle savedInstanceState)
5353

5454
Xamarin.Essentials.Platform.Init(this, savedInstanceState);
5555
UserDialogs.Init(this);
56-
Popup.Init(this, savedInstanceState);
56+
Popup.Init(this);
5757

5858
CheckPermissions();
5959

‎examples/xamarin/AgricultureDemo/AgricultureDemo.iOS/AgricultureDemo.iOS.csproj‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
<MtouchArch>x86_64</MtouchArch>
2828
<MtouchLink>None</MtouchLink>
2929
<MtouchDebug>true</MtouchDebug>
30+
<CodesignKey>Apple Development: Diego Escalona (N8U4F87B93)</CodesignKey>
31+
<CodesignProvision>VS: WildCard Development</CodesignProvision>
3032
</PropertyGroup>
3133
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
3234
<DebugType>none</DebugType>
@@ -46,12 +48,13 @@
4648
<ErrorReport>prompt</ErrorReport>
4749
<WarningLevel>4</WarningLevel>
4850
<MtouchArch>ARM64</MtouchArch>
49-
<CodesignKey>Apple Development: Ruben Moral (HMHQEM49ZJ)</CodesignKey>
51+
<CodesignKey>iPhone Developer</CodesignKey>
5052
<MtouchDebug>true</MtouchDebug>
5153
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
5254
<MtouchLink>None</MtouchLink>
5355
<MtouchInterpreter>-all</MtouchInterpreter>
54-
<CodesignProvision>VS: WildCard Development</CodesignProvision>
56+
<CodesignProvision>
57+
</CodesignProvision>
5558
<MtouchFloat32>true</MtouchFloat32>
5659
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
5760
</PropertyGroup>
@@ -62,11 +65,12 @@
6265
<ErrorReport>prompt</ErrorReport>
6366
<WarningLevel>4</WarningLevel>
6467
<MtouchArch>ARM64</MtouchArch>
65-
<CodesignKey>Apple Distribution: Digi International Inc (D5PV9FUNTY)</CodesignKey>
68+
<CodesignKey>iPhone Developer</CodesignKey>
6669
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
6770
<MtouchFloat32>true</MtouchFloat32>
6871
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
69-
<CodesignProvision>Digi XBee Agriculture Distribution</CodesignProvision>
72+
<CodesignProvision>
73+
</CodesignProvision>
7074
<BuildIpa>true</BuildIpa>
7175
</PropertyGroup>
7276
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
@@ -135,24 +139,17 @@
135139
</ItemGroup>
136140
<ItemGroup>
137141
<PackageReference Include="Acr.UserDialogs">
138-
<Version>7.1.0.446</Version>
142+
<Version>7.2.0.564</Version>
139143
</PackageReference>
140144
<PackageReference Include="Newtonsoft.Json">
141-
<Version>12.0.3</Version>
145+
<Version>13.0.1</Version>
142146
</PackageReference>
143147
<PackageReference Include="Rg.Plugins.Popup">
144-
<Version>2.0.0.4</Version>
148+
<Version>2.1.0</Version>
145149
</PackageReference>
146-
<PackageReference Include="Xamarin.Forms" Version="4.6.0.1141" />
147-
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
150+
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
148151
<PackageReference Include="Xamarin.Forms.Maps">
149-
<Version>4.6.0.1141</Version>
150-
</PackageReference>
151-
<PackageReference Include="XBeeLibrary.Core">
152-
<Version>1.0.2</Version>
153-
</PackageReference>
154-
<PackageReference Include="XBeeLibrary.Xamarin">
155-
<Version>1.0.1</Version>
152+
<Version>5.0.0.2515</Version>
156153
</PackageReference>
157154
</ItemGroup>
158155
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
@@ -193,6 +190,14 @@
193190
<BundleResource Include="Resources\map_view.png" />
194191
</ItemGroup>
195192
<ItemGroup>
193+
<ProjectReference Include="..\..\..\..\XBeeLibrary.Core\XBeeLibrary.Core.csproj">
194+
<Project>{40993e66-febc-42c4-aead-a04838145207}</Project>
195+
<Name>XBeeLibrary.Core</Name>
196+
</ProjectReference>
197+
<ProjectReference Include="..\..\..\..\XBeeLibrary.Xamarin\XBeeLibrary.Xamarin.csproj">
198+
<Project>{136e00a4-29b0-4981-8213-0f49a87e4084}</Project>
199+
<Name>XBeeLibrary.Xamarin</Name>
200+
</ProjectReference>
196201
<ProjectReference Include="..\AgricultureDemo\AgricultureDemo.csproj">
197202
<Project>{ff632e32-38ab-487d-a776-e247b9c972ce}</Project>
198203
<Name>AgricultureDemo</Name>

‎examples/xamarin/AgricultureDemo/AgricultureDemo/AgricultureDemo.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
@@ -11,14 +11,14 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Acr.UserDialogs" Version="7.1.0.446" />
15-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
16-
<PackageReference Include="Rg.Plugins.Popup" Version="2.0.0.4" />
17-
<PackageReference Include="Xamarin.Forms" Version="4.6.0.1141" />
18-
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
19-
<PackageReference Include="Xamarin.Forms.Maps" Version="4.6.0.1141" />
20-
<PackageReference Include="XBeeLibrary.Core" Version="1.0.2" />
21-
<PackageReference Include="XBeeLibrary.Xamarin" Version="1.0.1" />
14+
<PackageReference Include="Acr.UserDialogs" Version="7.2.0.564" />
15+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
16+
<PackageReference Include="Rg.Plugins.Popup" Version="2.1.0" />
17+
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
18+
<PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
19+
<PackageReference Include="Xamarin.Forms.Maps" Version="5.0.0.2515" />
20+
<ProjectReference Include="..\..\..\..\XBeeLibrary.Core\XBeeLibrary.Core.csproj" />
21+
<ProjectReference Include="..\..\..\..\XBeeLibrary.Xamarin\XBeeLibrary.Xamarin.csproj" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎examples/xamarin/BleConfigurationSample/BleConfigurationSample.Android/BleConfigurationSample.Android.csproj‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
1717
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
1818
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
19-
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
19+
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
2020
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
2121
<NuGetPackageImportStamp>
2222
</NuGetPackageImportStamp>
@@ -34,6 +34,7 @@
3434
<EnableLLVM>false</EnableLLVM>
3535
<BundleAssemblies>false</BundleAssemblies>
3636
<AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
37+
<PlatformTarget>AnyCPU</PlatformTarget>
3738
</PropertyGroup>
3839
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3940
<DebugSymbols>true</DebugSymbols>
@@ -54,17 +55,12 @@
5455
</ItemGroup>
5556
<ItemGroup>
5657
<PackageReference Include="Acr.UserDialogs">
57-
<Version>7.0.4</Version>
58+
<Version>7.2.0.564</Version>
5859
</PackageReference>
59-
<PackageReference Include="Plugin.BLE">
60-
<Version>2.1.1</Version>
60+
<PackageReference Include="Xamarin.Essentials">
61+
<Version>1.7.3</Version>
6162
</PackageReference>
62-
<PackageReference Include="Xamarin.Forms" Version="3.3.0.967583" />
63-
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
64-
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.3" />
65-
<PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.3" />
66-
<PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="28.0.0.3" />
67-
<PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="28.0.0.3" />
63+
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
6864
</ItemGroup>
6965
<ItemGroup>
7066
<Compile Include="MainActivity.cs" />

‎examples/xamarin/BleConfigurationSample/BleConfigurationSample.Android/MainActivity.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
using System.Collections;
2626
using System.Linq;
2727
using Xamarin.Forms;
28-
using Support = Android.Support;
2928

3029
namespace BleConfigurationSample.Droid
3130
{
@@ -58,8 +57,8 @@ protected override void OnCreate(Bundle savedInstanceState)
5857
global::Xamarin.Forms.Forms.Init(this, savedInstanceState);
5958
LoadApplication(new App());
6059

61-
Support.V7.Widget.Toolbar toolbar
62-
= this.FindViewById<Support.V7.Widget.Toolbar>(Resource.Id.toolbar);
60+
AndroidX.AppCompat.Widget.Toolbar toolbar
61+
= this.FindViewById<AndroidX.AppCompat.Widget.Toolbar>(Resource.Id.toolbar);
6362
SetSupportActionBar(toolbar);
6463
}
6564

‎examples/xamarin/BleConfigurationSample/BleConfigurationSample.Android/Properties/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.digi.xbee.sample.xamarin.bleconfiguration" android:installLocation="auto">
3-
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
3+
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
44
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
55
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
66
<uses-permission android:name="android.permission.BLUETOOTH" />

‎examples/xamarin/BleConfigurationSample/BleConfigurationSample.iOS/BleConfigurationSample.iOS.csproj‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
1616
<NuGetPackageImportStamp>
1717
</NuGetPackageImportStamp>
18+
<ProvisioningType>manual</ProvisioningType>
1819
</PropertyGroup>
1920
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
2021
<DebugSymbols>true</DebugSymbols>
@@ -85,8 +86,9 @@
8586
<WarningLevel>4</WarningLevel>
8687
<ConsolePause>False</ConsolePause>
8788
<MtouchArch>ARM64</MtouchArch>
88-
<CodesignProvision>Automatic:AppStore</CodesignProvision>
89-
<CodesignKey>iPhone Distribution</CodesignKey>
89+
<CodesignProvision>
90+
</CodesignProvision>
91+
<CodesignKey>iPhone Developer</CodesignKey>
9092
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
9193
</PropertyGroup>
9294
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
@@ -149,12 +151,9 @@
149151
</ItemGroup>
150152
<ItemGroup>
151153
<PackageReference Include="Acr.UserDialogs">
152-
<Version>7.0.4</Version>
153-
</PackageReference>
154-
<PackageReference Include="Plugin.BLE">
155-
<Version>2.1.1</Version>
154+
<Version>7.2.0.564</Version>
156155
</PackageReference>
157-
<PackageReference Include="Xamarin.Forms" Version="3.3.0.967583" />
156+
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
158157
</ItemGroup>
159158
<ItemGroup>
160159
<ProjectReference Include="..\..\..\..\XBeeLibrary.Core\XBeeLibrary.Core.csproj">

0 commit comments

Comments
 (0)