Merge branch 'dev'

winbench · Mar 29, 2019 · f408736 · f408736
2 parents 9eb4daa + ae76072
commit f408736
Show file tree

Hide file tree

Showing 24 changed files with 614 additions and 294 deletions.
diff --git a/BenchManager/BenchCLI/Commands/ListAppsCommand.cs b/BenchManager/BenchCLI/Commands/ListAppsCommand.cs
@@ -27,6 +27,7 @@ public enum AppSet
             Groups,
             MetaApps,
             ManagedPackages,
+            ManagedPackagesFromRemote,
         }
 
         private const string OPTION_SET = "set";
@@ -200,6 +201,7 @@ private bool IsIncludedInSet(AppFacade app, AppSet set)
                 case AppSet.Groups: return app.Typ == AppTyps.Group;
                 case AppSet.MetaApps: return app.Typ == AppTyps.Meta;
                 case AppSet.ManagedPackages: return app.IsManagedPackage;
+                case AppSet.ManagedPackagesFromRemote: return app.IsManagedPackageFromRemoteRepo;
                 default: throw new NotSupportedException();
             }
         }

diff --git a/BenchManager/BenchCLI/Properties/AssemblyInfo.cs b/BenchManager/BenchCLI/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.21.1.0")]
-[assembly: AssemblyFileVersion("0.21.1.0")]
+[assembly: AssemblyVersion("0.22.0.0")]
+[assembly: AssemblyFileVersion("0.22.0.0")]
diff --git a/BenchManager/BenchDashboard/AppList.cs b/BenchManager/BenchDashboard/AppList.cs
@@ -318,7 +318,7 @@ private void gridApps_RowContextMenuStripNeeded(object sender, DataGridViewRowCo
             miInstall.Visible = contextApp.CanInstall;
             miReinstall.Visible = contextApp.CanReinstall;
             miUpgrade.Visible = contextApp.CanUpgrade;
-            miPackageUpgrade.Visible = contextApp.IsInstalled && contextApp.IsManagedPackage;
+            miPackageUpgrade.Visible = contextApp.IsInstalled && contextApp.IsManagedPackageFromRemoteRepo;
             miUninstall.Visible = contextApp.CanUninstall;
 
             miDownloadResource.Visible = contextApp.CanDownloadResource;
@@ -327,7 +327,7 @@ private void gridApps_RowContextMenuStripNeeded(object sender, DataGridViewRowCo
             var g1 = contextApp.CanInstall
                   || contextApp.CanReinstall
                   || contextApp.CanUpgrade
-                  || contextApp.IsInstalled && contextApp.IsManagedPackage
+                  || contextApp.IsInstalled && contextApp.IsManagedPackageFromRemoteRepo
                   || contextApp.CanUninstall;
             var g2 = contextApp.CanDownloadResource
                   || contextApp.CanDeleteResource;

diff --git a/BenchManager/BenchDashboard/AppWrapper.cs b/BenchManager/BenchDashboard/AppWrapper.cs
@@ -68,6 +68,12 @@ public string Typ
                         return "Python 2";
                     case AppTyps.Python3Package:
                         return "Python 3";
+                    case AppTyps.PythonWheel:
+                        return "Python Wheel";
+                    case AppTyps.Python2Wheel:
+                        return "Python 2 Wheel";
+                    case AppTyps.Python3Wheel:
+                        return "Python 3 Wheel";
                     case AppTyps.NuGetPackage:
                         return "NuGet";
                     default:

diff --git a/BenchManager/BenchDashboard/Core.cs b/BenchManager/BenchDashboard/Core.cs
@@ -792,6 +792,14 @@ public Process LaunchApp(string id, params string[] args)
                      + e.FileName);
                 return null;
             }
+            catch (System.ComponentModel.Win32Exception e)
+            {
+                UI.ShowWarning("Launching App",
+                    "Failed to execute the apps main executable."
+                    + Environment.NewLine + Environment.NewLine
+                    + e.Message);
+                return null;
+            }
         }
 
         public void ShowAppInfo(string id)

diff --git a/BenchManager/BenchDashboard/Properties/AssemblyInfo.cs b/BenchManager/BenchDashboard/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.21.1.0")]
-[assembly: AssemblyFileVersion("0.21.1.0")]
+[assembly: AssemblyVersion("0.22.0.0")]
+[assembly: AssemblyFileVersion("0.22.0.0")]