Android: adjust for new SDK.

Berrysoft · Jun 12, 2022 · d63bc85 · d63bc85
1 parent 6540691
commit d63bc85
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 24 deletions.
diff --git a/TsinghuaNet.XF/TsinghuaNet.XF.Android/Background/AppWidget.cs b/TsinghuaNet.XF/TsinghuaNet.XF.Android/Background/AppWidget.cs
@@ -9,7 +9,7 @@
 
 namespace TsinghuaNet.XF.Droid.Background
 {
-    [BroadcastReceiver(Label = "TsinghuaNet.Widget")]
+    [BroadcastReceiver(Label = "TsinghuaNet.Widget", Exported = true)]
     [IntentFilter(new string[] { "android.appwidget.action.APPWIDGET_UPDATE" })]
     [MetaData("android.appwidget.provider", Resource = "@xml/appwidgetprovider")]
     public class AppWidget : AppWidgetProvider

diff --git a/TsinghuaNet.XF/TsinghuaNet.XF.Android/Resources/Resource.designer.cs b/TsinghuaNet.XF/TsinghuaNet.XF.Android/Resources/Resource.designer.cs
diff --git a/TsinghuaNet.XF/TsinghuaNet.XF.Android/TsinghuaNet.XF.Android.csproj b/TsinghuaNet.XF/TsinghuaNet.XF.Android/TsinghuaNet.XF.Android.csproj
@@ -73,16 +73,16 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Syncfusion.Xamarin.SfChart">
-      <Version>20.1.0.48</Version>
+      <Version>20.1.0.59</Version>
     </PackageReference>
     <PackageReference Include="Syncfusion.Xamarin.SfDataGrid">
-      <Version>20.1.0.48</Version>
+      <Version>20.1.0.59</Version>
     </PackageReference>
     <PackageReference Include="Syncfusion.Xamarin.SfPopupLayout">
-      <Version>20.1.0.48</Version>
+      <Version>20.1.0.59</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2401" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.7.2" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2478" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Background\AppWidget.cs" />

diff --git a/TsinghuaNet.XF/TsinghuaNet.XF.UWP/TsinghuaNet.XF.UWP.csproj b/TsinghuaNet.XF/TsinghuaNet.XF.UWP/TsinghuaNet.XF.UWP.csproj
@@ -186,23 +186,23 @@
       <Version>7.1.2</Version>
     </PackageReference>
     <PackageReference Include="Syncfusion.Xamarin.SfChart">
-      <Version>20.1.0.48</Version>
+      <Version>20.1.0.59</Version>
     </PackageReference>
     <PackageReference Include="Syncfusion.Xamarin.SfDataGrid">
-      <Version>20.1.0.48</Version>
+      <Version>20.1.0.59</Version>
     </PackageReference>
     <PackageReference Include="Syncfusion.Xamarin.SfPopupLayout">
-      <Version>20.1.0.48</Version>
+      <Version>20.1.0.59</Version>
     </PackageReference>
     <PackageReference Include="System.Text.Encoding.CodePages">
       <Version>6.0.0</Version>
     </PackageReference>
     <PackageReference Include="Win2D.uwp">
       <Version>1.26.0</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2401" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2478" />
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.13" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.7.2" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\TsinghuaNet\TsinghuaNet.csproj">

diff --git a/TsinghuaNet.XF/TsinghuaNet.XF/TsinghuaNet.XF.csproj b/TsinghuaNet.XF/TsinghuaNet.XF/TsinghuaNet.XF.csproj
@@ -7,18 +7,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fody" Version="6.6.0">
+    <PackageReference Include="Fody" Version="6.6.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="PropertyChanged.Fody" Version="3.4.0">
+    <PackageReference Include="PropertyChanged.Fody" Version="3.4.1">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Syncfusion.Xamarin.SfChart" Version="20.1.0.48" />
-    <PackageReference Include="Syncfusion.Xamarin.SfDataGrid" Version="20.1.0.48" />
-    <PackageReference Include="Syncfusion.Xamarin.SfPopupLayout" Version="20.1.0.48" />
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2401" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.7.2" />
+    <PackageReference Include="Syncfusion.Xamarin.SfChart" Version="20.1.0.59" />
+    <PackageReference Include="Syncfusion.Xamarin.SfDataGrid" Version="20.1.0.59" />
+    <PackageReference Include="Syncfusion.Xamarin.SfPopupLayout" Version="20.1.0.59" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2478" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/TsinghuaNet/TsinghuaNet.csproj b/TsinghuaNet/TsinghuaNet.csproj
@@ -8,21 +8,21 @@
 
   <ItemGroup>
     <PackageReference Include="Berrysoft.XXTea" Version="4.0.9" />
-    <PackageReference Include="Fody" Version="6.6.0">
+    <PackageReference Include="Fody" Version="6.6.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.42" />
-    <PackageReference Include="PropertyChanged.Fody" Version="3.4.0">
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.43" />
+    <PackageReference Include="PropertyChanged.Fody" Version="3.4.1">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Refractored.MvvmHelpers" Version="1.6.2" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
-    <PackageReference Include="System.Text.Json" Version="6.0.3" />
+    <PackageReference Include="System.Text.Json" Version="6.0.4" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
-    <PackageReference Include="System.Memory" Version="4.5.4" />
+    <PackageReference Include="System.Memory" Version="4.5.5" />
   </ItemGroup>
 
   <Import Project="../ver.props" />

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -81,6 +81,7 @@ jobs:
     inputs:
       solution: '$(droidProject)'
       configuration: 'Release'
+      platform: 'AnyCPU'
       msbuildArguments: '/r /t:SignAndroidPackage /p:JavaSdkDirectory="%JAVA_HOME_11_X64%" /p:AndroidSigningKeyPass=$(key-password) /p:AndroidSigningStorePass=$(keystore-password)'
     env:
       MSBuildSDKsPath: $(Agent.ToolsDirectory)/dotnet/sdk/$(sdkVersion)/Sdks