Merge pull request #695 from xamarin/dev/build-merger

Make sure the manifest merger builds on mac

Author: Redth

Util/AndroidManifestMerger/build.cake

@@ -1,8 +1,8 @@
 using System.Xml.Linq;
 
-var target = Argument("target", "Default");
+var target = Argument("target", "ci");
 
-var PACKAGE_VERSION = "1.0.0-preview02";
+var PACKAGE_VERSION = "1.0.0-preview03";
 
 var TOOL_VERSION = "26.5.0";
 
@@ -62,7 +62,8 @@ Task("tests")
 	//       as ensuring that the target is properly skipped on subsequent builds.
 
 	var android = (XNamespace)"http://schemas.android.com/apk/res/android";
-	var xdoc = XDocument.Load("./samples/FancyMergingApp/obj/Release/90/android/AndroidManifest.xml");
+	var files = GetFiles("./samples/FancyMergingApp/obj/Release/**/android/AndroidManifest.xml");
+	var xdoc = XDocument.Load(files.Single().FullPath);
 
 	var serviceName = "com.google.firebase.components.ComponentDiscoveryService";
 	var services = xdoc
@@ -78,7 +79,7 @@ Task("tests")
 		throw new Exception("Manifests were merged, but data was lost.");
 });
 
-Task("Default")
+Task("ci")
 	.IsDependentOn("externals")
 	.IsDependentOn("nuget")
 	.IsDependentOn("tests");

Util/AndroidManifestMerger/nuget/Xamarin.Android.ManifestMerger.nuspec

@@ -15,6 +15,7 @@
   <files>
     <file src="..\externals\merger\*.jar" target="build/monoandroid" />
     <file src="..\source\*.targets" target="build/monoandroid" />
+    <file src="..\source\_._" target="lib/monoandroid/_._" />
     <file src="..\External-Dependency-Info.txt" target="THIRD-PARTY-NOTICES.txt" />
   </files>
-</package>
+</package>

Util/AndroidManifestMerger/samples/FancyMergingApp/FancyMergingApp.csproj

@@ -100,7 +100,7 @@
     <PackageReference Include="Xamarin.Firebase.Perf" Version="71.1620.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Android.ManifestMerger" Version="1.0.0-preview02" />
+    <PackageReference Include="Xamarin.Android.ManifestMerger" Version="1.0.0-preview03" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>

Util/AndroidManifestMerger/source/Xamarin.Android.ManifestMerger.targets

@@ -25,7 +25,7 @@
       <_MergerJar Include="$(MSBuildThisFileDirectory)\*.jar" />
     </ItemGroup>
 
-    <Exec Command="&quot;$(_MergerJavaPath)&quot; -cp &quot;@(_MergerJar)&quot; &quot;com.android.manifmerger.Merger&quot; --main &quot;$(IntermediateOutputPath)android\AndroidManifest.xml&quot; --libs &quot;@(_Proxy_ExtractedManifestDocuments)&quot; --out &quot;$(IntermediateOutputPath)android\AndroidManifest.xml&quot;" />
+    <Exec Command="&quot;$(_MergerJavaPath)&quot; -cp &quot;@(_MergerJar, '$([System.IO.Path]::PathSeparator)')&quot; &quot;com.android.manifmerger.Merger&quot; --main &quot;$(IntermediateOutputPath)android\AndroidManifest.xml&quot; --libs &quot;@(_Proxy_ExtractedManifestDocuments, '$([System.IO.Path]::PathSeparator)')&quot; --out &quot;$(IntermediateOutputPath)android\AndroidManifest.xml&quot;" />
 
     <Touch Files="$(_AndroidStampDirectory)_GenerateJavaStubs.stamp;@(_TypeMapAssemblySource);$(_AndroidStampDirectory)_After_GenerateJavaStubs.stamp" AlwaysCreate="True" />
 

Util/AndroidManifestMerger/source/_._

@@ -0,0 +1 @@
+

manifest.yaml

@@ -600,7 +600,8 @@
 - Name: AndroidManifestMerger
   BuildScript: ./Util/AndroidManifestMerger/build.cake
   TriggerPaths: [ Util/AndroidManifestMerger ]
-  WindowsBuildTargets: [ Default ]
+  WindowsBuildTargets: [ ci ]
+  MacBuildTargets: [ ci ]
 - Name: Xamarin.AndroidBinderator
   BuildScript: ./Util/Xamarin.AndroidBinderator/build.cake
   TriggerPaths: [ Util/Xamarin.AndroidBinderator ]