diff --git a/MediaBrowser.Installer/Code/ModelExtensions.cs b/MediaBrowser.Installer/Code/ModelExtensions.cs
index 5a3051164c..66e51ec117 100644
--- a/MediaBrowser.Installer/Code/ModelExtensions.cs
+++ b/MediaBrowser.Installer/Code/ModelExtensions.cs
@@ -1,4 +1,6 @@
+using System.Collections.Generic;
+
namespace MediaBrowser.Installer.Code
{
///
@@ -16,5 +18,26 @@ namespace MediaBrowser.Installer.Code
{
return string.IsNullOrEmpty(str) ? def : str;
}
+
+ ///
+ /// Helper method for Dictionaries since they throw on not-found keys
+ ///
+ ///
+ ///
+ /// The dictionary.
+ /// The key.
+ /// The default value.
+ /// ``1.
+ public static U GetValueOrDefault(this Dictionary dictionary, T key, U defaultValue)
+ {
+ U val;
+ if (!dictionary.TryGetValue(key, out val))
+ {
+ val = defaultValue;
+ }
+ return val;
+
+ }
+
}
}
diff --git a/MediaBrowser.Installer/MainWindow.xaml.cs b/MediaBrowser.Installer/MainWindow.xaml.cs
index 8924ddb5d3..efa2c71774 100644
--- a/MediaBrowser.Installer/MainWindow.xaml.cs
+++ b/MediaBrowser.Installer/MainWindow.xaml.cs
@@ -5,7 +5,6 @@ using System.IO;
using System.Net;
using System.Threading.Tasks;
using System.Windows;
-using System.Web;
using System.Linq;
using Ionic.Zip;
using MediaBrowser.Installer.Code;
@@ -65,20 +64,29 @@ namespace MediaBrowser.Installer
protected void GetArgs()
{
- var args = AppDomain.CurrentDomain.SetupInformation.ActivationArguments;
+ var args = Environment.GetCommandLineArgs();
- if (args == null || args.ActivationData == null || args.ActivationData.Length <= 0) return;
- var url = new Uri(args.ActivationData[0], UriKind.Absolute);
- var parameters = HttpUtility.ParseQueryString(url.Query);
+ var parameters = new Dictionary(StringComparer.OrdinalIgnoreCase);
+ foreach (var arg in args)
+ {
+ var nameValue = arg.Split('=');
+ try
+ {
+ parameters[nameValue[0]] = nameValue[1];
+ }
+ catch // let it default below
+ {
+ }
+ }
// fill in our arguments if there
- PackageName = parameters["package"] ?? "MBServer";
- PackageClass = (PackageVersionClass)Enum.Parse(typeof(PackageVersionClass), parameters["class"] ?? "Release");
- PackageVersion = new Version(parameters["version"].ValueOrDefault("10.0.0.0"));
- RootSuffix = parameters["suffix"] ?? "-Server";
- TargetExe = parameters["target"] ?? "MediaBrowser.ServerApplication.exe";
- FriendlyName = parameters["name"] ?? PackageName;
+ PackageName = parameters.GetValueOrDefault("package","MBServer");
+ PackageClass = (PackageVersionClass)Enum.Parse(typeof(PackageVersionClass), parameters.GetValueOrDefault("class","Release"));
+ PackageVersion = new Version(parameters.GetValueOrDefault("version","10.0.0.0"));
+ RootSuffix = parameters.GetValueOrDefault("suffix", "-Server");
+ TargetExe = parameters.GetValueOrDefault("target", "MediaBrowser.ServerApplication.exe");
+ FriendlyName = parameters.GetValueOrDefault("name", PackageName);
RootPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "MediaBrowser" + RootSuffix);
}
@@ -210,7 +218,8 @@ namespace MediaBrowser.Installer
product.Save();
var uninstall = (IWshShortcut)shell.CreateShortcut(Path.Combine(startMenu, "Uninstall " + FriendlyName + ".lnk"));
- uninstall.TargetPath = Path.Combine(Path.GetDirectoryName(targetExe),"MediaBrowser.Uninstall.exe "+(PackageName == "MBServer" ? "server" : "mbt"));
+ uninstall.TargetPath = Path.Combine(Path.GetDirectoryName(targetExe),"MediaBrowser.Uninstaller.exe");
+ uninstall.Arguments = (PackageName == "MBServer" ? "server" : "mbt");
uninstall.Description = "Uninstall " + FriendlyName;
uninstall.Save();
@@ -238,5 +247,6 @@ namespace MediaBrowser.Installer
Directory.Delete(location, true);
}
}
+
}
}
diff --git a/MediaBrowser.Installer/MediaBrowser.Installer.csproj b/MediaBrowser.Installer/MediaBrowser.Installer.csproj
index 036340be7e..ff6537b21f 100644
--- a/MediaBrowser.Installer/MediaBrowser.Installer.csproj
+++ b/MediaBrowser.Installer/MediaBrowser.Installer.csproj
@@ -29,7 +29,7 @@
Media Browser Team
Media Browser
true
- 8
+ 10
0.1.1.%2a
false
true
@@ -61,11 +61,17 @@
MediaBrowser.Installer_1_TemporaryKey.pfx
- true
+ false
true
+
+ LocalIntranet
+
+
+ Properties\app.manifest
+
..\packages\DotNetZip.1.9.1.8\lib\net20\Ionic.Zip.dll
@@ -140,6 +146,7 @@
Resources.Designer.cs
+
SettingsSingleFileGenerator
Settings.Designer.cs
diff --git a/MediaBrowser.Installer/Properties/app.manifest b/MediaBrowser.Installer/Properties/app.manifest
new file mode 100644
index 0000000000..f499e6ab6d
--- /dev/null
+++ b/MediaBrowser.Installer/Properties/app.manifest
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index c843242c32..3ed16f825d 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -386,6 +386,7 @@ if $(ConfigurationName) == Release (
mkdir "$(SolutionDir)..\Deploy\Server\System"
xcopy "$(TargetDir)$(TargetFileName)" "$(SolutionDir)..\Deploy\Server\System\" /y
xcopy "$(SolutionDir)Mediabrowser.Uninstaller\bin\Release\MediaBrowser.Uninstaller.exe" "$(SolutionDir)..\Deploy\Server\System\" /y
+xcopy "$(SolutionDir)Mediabrowser.Uninstaller.Execute\bin\Release\MediaBrowser.Uninstaller.Execute.exe" "$(SolutionDir)..\Deploy\Server\System\" /y
xcopy "$(TargetDir)$(TargetFileName).config" "$(SolutionDir)..\Deploy\Server\System\" /y
diff --git a/MediaBrowser.Uninstaller.Execute/App.config b/MediaBrowser.Uninstaller.Execute/App.config
new file mode 100644
index 0000000000..8e15646352
--- /dev/null
+++ b/MediaBrowser.Uninstaller.Execute/App.config
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MediaBrowser.Uninstaller.Execute/App.xaml b/MediaBrowser.Uninstaller.Execute/App.xaml
new file mode 100644
index 0000000000..8d0735d423
--- /dev/null
+++ b/MediaBrowser.Uninstaller.Execute/App.xaml
@@ -0,0 +1,8 @@
+
+
+
+
+
diff --git a/MediaBrowser.Uninstaller.Execute/App.xaml.cs b/MediaBrowser.Uninstaller.Execute/App.xaml.cs
new file mode 100644
index 0000000000..b38e27e1a9
--- /dev/null
+++ b/MediaBrowser.Uninstaller.Execute/App.xaml.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace MediaBrowser.Uninstaller
+{
+ ///
+ /// Interaction logic for App.xaml
+ ///
+ public partial class App : Application
+ {
+ }
+}
diff --git a/MediaBrowser.Uninstaller.Execute/MainWindow.xaml b/MediaBrowser.Uninstaller.Execute/MainWindow.xaml
new file mode 100644
index 0000000000..d2a093ec42
--- /dev/null
+++ b/MediaBrowser.Uninstaller.Execute/MainWindow.xaml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/MediaBrowser.Uninstaller.Execute/MainWindow.xaml.cs b/MediaBrowser.Uninstaller.Execute/MainWindow.xaml.cs
new file mode 100644
index 0000000000..0d66ee94ec
--- /dev/null
+++ b/MediaBrowser.Uninstaller.Execute/MainWindow.xaml.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Diagnostics;
+using System.Reflection;
+using System.IO;
+using System.Threading;
+using System.Windows;
+
+namespace MediaBrowser.Uninstaller.Execute
+{
+ ///
+ /// Interaction logic for MainWindow.xaml
+ ///
+ public partial class MainWindow : Window
+ {
+ protected string Product = "Server";
+
+ public MainWindow()
+ {
+ Thread.Sleep(800); // be sure our caller is shut down
+
+ var args = Environment.GetCommandLineArgs();
+ var product = args.Length > 1 ? args[1] : "server";
+ InitializeComponent();
+
+
+ switch (product)
+ {
+ case "server":
+ Product = "Server";
+ break;
+
+ case "mbt":
+ Product = "Theater";
+ break;
+
+ default:
+ Console.WriteLine("Please specify which application to un-install (server or mbt)");
+ Close();
+ break;
+
+ }
+
+ lblHeading.Content = this.Title = "Uninstall Media Browser " + Product;
+
+ }
+
+ private void btnCancel_Click(object sender, RoutedEventArgs e)
+ {
+ Close();
+ }
+
+ private void cbxRemoveAll_Checked(object sender, RoutedEventArgs e)
+ {
+ if (cbxRemoveAll.IsChecked == true)
+ {
+ cbxRemoveCache.IsChecked = cbxRemoveConfig.IsChecked = cbxRemovePlugins.IsChecked = true;
+ }
+
+ cbxRemoveCache.IsEnabled = cbxRemoveConfig.IsEnabled = cbxRemovePlugins.IsEnabled = !cbxRemoveAll.IsChecked.Value;
+ }
+
+ private void btnUninstall_Click(object sender, RoutedEventArgs e)
+ {
+ // First remove our shortcuts
+ var startMenu = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.StartMenu), "Media Browser");
+ var linkName = "Media Browser " + Product + ".lnk";
+ try
+ {
+ File.Delete(Path.Combine(startMenu,linkName));
+ }
+ catch {} // oh well
+
+ linkName = "Uninstall " + linkName;
+ try
+ {
+ File.Delete(Path.Combine(startMenu,linkName));
+ }
+ catch {} // oh well
+
+ }
+ }
+}
diff --git a/MediaBrowser.Uninstaller.Execute/MediaBrowser.Uninstaller.Execute.csproj b/MediaBrowser.Uninstaller.Execute/MediaBrowser.Uninstaller.Execute.csproj
new file mode 100644
index 0000000000..1e64363a0f
--- /dev/null
+++ b/MediaBrowser.Uninstaller.Execute/MediaBrowser.Uninstaller.Execute.csproj
@@ -0,0 +1,110 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {FACAF749-3E28-46DD-B613-654FCD434959}
+ WinExe
+ Properties
+ MediaBrowser.Uninstaller.Execute
+ MediaBrowser.Uninstaller.Execute
+ v4.5
+ 512
+ {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ 4
+
+
+ AnyCPU
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ AnyCPU
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+
+
+
+
+
+
+
+ 4.0
+
+
+
+
+
+
+
+ MSBuild:Compile
+ Designer
+
+
+ MSBuild:Compile
+ Designer
+
+
+ App.xaml
+ Code
+
+
+ MainWindow.xaml
+ Code
+
+
+
+
+ Code
+
+
+ True
+ True
+ Resources.resx
+
+
+ True
+ Settings.settings
+ True
+
+
+ ResXFileCodeGenerator
+ Resources.Designer.cs
+
+
+ SettingsSingleFileGenerator
+ Settings.Designer.cs
+
+
+
+
+
+
+
+
+
+ Code\Images\mb3logo800.png
+
+
+
+
+
\ No newline at end of file
diff --git a/MediaBrowser.Uninstaller.Execute/Properties/AssemblyInfo.cs b/MediaBrowser.Uninstaller.Execute/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..02bd2c2440
--- /dev/null
+++ b/MediaBrowser.Uninstaller.Execute/Properties/AssemblyInfo.cs
@@ -0,0 +1,55 @@
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("MediaBrowser.Uninstaller")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Toshiba")]
+[assembly: AssemblyProduct("MediaBrowser.Uninstaller")]
+[assembly: AssemblyCopyright("Copyright © Toshiba 2013")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+//In order to begin building localizable applications, set
+//CultureYouAreCodingWith in your .csproj file
+//inside a . For example, if you are using US english
+//in your source files, set the to en-US. Then uncomment
+//the NeutralResourceLanguage attribute below. Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+ ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+ //(used if a resource is not found in the page,
+ // or application resource dictionaries)
+ ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+ //(used if a resource is not found in the page,
+ // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// 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("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/MediaBrowser.Uninstaller.Execute/Properties/Resources.Designer.cs b/MediaBrowser.Uninstaller.Execute/Properties/Resources.Designer.cs
new file mode 100644
index 0000000000..b58157fd4a
--- /dev/null
+++ b/MediaBrowser.Uninstaller.Execute/Properties/Resources.Designer.cs
@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.17929
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace MediaBrowser.Uninstaller.Execute.Properties {
+ using System;
+
+
+ ///
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ ///
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class Resources {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources() {
+ }
+
+ ///
+ /// Returns the cached ResourceManager instance used by this class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MediaBrowser.Uninstaller.Execute.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ ///
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+ }
+}
diff --git a/MediaBrowser.Uninstaller.Execute/Properties/Resources.resx b/MediaBrowser.Uninstaller.Execute/Properties/Resources.resx
new file mode 100644
index 0000000000..af7dbebbac
--- /dev/null
+++ b/MediaBrowser.Uninstaller.Execute/Properties/Resources.resx
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/MediaBrowser.Uninstaller.Execute/Properties/Settings.Designer.cs b/MediaBrowser.Uninstaller.Execute/Properties/Settings.Designer.cs
new file mode 100644
index 0000000000..42faac3c30
--- /dev/null
+++ b/MediaBrowser.Uninstaller.Execute/Properties/Settings.Designer.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.17929
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace MediaBrowser.Uninstaller.Execute.Properties {
+
+
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+ internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+
+ private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+ public static Settings Default {
+ get {
+ return defaultInstance;
+ }
+ }
+ }
+}
diff --git a/MediaBrowser.Uninstaller.Execute/Properties/Settings.settings b/MediaBrowser.Uninstaller.Execute/Properties/Settings.settings
new file mode 100644
index 0000000000..033d7a5e9e
--- /dev/null
+++ b/MediaBrowser.Uninstaller.Execute/Properties/Settings.settings
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MediaBrowser.Uninstaller/MainWindow.xaml b/MediaBrowser.Uninstaller/MainWindow.xaml
index 54d8f961aa..645996503a 100644
--- a/MediaBrowser.Uninstaller/MainWindow.xaml
+++ b/MediaBrowser.Uninstaller/MainWindow.xaml
@@ -1,16 +1,8 @@
+ Title="MainWindow" Height="350" Width="525">
-
-
-
-
-
-
-
-
-
+
diff --git a/MediaBrowser.Uninstaller/MainWindow.xaml.cs b/MediaBrowser.Uninstaller/MainWindow.xaml.cs
index afe9f0e67b..3e95820cd4 100644
--- a/MediaBrowser.Uninstaller/MainWindow.xaml.cs
+++ b/MediaBrowser.Uninstaller/MainWindow.xaml.cs
@@ -1,8 +1,11 @@
using System;
using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Diagnostics;
using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
@@ -12,6 +15,8 @@ using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
+using System.Windows.Shapes;
+using Path = System.IO.Path;
namespace MediaBrowser.Uninstaller
{
@@ -20,68 +25,26 @@ namespace MediaBrowser.Uninstaller
///
public partial class MainWindow : Window
{
- protected string Product = "Server";
-
public MainWindow()
{
- InitializeComponent();
+ //All our work is behind the scenes
var args = Environment.GetCommandLineArgs();
var product = args.Length > 1 ? args[1] : "server";
-
- switch (product)
+ //copy the real program to a temp location so we can delete everything here (including us)
+ var tempExe = Path.Combine(Path.GetTempPath(), "MBUninstall.exe");
+ using (var file = File.Create(tempExe, 4096, FileOptions.DeleteOnClose))
{
- case "server":
- Product = "Server";
- break;
-
- case "mbt":
- Product = "Theater";
- break;
-
- default:
- Console.WriteLine("Please specify which application to un-install (server or mbt)");
- Close();
- break;
-
+ //copy the real uninstaller to temp location
+ File.WriteAllBytes(tempExe, File.ReadAllBytes(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().GetName().CodeBase) ?? "","MediaBrowser.Uninstaller.Execute.exe")));
+ //kick off the copy
+ Process.Start(tempExe, product);
+ //wait for it to start up
+ Thread.Sleep(500);
+ //and shut down
+ Close();
}
-
- lblHeading.Content = this.Title = "Uninstall Media Browser " + Product;
-
- }
-
- private void btnCancel_Click(object sender, RoutedEventArgs e)
- {
- Close();
- }
-
- private void cbxRemoveAll_Checked(object sender, RoutedEventArgs e)
- {
- if (cbxRemoveAll.IsChecked == true)
- {
- cbxRemoveCache.IsChecked = cbxRemoveConfig.IsChecked = cbxRemovePlugins.IsChecked = true;
- }
-
- cbxRemoveCache.IsEnabled = cbxRemoveConfig.IsEnabled = cbxRemovePlugins.IsEnabled = !cbxRemoveAll.IsChecked.Value;
- }
-
- private void btnUninstall_Click(object sender, RoutedEventArgs e)
- {
- // First remove our shortcuts
- var startMenu = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.StartMenu), "Media Browser");
- var linkName = "Media Browser " + Product + ".lnk";
- try
- {
- File.Delete(Path.Combine(startMenu,linkName));
- }
- catch {} // oh well
-
- linkName = "Uninstall " + linkName;
- try
- {
- File.Delete(Path.Combine(startMenu,linkName));
- }
- catch {} // oh well
-
+
+ //InitializeComponent();
}
}
}
diff --git a/MediaBrowser.Uninstaller/MediaBrowser.Uninstaller.csproj b/MediaBrowser.Uninstaller/MediaBrowser.Uninstaller.csproj
index a9db3ee9b0..c9c3e537cd 100644
--- a/MediaBrowser.Uninstaller/MediaBrowser.Uninstaller.csproj
+++ b/MediaBrowser.Uninstaller/MediaBrowser.Uninstaller.csproj
@@ -4,7 +4,7 @@
Debug
AnyCPU
- {FACAF749-3E28-46DD-B613-654FCD434959}
+ {21EC6FB8-F444-4B60-8BA5-9CA443901A0D}
WinExe
Properties
MediaBrowser.Uninstaller
@@ -93,12 +93,6 @@
-
-
-
- Code\Images\mb3logo800.png
-
-