From 95f0ea83cf44e3be8810ead2ac3aabcb91a23d65 Mon Sep 17 00:00:00 2001
From: Jonathan Pobst <jonathan.pobst@microsoft.com>
Date: Fri, 23 Feb 2024 07:13:03 -1000
Subject: [PATCH] Fix persistent `api-diff` issues. (#852)

---
 build/ci/build.yml                                              | 2 +-
 nuget-diff.cake                                                 | 1 +
 ...androidx.appcompat.appcompat-resources-typeforwarders.csproj | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build/ci/build.yml b/build/ci/build.yml
index 59dbbef7..005d8e71 100644
--- a/build/ci/build.yml
+++ b/build/ci/build.yml
@@ -22,7 +22,7 @@ parameters:
   - 'xamarin.androidbinderator.tool': '0.5.7'
   - 'Cake.Tool': '4.0.0'
   - 'boots': '1.1.0.712-preview2'
-  - 'private-api-tools': '1.0.0'
+  - 'private-api-tools': '1.0.1'
 
   # Build Parameters
   verbosity: 'normal'                                       # the build verbosity: 'minimal', 'normal', 'diagnostic'
diff --git a/nuget-diff.cake b/nuget-diff.cake
index 70f04bbd..dd1b775f 100644
--- a/nuget-diff.cake
+++ b/nuget-diff.cake
@@ -36,6 +36,7 @@ if (!nupkgs.Any()) {
 				.AppendQuoted(nupkg.FullPath)
 				.Append(version)
 				.Append("--prerelease")
+				.Append("--prefer-released")
 				.Append("--group-ids")
 				.Append("--ignore-unchanged")
 				.Append("--compare-nuget-structure")
diff --git a/source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj b/source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj
index d588578f..bc5ea1c3 100644
--- a/source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj
+++ b/source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj
@@ -33,7 +33,7 @@
     <PackageTags>Xamarin AndroidX Xamarin.AndroidX Support Google appcompat-resources</PackageTags>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <PackageIcon>icon.png</PackageIcon>
-    <PackageVersion>1.1.0.2</PackageVersion>
+    <PackageVersion>1.1.0.3</PackageVersion>
     <!-- Include symbol files (*.pdb) in the built .nupkg -->
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>