2gis · bayandin · Oct 31, 2016 · Oct 31, 2016 · Nov 1, 2016 · Nov 4, 2016
diff --git a/Winium/Microsoft.Phone.Tools.Deploy.Patched/Microsoft.Phone.Tools.Deploy.Patched.csproj b/Winium/Microsoft.Phone.Tools.Deploy.Patched/Microsoft.Phone.Tools.Deploy.Patched.csproj
@@ -20,6 +20,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>5</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>

diff --git a/Winium/Winium.Mobile.Common/Winium.Mobile.Common.csproj b/Winium/Winium.Mobile.Common/Winium.Mobile.Common.csproj
@@ -26,6 +26,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>5</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

diff --git a/Winium/Winium.Mobile.Connectivity/AppType.cs b/Winium/Winium.Mobile.Connectivity/AppType.cs
@@ -0,0 +1,9 @@
+namespace Winium.Mobile.Connectivity
+{
+    public enum AppType
+    {
+        XAP = Microsoft.Phone.Tools.Deploy.TypeOfApp.XAP,
+        APPX = Microsoft.Phone.Tools.Deploy.TypeOfApp.APPX,
+        APPXBUNDLE = Microsoft.Phone.Tools.Deploy.TypeOfApp.APPXBUNDLE
+    }
+}
diff --git a/Winium/Winium.Mobile.Connectivity/Deployer.cs b/Winium/Winium.Mobile.Connectivity/Deployer.cs
@@ -52,8 +52,8 @@ public Deployer(string desiredDevice, bool strict)
             {
                 throw new AutomationException(
                     string.Format(
-                        "Could not find a device to launch. You requested '{0}', but the available devices were:\n{1}", 
-                        desiredDevice, 
+                        "Could not find a device to launch. You requested '{0}', but the available devices were:\n{1}",
+                        desiredDevice,
                         Devices.Instance));
             }
 
@@ -77,6 +77,8 @@ public string DeviceName
             }
         }
 
+        public AppType AppType { get; private set; }
+
         #endregion
 
         #region Properties
@@ -99,6 +101,7 @@ public void UsePreInstalledApplication(string appPath)
         {
             var appManifest = Utils.ReadAppManifestInfoFromPackage(appPath);
             this.RemoteApplication = this.Device.GetApplication(appManifest.ProductId);
+            this.AppType = DetermineAppType(appPath);
         }
 
         public void Launch()
@@ -134,9 +137,18 @@ public void SendFiles(List<KeyValuePair<string, string>> files)
             }
         }
 
-        public void Terminate()
+        public bool Terminate()
         {
-            throw new NotImplementedException("Deployer.Terminate");
+            if (this.AppType == AppType.XAP)
+            {
+                this.RemoteApplication.TerminateRunningInstances();
+                return true;
+            }
+            else
+            {
+                Logger.Debug("Could not terminate application from outside.");
+                return false;
+            }
         }
 
         public void Uninstall()
@@ -152,16 +164,35 @@ public void Uninstall()
 
             this.Device.Disconnect();
         }
-
         #endregion
 
         #region Methods
 
+        private static AppType DetermineAppType(string packagePath)
+        {
+            var extension = Path.GetExtension(packagePath);
+            if (!string.IsNullOrEmpty(extension))
+            {
+                switch (extension.ToLower(CultureInfo.InvariantCulture))
+                {
+                    case ".appxbundle":
+                        return AppType.APPXBUNDLE;
+                    case ".appx":
+                        return AppType.APPX;
+                    case ".xap":
+                        return AppType.XAP;
+                }
+            }
+
+            throw new NotImplementedException("This file extension is not supported by the tool.");
+        }
+
         private void InstallApp(string appPath)
         {
             var appManifestInfo = this.InstallApplicationPackage(appPath);
             this.installed = true;
             this.RemoteApplication = this.Device.GetApplication(appManifestInfo.ProductId);
+            this.AppType = DetermineAppType(appPath);
         }
 
         private IAppManifestInfo InstallApplicationPackage(string path)

diff --git a/Winium/Winium.Mobile.Connectivity/IDeployer.cs b/Winium/Winium.Mobile.Connectivity/IDeployer.cs
@@ -12,6 +12,8 @@ public interface IDeployer
 
         string DeviceName { get; }
 
+        AppType AppType { get; }
+
         #endregion
 
         #region Public Methods and Operators
@@ -28,7 +30,7 @@ public interface IDeployer
 
         void SendFile(string isoStoreRoot, string sourceDesktopFilePath, string targetDeviceFilePath);
 
-        void Terminate();
+        bool Terminate();
 
         void Uninstall();
 

diff --git a/Winium/Winium.Mobile.Connectivity/Winium.Mobile.Connectivity.csproj b/Winium/Winium.Mobile.Connectivity/Winium.Mobile.Connectivity.csproj
@@ -20,6 +20,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>5</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -66,6 +67,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Emulator\VirtualMachineException.cs" />
     <Compile Include="Retry.cs" />
+    <Compile Include="AppType.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Phone.Tools.Deploy.Patched\Microsoft.Phone.Tools.Deploy.Patched.csproj">

diff --git a/Winium/Winium.Mobile.Driver/CommandExecutors/CloseAppExecutor.cs b/Winium/Winium.Mobile.Driver/CommandExecutors/CloseAppExecutor.cs
@@ -1,5 +1,6 @@
 namespace Winium.Mobile.Driver.CommandExecutors
 {
+    using Connectivity;
     using System;
     using System.Threading;
 
@@ -12,9 +13,13 @@ internal class CloseAppExecutor : CommandExecutorBase
 
         public static void CloseApp(Automator automator)
         {
-            var remoteCommand = new Command(DriverCommand.CloseApp);
-            automator.CommandForwarder.ForwardCommand(remoteCommand);
-            Thread.Sleep(TimeSpan.FromMilliseconds(500));
+            var terminated = automator.Deployer.Terminate();
+            if (!terminated)
+            {
+                var remoteCommand = new Command(DriverCommand.CloseApp);
+                automator.CommandForwarder.ForwardCommand(remoteCommand);
+                Thread.Sleep(TimeSpan.FromMilliseconds(500));
+            }
         }
 
         #endregion

diff --git a/Winium/Winium.Mobile.Driver/Winium.Mobile.Driver.csproj b/Winium/Winium.Mobile.Driver/Winium.Mobile.Driver.csproj
@@ -25,6 +25,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
+    <LangVersion>5</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>

diff --git a/Winium/Winium.Mobile.Logging/Winium.Mobile.Logging.csproj b/Winium/Winium.Mobile.Logging/Winium.Mobile.Logging.csproj
@@ -22,6 +22,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>5</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

diff --git a/Winium/Winium.Silverlight.InnerServer/Winium.Silverlight.InnerServer.csproj b/Winium/Winium.Silverlight.InnerServer/Winium.Silverlight.InnerServer.csproj
@@ -34,6 +34,7 @@
     <NoConfig>true</NoConfig>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>5</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

diff --git a/Winium/Winium.StoreApps.InnerServer/Winium.StoreApps.InnerServer.csproj b/Winium/Winium.StoreApps.InnerServer/Winium.StoreApps.InnerServer.csproj
@@ -26,6 +26,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>5</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

diff --git a/Winium/Winium.StoreApps.Inspector/Winium.StoreApps.Inspector.csproj b/Winium/Winium.StoreApps.Inspector/Winium.StoreApps.Inspector.csproj
@@ -42,6 +42,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>5</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>