Merge pull request #7533 from xamarin/olegoid/vsts-1029041

[vsts-1029041] Add FileType to the list of parameters for altool

msbuild/Xamarin.Mac.Tasks.Core/Tasks/ALToolUploadTaskBase.cs

@@ -1,13 +1,9 @@
 using System.Text;
 
-using Xamarin.MacDev;
-
 namespace Xamarin.Mac.Tasks
 {
-	public class ALToolUploadTaskBase : Xamarin.MacDev.Tasks.ALToolTaskBase
+	public class ALToolUploadTaskBase : MacDev.Tasks.ALToolTaskBase
 	{
-		public override PlatformName FileType => PlatformName.MacOSX;
-
 		protected override string GenerateCommandLineCommands ()
 		{
 			var sb = new StringBuilder ();

msbuild/Xamarin.Mac.Tasks.Core/Tasks/ALToolValidateTaskBase.cs

@@ -1,13 +1,9 @@
 using System.Text;
 
-using Xamarin.MacDev;
-
 namespace Xamarin.Mac.Tasks
 {
 	public class ALToolValidateTaskBase : MacDev.Tasks.ALToolTaskBase
 	{
-		public override PlatformName FileType => PlatformName.MacOSX;
-
 		protected override string GenerateCommandLineCommands ()
 		{
 			var sb = new StringBuilder ();

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/AlToolTaskBase.cs

@@ -23,8 +23,12 @@ namespace Xamarin.MacDev.Tasks
 		[Required]
 		public string FilePath { get; set; }
 
+		protected PlatformFramework FileType {
+			get { return PlatformFrameworkHelper.GetFramework (TargetFrameworkIdentifier); }
+		}
+
 		[Required]
-		public virtual PlatformName FileType { get ; set; }
+		public string TargetFrameworkIdentifier { get; set; }
 
 		protected override string ToolName {
 			get { return "altool"; }
@@ -89,10 +93,10 @@ namespace Xamarin.MacDev.Tasks
 
 		string GetFileTypeValue ()
 		{
-			switch(FileType) {
-				case PlatformName.MacOSX: return "osx";
-				case PlatformName.TvOS: return "appletvos";
-				case PlatformName.iOS: return "ios";
+			switch (FileType) {
+				case PlatformFramework.MacOS: return "osx";
+				case PlatformFramework.TVOS: return "appletvos";
+				case PlatformFramework.iOS: return "ios";
 				default: throw new NotSupportedException ($"Provided file type '{FileType}' is not supported by altool");
 			}
 		}

msbuild/Xamarin.iOS.Tasks.Core/Tasks/ALToolUploadTaskBase.cs

@@ -1,13 +1,9 @@
 using System.Text;
 
-using Xamarin.MacDev;
-
 namespace Xamarin.iOS.Tasks
 {
 	public class ALToolUploadTaskBase : MacDev.Tasks.ALToolTaskBase
 	{
-		public override PlatformName FileType => PlatformName.iOS;
-
 		protected override string GenerateCommandLineCommands ()
 		{
 			var sb = new StringBuilder ();

msbuild/Xamarin.iOS.Tasks.Core/Tasks/ALToolValidateTaskBase.cs

@@ -1,13 +1,9 @@
 using System.Text;
 
-using Xamarin.MacDev;
-
 namespace Xamarin.iOS.Tasks
 {
 	public class ALToolValidateTaskBase : MacDev.Tasks.ALToolTaskBase
 	{
-		public override PlatformName FileType => PlatformName.iOS;
-
 		protected override string GenerateCommandLineCommands ()
 		{
 			var sb = new StringBuilder ();

msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets

@@ -422,6 +422,7 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
 			Username="$(Username)"
 			Password="$(Password)"
 			FilePath="$(FilePath)"
+			TargetFrameworkIdentifier="$(TargetFrameworkIdentifier)"
 			SdkDevPath="$(_SdkDevPath)"
 		/>
 	</Target>
@@ -432,6 +433,7 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
 			Username="$(Username)"
 			Password="$(Password)"
 			FilePath="$(FilePath)"
+			TargetFrameworkIdentifier="$(TargetFrameworkIdentifier)"
 			SdkDevPath="$(_SdkDevPath)"
 		/>
 	</Target>