Manifest updates

dansiegel · Apr 4, 2021 · 4d4ae77 · 4d4ae77
1 parent 61ff965
commit 4d4ae77
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/src/Mobile.BuildTools/AndroidManifest.targets b/src/Mobile.BuildTools/AndroidManifest.targets
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Project>
 
-  <UsingTask TaskName="Mobile.BuildTools.Tasks.TemplateManifestTask"
-             AssemblyFile="$(_MobileBuildToolsParentBuildTasksDll)"/>
-
   <PropertyGroup>
     <BeforeGenerateAndroidManifest>
       MobileBuildToolsInit;

diff --git a/src/Mobile.BuildTools/AppleManifests.targets b/src/Mobile.BuildTools/AppleManifests.targets
@@ -1,13 +1,11 @@
 <Project>
-  <UsingTask TaskName="Mobile.BuildTools.Tasks.TemplateManifestTask"
-             AssemblyFile="$(_MobileBuildToolsParentBuildTasksDll)"/>
 
   <!-- Collect Info.plist -->
   <Target Name="_MBTGatherManifests"
           BeforeTargets="HandleTokenizedInfoPlist"
           DependsOnTargets="_DetectAppManifest">
     <PropertyGroup>
-      <TemlateAppManifest>$(_AppBundlePath)Info.plist</TemlateAppManifest>
+      <TemlateAppManifest>$([System.IO.Path]::Combine('$(_AppBundlePath)', 'Info.plist'))</TemlateAppManifest>
       <ProcessedInfoPlist>$([System.IO.Path]::Combine('$(IntermediateOutputPath)', 'templated', 'Info.plist'))</ProcessedInfoPlist>
       <VersionedInfoPlist>$([System.IO.Path]::Combine('$(IntermediateOutputPath)', 'versioned', 'Info.plist'))</VersionedInfoPlist>
     </PropertyGroup>
@@ -43,7 +41,7 @@
   </Target>
 
   <!-- Version Info.plist -->
-  <Target Name="AutomaticBuildVersioning"
+  <!-- <Target Name="AutomaticBuildVersioning"
           AfterTargets="HandleTokenizedInfoPlist;MobileBuildToolsInit"
           Condition="$(BuildToolsEnableAutomaticVersioning) == 'True'">
 
@@ -56,15 +54,12 @@
                                   TargetFrameworkIdentifier="$(TargetFrameworkIdentifier)"
                                   ManifestPath="$(ProcessedInfoPlist)"
                                   Condition=" $(BuildToolsEnableAutomaticVersioning) ">
-                                  <!-- OutputManifestPath="$(VersionedInfoPlist)" -->
-      <!-- <Output TaskParameter="VersionedManifest"
-              PropertyName="_AppManifest" /> -->
     </AutomaticBuildVersioningTask>
 
-  </Target>
+  </Target> -->
 
   <!-- Update Includes -->
-  <Target Name="SetProcessedAppManifest"
+  <!-- <Target Name="SetProcessedAppManifest"
         AfterTargets="AutomaticBuildVersioning;HandleTokenizedInfoPlist"
         BeforeTargets="_DetectAppManifest">
     <PropertyGroup>
@@ -75,7 +70,7 @@
       <None Update="Info.plist" LogicalName="RawInfo.plist" />
       <None Include="$(__OutputMBTInfoPlist)" LogicalName="Info.plist" Visible="false" />
     </ItemGroup>
-  </Target>
+  </Target> -->
 
   <!-- Update APS Environment -->
   <Target Name="SetApsEnvironmentToProduction"

diff --git a/src/Mobile.BuildTools/ManifestsShared.targets b/src/Mobile.BuildTools/ManifestsShared.targets
@@ -3,6 +3,8 @@
 
   <UsingTask TaskName="Mobile.BuildTools.Tasks.AutomaticBuildVersioningTask"
              AssemblyFile="$(_MobileBuildToolsParentBuildTasksDll)"/>
+  <UsingTask TaskName="Mobile.BuildTools.Tasks.TemplateManifestTask"
+             AssemblyFile="$(_MobileBuildToolsParentBuildTasksDll)"/>
 
   <Target Name="_TemplateManifestDebug"
           BeforeTargets="HandleTokenizedInfoPlist;HandleAndroidManifest"

diff --git a/src/Mobile.BuildTools/iOS.targets b/src/Mobile.BuildTools/iOS.targets
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Project>
 
+  <UsingTask TaskName="Mobile.BuildTools.Tasks.GoogleTask"
+             AssemblyFile="$(_MobileBuildToolsParentBuildTasksDll)"/>
+
   <Import Project="PlatformHead.targets" />
   <Import Project="AppleManifests.targets" />