Fix MSBuild formatting

extra indentation for xml attributes. Condition as first attribute.
dotnet · Jan 19, 2023 · 3e552a4 · 3e552a4
1 parent cd90909
commit 3e552a4
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -2661,11 +2661,11 @@ because xbuild doesn't support framework reference assemblies.
     <_DeployCommand>&quot;$(AdbToolPath)adb&quot; $(AdbTarget) install -r &quot;$(ApkFileSigned)&quot;</_DeployCommand>
   </PropertyGroup>
   <AndroidAdb
-    ToolExe="$(AdbToolExe)"
-    ToolPath="$(AdbToolPath)"
-    AdbTarget="$(AdbTarget)"
-    Command="install"
-    Arguments="-r &quot;$(ApkFileSigned)&quot;"
+      ToolExe="$(AdbToolExe)"
+      ToolPath="$(AdbToolPath)"
+      AdbTarget="$(AdbTarget)"
+      Command="install"
+      Arguments="-r &quot;$(ApkFileSigned)&quot;"
   />
 </Target>
 
@@ -2698,24 +2698,24 @@ because xbuild doesn't support framework reference assemblies.
     <_UninstallCommand>&quot;$(AdbToolPath)adb&quot; $(AdbTarget) uninstall -k &quot;$(_AndroidPackage)&quot;</_UninstallCommand>
   </PropertyGroup>
   <AndroidAdb
+      Condition=" '$(EmbedAssembliesIntoApk)' == 'true' "
       ContinueOnError="True"
       ToolExe="$(AdbToolExe)"
       ToolPath="$(AdbToolPath)"
       AdbTarget="$(AdbTarget)"
       Command="uninstall"
       Arguments="-k $(_AndroidPackage)"
-      Condition=" '$(EmbedAssembliesIntoApk)' == 'true' "
   >
     <Output TaskParameter="Result" PropertyName="_UninstallResult" />
   </AndroidAdb>
    <AndroidAdb
+      Condition=" '$(EmbedAssembliesIntoApk)' == 'true' And '$(_UninstallResult)' == 'false' "
       ContinueOnError="True"
       ToolExe="$(AdbToolExe)"
       ToolPath="$(AdbToolPath)"
       AdbTarget="$(AdbTarget)"
       Command="shell cmd package uninstall"
       Arguments="-k $(_AndroidPackage)"
-      Condition=" '$(EmbedAssembliesIntoApk)' == 'true' And '$(_UninstallResult)' == 'false' "
   />
   <InstallApkSet
       ToolPath="$(JavaToolPath)"
@@ -2736,11 +2736,11 @@ because xbuild doesn't support framework reference assemblies.
 
 <Target Name="_Uninstall">
   <AndroidAdb
-    ToolExe="$(AdbToolExe)"
-    ToolPath="$(AdbToolPath)"
-    AdbTarget="$(AdbTarget)"
-    Command="uninstall"
-    Arguments="$(_AndroidPackage)"
+      ToolExe="$(AdbToolExe)"
+      ToolPath="$(AdbToolPath)"
+      AdbTarget="$(AdbTarget)"
+      Command="uninstall"
+      Arguments="$(_AndroidPackage)"
   />
 </Target>