From 3300319d4b179f247f6b6233051231bba29d50f7 Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome.laban@nventive.com>
Date: Wed, 7 Jul 2021 15:28:58 -0400
Subject: [PATCH] ci: Include net6 aar files for nupkg

---
 build/Uno.WinUI.nuspec                      | 2 +-
 build/ci/.azure-devops-package-net6-win.yml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/Uno.WinUI.nuspec b/build/Uno.WinUI.nuspec
index a4451b39c373..f819e6ffb910 100644
--- a/build/Uno.WinUI.nuspec
+++ b/build/Uno.WinUI.nuspec
@@ -289,7 +289,7 @@
 	<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-android\Uno.Xaml.pdb" target="lib\net6.0-android30.0" />
 	<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-android\Uno.UI.BindingHelper.Android.dll" target="lib\net6.0-android30.0" />
 	<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-android\Uno.UI.BindingHelper.Android.pdb" target="lib\net6.0-android30.0" />
-	<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-android\Uno.UI.BindingHelper.Android.aar" target="lib\net6.0-android30.0" />
+	<file src="..\src\Uno.UI\Bin\Uno.UI.BindingHelper.Android\Release\net6.0-android\Uno.UI.BindingHelper.Android.aar" target="lib\net6.0-android30.0" />
 	<file src="..\src\Uno.UI\bin\Uno.UI.net6\Release\net6.0-android\*.xml" target="lib\net6.0-android30.0" />
 	<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-android\Uno.UI.FluentTheme.dll" target="lib\net6.0-android30.0" />
 	<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-android\Uno.UI.FluentTheme.pdb" target="lib\net6.0-android30.0" />
diff --git a/build/ci/.azure-devops-package-net6-win.yml b/build/ci/.azure-devops-package-net6-win.yml
index 426325763e43..e8ba8ece7251 100644
--- a/build/ci/.azure-devops-package-net6-win.yml
+++ b/build/ci/.azure-devops-package-net6-win.yml
@@ -101,6 +101,7 @@ jobs:
         **/bin/**/*.xml
         **/bin/**/*.xbf
         **/bin/**/*.xaml
+        **/bin/**/*.aar
       TargetFolder: $(build.sourcesdirectory)\build-artifacts\bin-$(XAML_FLAVOR_BUILD)
       CleanTargetFolder: false
       OverWrite: false