update targets for build/deploy

dansiegel · Jun 22, 2021 · 52af312 · 52af312
1 parent f139636
commit 52af312
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 5 deletions.
diff --git a/src/Mobile.BuildTools/AndroidManifest.targets b/src/Mobile.BuildTools/AndroidManifest.targets
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Project>
 
-  <Target Name="_MBTGatherManifests">
+  <Target Name="_MBTGatherManifests"
+          AfterTargets="_GetAndroidPackageName"
+          Condition=" $(_AndroidManifestAbs) != '' ">
     <PropertyGroup>
       <_MBTUpdatedManifest>$(IntermediateOutputPath)mbt\AndroidManifest.xml</_MBTUpdatedManifest>
       <_MBTSourceManifest>$(_AndroidManifestAbs)</_MBTSourceManifest>
@@ -33,7 +35,10 @@
                           ReferenceAssemblyPaths="$(_XATargetFrameworkDirectories)"
                           ManifestPath="$(_MBTUpdatedManifest)"
                           OutputManifestPath="$(_MBTUpdatedManifest)"
-                          Condition="$(BuildToolsEnableTemplateManifests)" />
+                          Condition="$(BuildToolsEnableTemplateManifests)">
+      <Output TaskParameter="PackageId"
+              PropertyName="_AndroidPackage" />
+    </TemplateManifestTask>
   </Target>
 
   <Target Name="AutomaticBuildVersioning"

diff --git a/src/Mobile.BuildTools/Generators/Manifests/BaseTemplatedManifestGenerator.cs b/src/Mobile.BuildTools/Generators/Manifests/BaseTemplatedManifestGenerator.cs
@@ -29,6 +29,8 @@ public BaseTemplatedManifestGenerator(IBuildConfiguration configuration)
 
         public string ManifestOutputPath { get; set; }
 
+        public string PackageId { get; protected set; }
+
         protected override void ExecuteInternal()
         {
             Outputs = ManifestOutputPath;

diff --git a/src/Mobile.BuildTools/Generators/Manifests/DefaultTemplatedManifestGenerator.cs b/src/Mobile.BuildTools/Generators/Manifests/DefaultTemplatedManifestGenerator.cs
@@ -8,7 +8,7 @@ internal class DefaultTemplatedManifestGenerator : BaseTemplatedManifestGenerato
         public DefaultTemplatedManifestGenerator(IBuildConfiguration configuration)
             : base(configuration)
         {
-        }
+        }
 
         protected override string ReadManifest() => File.ReadAllText(ManifestOutputPath);
 

diff --git a/src/Mobile.BuildTools/Generators/Manifests/TemplatedAndroidAppManifestGenerator.cs b/src/Mobile.BuildTools/Generators/Manifests/TemplatedAndroidAppManifestGenerator.cs
@@ -28,7 +28,12 @@ protected override void SaveManifest(string manifest)
         protected override string SetAppBundleId(string manifest, string packageName)
         {
             var appManifest = AndroidAppManifest.Load(XDocument.Parse(manifest), AndroidVersions);
-            appManifest.PackageName = packageName;
+
+            if(!string.IsNullOrEmpty(packageName))
+                appManifest.PackageName = packageName;
+
+            PackageId = appManifest.PackageName;
+
             return appManifest.Document.ToString();
         }
     }

diff --git a/src/Mobile.BuildTools/Tasks/TemplateManifestTask.cs b/src/Mobile.BuildTools/Tasks/TemplateManifestTask.cs
@@ -19,6 +19,9 @@ public class TemplateManifestTask : BuildToolsTaskBase
         [Output]
         public ITaskItem ProcessedManifest { get; private set; }
 
+        [Output]
+        public string PackageId { get; private set; }
+
         internal override void ExecuteInternal(IBuildConfiguration config)
         {
             if(string.IsNullOrEmpty(ManifestPath))
@@ -38,7 +41,7 @@ internal override void ExecuteInternal(IBuildConfiguration config)
                 OutputManifestPath = ManifestPath;
             }
 
-            IGenerator<string> generator = null;
+            BaseTemplatedManifestGenerator generator = null;
             switch(config.Platform)
             {
                 case Platform.iOS:
@@ -65,6 +68,8 @@ internal override void ExecuteInternal(IBuildConfiguration config)
             {
                 ProcessedManifest = new TaskItem(generator.Outputs);
             }
+
+            PackageId = generator?.PackageId ?? string.Empty;
         }
     }
 }