Merge pull request #227 from xamarin/dev/jestedfa/uses-sdk

Only conditionally include <uses-sdk /> in the AndroidManifest.xml wh…

Author: jstedfast

src/Xamarin.Android.Tools.AndroidSdk/AndroidAppManifest.cs

@@ -1,4 +1,4 @@
-usingSystem;
+usingSystem;
 usingSystem.Linq;
 usingSystem.Xml;
 usingSystem.Collections.Generic;
@@ -45,7 +45,7 @@ public class AndroidAppManifest
 if(manifest.Element("uses-sdk")isXElementuses)
 usesSdk=uses;
 else
-manifest.Add(usesSdk=newXElement("uses-sdk"));
+usesSdk=newXElement("uses-sdk");
 }
 
 publicstaticstringCanonicalizePackageName(stringpackageNameOrAssemblyName)
@@ -71,7 +71,6 @@ public static AndroidAppManifest Create (string packageName, string appLabel, An
 returnnewAndroidAppManifest(versions,XDocument.Parse(
 @"<?xml version=""1.0"" encoding=""utf-8""?>
 <manifest xmlns:android=""http://schemas.android.com/apk/res/android"" android:versionCode=""1"" android:versionName=""1.0"">
- <uses-sdk />
  <application android:label="""">
  </application>
 </manifest>")){
@@ -102,6 +101,14 @@ public static AndroidAppManifest Load (XDocument doc, AndroidVersions versions)
 
 publicvoidWrite(XmlWriterwriter)
 {
+// Make sure that if the <uses-sdk /> XML element does not have any attributes (i.e. minSdkVersion
+// and targetSdkVersion), do NOT write it into the output. This is to avoid issues like
+// https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1874249/
+if(usesSdk.HasAttributes&&usesSdk.Parent==null)
+manifest.Add(usesSdk);
+elseif(!usesSdk.HasAttributes&&usesSdk.Parent!=null)
+usesSdk.Remove();
+
 doc.Save(writer);
 }
 

tests/Xamarin.Android.Tools.AndroidSdk-Tests/AndroidAppManifestTests.cs

@@ -1,4 +1,4 @@
-usingSystem;
+usingSystem;
 usingSystem.Collections.Generic;
 usingSystem.Diagnostics;
 usingSystem.IO;
@@ -172,5 +172,45 @@ public void CanGetAppTheme ()
 
 Assert.AreEqual("@android:style/Theme.Material.Light",manifest.ApplicationTheme);
 }
+
+[Test]
+publicvoidCanAddAndRemoveUsesSdk()
+{
+XNamespaceaNS="http://schemas.android.com/apk/res/android";
+varversions=newAndroidVersions(newAndroidVersion[0]);
+vardoc=XDocument.Parse(@"
+ <manifest xmlns:android=""http://schemas.android.com/apk/res/android"" android:versionCode=""1"" android:versionName=""1.0"" package=""com.xamarin.Foo"">
+ <uses-sdk android:minSdkVersion=""8"" android:targetSdkVersion=""12"" />
+ <application android:label=""Foo"" android:icon=""@drawable/ic_icon"" android:theme=""@android:style/Theme.Material.Light"">
+ </application>
+ </manifest>");
+varmanifest=AndroidAppManifest.Load(doc,versions);
+
+manifest.MinSdkVersion=null;
+manifest.TargetSdkVersion=null;
+
+varsb=newStringBuilder();
+using(varwriter=XmlWriter.Create(sb)){
+manifest.Write(writer);
+}
+
+varnewDoc=XDocument.Parse(sb.ToString());
+varusesSdk=newDoc.Element("manifest").Element("uses-sdk");
+Assert.IsNull(usesSdk,"uses-sdk should not exist");
+
+manifest.MinSdkVersion=8;
+manifest.TargetSdkVersion=12;
+
+sb=newStringBuilder();
+using(varwriter=XmlWriter.Create(sb)){
+manifest.Write(writer);
+}
+
+newDoc=XDocument.Parse(sb.ToString());
+usesSdk=newDoc.Element("manifest").Element("uses-sdk");
+Assert.IsNotNull(usesSdk,"uses-sdk should exist");
+Assert.AreEqual("8",usesSdk.Attribute(aNS+"minSdkVersion").Value);
+Assert.AreEqual("12",usesSdk.Attribute(aNS+"targetSdkVersion").Value);
+}
 }
 }