TFM Monoandroid13 + nuget version bumps (xamarin#15745)

* Bump MonoAndroid target to 13.0 * Add Boots for right Android version * OK no boots * Update build.cake * Update artifacts folders * Set right JAVA version * Update build.cake * Try another thing * Try more * Update Xamarin.Forms.Platform.Android.UnitTests.csproj * Update Xamarin.Forms.Platform.Android.UnitTests.csproj * Update Xamarin.Forms.Platform.Android.UnitTests.csproj * This then * Update build.cake * Revert "Update build.cake" This reverts commit fc74812. * Update build.cake * Update Environment.Build.props * Update Environment.Build.props * Revert "Update Environment.Build.props" This reverts commit 819c7d7. * Update Environment.Build.props * Update Environment.Build.props * Update Environment.Build.props * Update build.cake * PR Feedback * Update Xamarin.Forms.nuspec * Update dependency versions * Update Directory.Build.targets * Revert "Update Directory.Build.targets" This reverts commit a06fb7d. * Update more TargetFrameworks * Pin LiveData package to 2.5.1.2 * nugets bumped * fix package downgrade for nuget restore errors --------- Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>
fredatgithub · May 16, 2023 · d68e84f · d68e84f
1 parent 9e230ad
commit d68e84f
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 40 deletions.
diff --git a/.nuspec/Xamarin.Forms.AppLinks.nuspec b/.nuspec/Xamarin.Forms.AppLinks.nuspec
@@ -16,8 +16,8 @@
     <dependencies>
       <group targetFramework="MonoAndroid13.0">
         <dependency id="Xamarin.Firebase.AppIndexing" version="120.0.0.11"/>        
-        <dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.5.1.2"/>
-        <dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0.16"/>
+        <dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.6.1.1"/>
+        <dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0.17"/>
       </group>
     </dependencies>
     <references>

diff --git a/.nuspec/Xamarin.Forms.nuspec b/.nuspec/Xamarin.Forms.nuspec
@@ -15,7 +15,7 @@
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <dependencies>
       <group targetFramework="MonoAndroid13.0">
-        <dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="[2.3.1.1,2.5.1.2]" />
+        <dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="[2.3.1.1,2.6.1.1]" />
         <dependency id="Xamarin.Google.Android.Material" version="[1.4.0.2,1.9)" />
         <dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="[1.0.0.8,1.1)" />
         <dependency id="Xamarin.AndroidX.Browser" version="[1.3.0.6,1.6)" />

diff --git a/DualScreen/DualScreen.Android/DualScreen.Android.csproj b/DualScreen/DualScreen.Android/DualScreen.Android.csproj
@@ -115,9 +115,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.16" />    
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.5.1.2" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0" />
+    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.17" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.1" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0.1" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\values\colors.xml" />

diff --git a/EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets b/EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets
@@ -1,9 +1,9 @@
 <Project>
   <ItemGroup>
-    <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.5.0" />
-    <PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.16" />
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.5.1.2" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0" />
-    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.16" />
+    <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.5.0.1" />
+    <PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.17" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.1" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0.1" />
+    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.17" />
   </ItemGroup>
 </Project>
diff --git a/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj b/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj
@@ -22,9 +22,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.StartsWith('MonoAndroid'))">
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.5.1.2" />
-    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.16" />
-    <PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1.9" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.1" />
+    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.17" />
+    <PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.3.0.1" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0.1" />
   </ItemGroup>
 </Project>
diff --git a/Xamarin.Forms.ControlGallery.Android/Directory.Build.targets b/Xamarin.Forms.ControlGallery.Android/Directory.Build.targets
@@ -1,10 +1,10 @@
 <Project>
   <ItemGroup>
-    <PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.16" />    
-    <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.5.0" />
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.5.1.2" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0" />
-    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.16" />
+    <PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.17" />
+    <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.5.0.1" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.1" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0.1" />
+    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.17" />
   </ItemGroup>
   <Import Project="Nuget.Build.targets" />
   <Import Project="..\Nuget.targets" Condition="'$(FromSource)' == 'false'" />

diff --git a/Xamarin.Forms.ControlGallery.Android/Nuget.Build.targets b/Xamarin.Forms.ControlGallery.Android/Nuget.Build.targets
@@ -5,10 +5,10 @@
         </PackageReference>
     </ItemGroup>
     <ItemGroup>
-    <PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.16" />
-    <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.5.0" />
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.5.1.2" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0" />
-    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.16" />
+    <PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.17" />
+    <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.5.0.1" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.1" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0.1" />
+    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.17" />
     </ItemGroup>
 </Project>
diff --git a/Xamarin.Forms.DualScreen/Xamarin.Forms.DualScreen.csproj b/Xamarin.Forms.DualScreen/Xamarin.Forms.DualScreen.csproj
@@ -55,8 +55,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.StartsWith('MonoAndroid'))">
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.5.1.2" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0" />
-    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.16" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.1" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0.1" />
+    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.17" />
   </ItemGroup>
 </Project>
diff --git a/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj b/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj
@@ -20,9 +20,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.5.1.2" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0" />
-    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.16" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.1" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0.1" />
+    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.17" />
     <PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="118.1.0.1" />
   </ItemGroup>
 </Project>
diff --git a/Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj b/Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj
@@ -15,8 +15,8 @@
     <AndroidResource Include="Resources\**\*" />
   </ItemGroup>
   <ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) " >
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.5.1.2" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.1" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">

diff --git a/Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj b/Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj
@@ -25,7 +25,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.StartsWith('MonoAndroid'))">
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.5.1.2" />
-    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.16" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.1" />
+    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.17" />
   </ItemGroup>
 </Project>
diff --git a/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj b/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj
@@ -43,10 +43,10 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.5.1.2" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0" />
-    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.16" />
-    <PackageReference Include="Xamarin.AndroidX.Navigation.UI" Version="2.3.5.1" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.1" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0.1" />
+    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.17" />
+    <PackageReference Include="Xamarin.AndroidX.Navigation.UI" Version="2.5.3.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">

diff --git a/build/steps/build-windows.yml b/build/steps/build-windows.yml
@@ -25,7 +25,7 @@ steps:
 
   # Setup JDK Paths
   - bash: |
-        echo "##vso[task.setvariable variable=JI_JAVA_HOME]$(JAVA_HOME_11_X64)"
+      echo "##vso[task.setvariable variable=JI_JAVA_HOME]$(JAVA_HOME_11_X64)"
     displayName: 'Setup JDK Paths'
 
   - task: xamops.azdevex.provisionator-task.provisionator@2