From 171740ef6f7a21e1771bdd92d7ccd2c21fc751dd Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 14 Aug 2026 16:22:13 +0000
Subject: [PATCH 1/3] Initial plan


From 3a99f91f5c32888c4ffca556693b2e87196602d8 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 14 Aug 2026 16:40:29 +0000
Subject: [PATCH 2/3] Fix duplicate barcode AAR packaging

Co-authored-by: jonathanpeppers <840039+jonathanpeppers@users.noreply.github.com>
---
 config.json                               | 2 +-
 source/XamarinBuildDownloadTargets.cshtml | 1 -
 source/_XBDProjectType.cshtml             | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/config.json b/config.json
index 49b61b379..920c062d3 100644
--- a/config.json
+++ b/config.json
@@ -4323,7 +4323,7 @@
         "groupId": "com.google.mlkit",
         "artifactId": "barcode-scanning",
         "version": "17.3.0",
-        "nugetVersion": "117.3.0.8",
+        "nugetVersion": "117.3.0.9",
         "nugetId": "Xamarin.Google.MLKit.BarcodeScanning",
         "type": "xbd"
       },
diff --git a/source/XamarinBuildDownloadTargets.cshtml b/source/XamarinBuildDownloadTargets.cshtml
index 9d3b14fd9..b7c1f5145 100644
--- a/source/XamarinBuildDownloadTargets.cshtml
+++ b/source/XamarinBuildDownloadTargets.cshtml
@@ -76,7 +76,6 @@
       XamarinBuildDownloadRestoreAssemblyAar  v <   0.10.0
       -->
       *@
-      <XamarinBuildDownloadAndroidAarLibrary Include="$(XamarinBuildDownloadDir)@(xbdAarPath)" />
     </ItemGroup>
   </Target>
       }
diff --git a/source/_XBDProjectType.cshtml b/source/_XBDProjectType.cshtml
index 463342247..c364ef251 100644
--- a/source/_XBDProjectType.cshtml
+++ b/source/_XBDProjectType.cshtml
@@ -20,7 +20,7 @@
     @foreach (var art in @Model.MavenArtifacts) {
       if (art.MavenArtifactPackaging == "aar") {
         if ((System.Environment.GetEnvironmentVariable("LOCAL_TEST_PKG") ?? "") == "true") {
-    <AndroidLibrary Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId).aar" />
+    <AndroidLibrary Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId).aar" Pack="false" />
 
         } else {
     <InputJar Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)\classes.jar" />

From bd1acb3c46162ecf544bdd6b20834e0f7c6eee35 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Thu, 20 Aug 2026 10:34:39 -0500
Subject: [PATCH 3/3] Remove stale XBD compatibility comment

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 source/XamarinBuildDownloadTargets.cshtml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/source/XamarinBuildDownloadTargets.cshtml b/source/XamarinBuildDownloadTargets.cshtml
index b7c1f5145..7295a7a56 100644
--- a/source/XamarinBuildDownloadTargets.cshtml
+++ b/source/XamarinBuildDownloadTargets.cshtml
@@ -62,20 +62,8 @@
         <Sha256>@(xbdSha256)</Sha256>
       </XamarinBuildDownload>
     </ItemGroup>
-
-
     <ItemGroup>
-     <XamarinBuildDownloadAndroidAarLibrary Include="$(XamarinBuildDownloadDir)@(xbdAarPath)" />
-      @*
-      <!--
-      NOTE: 
-      Xamarin.Build.Download version set in GooglePlaySericesProjects.cshtml template is 
-      important for attributes in GooglePlaySericesTargets.cshtml template
-      
-      XamarinBuildDownloadAndroidAarLibrary   v >=  0.10.0
-      XamarinBuildDownloadRestoreAssemblyAar  v <   0.10.0
-      -->
-      *@
+      <XamarinBuildDownloadAndroidAarLibrary Include="$(XamarinBuildDownloadDir)@(xbdAarPath)" />
     </ItemGroup>
   </Target>
       }