Enable android nuget build

AvaloniaUI · Feb 3, 2022 · 1148154 · 1148154
1 parent 9ba05ec
commit 1148154
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/dirs.proj b/dirs.proj
@@ -9,11 +9,6 @@
     <ProjectReference Remove="src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github/**/*.*proj" />
     <ProjectReference Remove="tests/Avalonia.ReactiveUI.Events.UnitTests/Avalonia.ReactiveUI.Events.UnitTests.csproj" />
   </ItemGroup>
-  <!--<ItemGroup Condition="!Exists('$(MSBuildExtensionsPath)\Xamarin\Android')">-->
-  <ItemGroup>
-    <ProjectReference Remove="src/Android/**/*.*proj" />
-    <ProjectReference Remove="samples/ControlCatalog.Android/ControlCatalog.Android.csproj" />
-  </ItemGroup>
   <ItemGroup Condition="!Exists('$(MSBuildExtensionsPath)\Xamarin\iOS')">
     <ProjectReference Remove="src/iOS/**/*.*proj" />
     <ProjectReference Remove="samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj" />
@@ -22,6 +17,9 @@
     <ProjectReference Remove="src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj" />
     <ProjectReference Remove="samples/interop/**/*.*proj" />
     <ProjectReference Remove="samples/ControlCatalog.Desktop/*.*proj" />
+    <!-- Build android projects only on Windows, where we have installed android workload -->
+    <ProjectReference Remove="src/Android/**/*.*proj" />
+    <ProjectReference Remove="samples/ControlCatalog.Android/ControlCatalog.Android.csproj" />
   </ItemGroup>
 
   <ItemGroup>