From 934e5c3aa6805069580ab4eb36e263bdfcd25e88 Mon Sep 17 00:00:00 2001 From: Eric Reed Date: Sat, 23 Feb 2013 13:43:32 -0500 Subject: [PATCH 1/2] Chg name of installer --- MediaBrowser.Installer/MediaBrowser.Installer.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MediaBrowser.Installer/MediaBrowser.Installer.csproj b/MediaBrowser.Installer/MediaBrowser.Installer.csproj index b46075df19..3662c71c3b 100644 --- a/MediaBrowser.Installer/MediaBrowser.Installer.csproj +++ b/MediaBrowser.Installer/MediaBrowser.Installer.csproj @@ -25,11 +25,11 @@ false true http://community.mediabrowser.tv - Media Browser Server Installer + Media Browser Installer Media Browser Team Media Browser true - 4 + 5 0.1.1.%2a false true From b3664edf506d1887f1d0c14db745f644537628e7 Mon Sep 17 00:00:00 2001 From: Eric Reed Date: Sat, 23 Feb 2013 17:16:19 -0500 Subject: [PATCH 2/2] Installer updates and partial uninstaller --- MediaBrowser.Installer/MainWindow.xaml.cs | 15 ++- .../MediaBrowser.Installer.csproj | 2 +- .../MediaBrowser.ServerApplication.csproj | 6 + MediaBrowser.Uninstaller/App.config | 6 + MediaBrowser.Uninstaller/App.xaml | 8 ++ MediaBrowser.Uninstaller/App.xaml.cs | 17 +++ MediaBrowser.Uninstaller/MainWindow.xaml | 16 +++ MediaBrowser.Uninstaller/MainWindow.xaml.cs | 87 +++++++++++++ .../MediaBrowser.Uninstaller.csproj | 110 ++++++++++++++++ .../Properties/AssemblyInfo.cs | 55 ++++++++ .../Properties/Resources.Designer.cs | 71 +++++++++++ .../Properties/Resources.resx | 117 ++++++++++++++++++ .../Properties/Settings.Designer.cs | 30 +++++ .../Properties/Settings.settings | 7 ++ MediaBrowser.sln | 16 +++ 15 files changed, 557 insertions(+), 6 deletions(-) create mode 100644 MediaBrowser.Uninstaller/App.config create mode 100644 MediaBrowser.Uninstaller/App.xaml create mode 100644 MediaBrowser.Uninstaller/App.xaml.cs create mode 100644 MediaBrowser.Uninstaller/MainWindow.xaml create mode 100644 MediaBrowser.Uninstaller/MainWindow.xaml.cs create mode 100644 MediaBrowser.Uninstaller/MediaBrowser.Uninstaller.csproj create mode 100644 MediaBrowser.Uninstaller/Properties/AssemblyInfo.cs create mode 100644 MediaBrowser.Uninstaller/Properties/Resources.Designer.cs create mode 100644 MediaBrowser.Uninstaller/Properties/Resources.resx create mode 100644 MediaBrowser.Uninstaller/Properties/Settings.Designer.cs create mode 100644 MediaBrowser.Uninstaller/Properties/Settings.settings diff --git a/MediaBrowser.Installer/MainWindow.xaml.cs b/MediaBrowser.Installer/MainWindow.xaml.cs index 5a96c1afbc..8924ddb5d3 100644 --- a/MediaBrowser.Installer/MainWindow.xaml.cs +++ b/MediaBrowser.Installer/MainWindow.xaml.cs @@ -204,11 +204,16 @@ namespace MediaBrowser.Installer var shell = new WshShell(); var startMenu = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.StartMenu),"Media Browser"); if (!Directory.Exists(startMenu)) Directory.CreateDirectory(startMenu); - var myShortcut = (IWshShortcut)shell.CreateShortcut(Path.Combine(startMenu, "Media Browser Server.lnk")); - myShortcut.TargetPath = targetExe; - myShortcut.Description = "Run " + FriendlyName; - myShortcut.Save(); - + var product = (IWshShortcut)shell.CreateShortcut(Path.Combine(startMenu, FriendlyName+".lnk")); + product.TargetPath = targetExe; + product.Description = "Run " + FriendlyName; + 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.Description = "Uninstall " + FriendlyName; + uninstall.Save(); + } /// diff --git a/MediaBrowser.Installer/MediaBrowser.Installer.csproj b/MediaBrowser.Installer/MediaBrowser.Installer.csproj index 3662c71c3b..036340be7e 100644 --- a/MediaBrowser.Installer/MediaBrowser.Installer.csproj +++ b/MediaBrowser.Installer/MediaBrowser.Installer.csproj @@ -29,7 +29,7 @@ Media Browser Team Media Browser true - 5 + 8 0.1.1.%2a false true diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index 9b27351a16..7176b7ce89 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -383,6 +383,12 @@ xcopy "$(SolutionDir)\packages\System.Data.SQLite.1.0.84.0\content\net40\x86\SQLite.Interop.dll" "$(TargetDir)" /y 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 "$(TargetDir)$(TargetFileName).config" "$(SolutionDir)..\Deploy\Server\System\" /y + xcopy "$(TargetDir)*.dll" "$(SolutionDir)..\Deploy\Server\System" /y mkdir "$(SolutionDir)..\Deploy\Server\System\x64" xcopy "$(TargetDir)x64" "$(SolutionDir)..\Deploy\Server\System\x64" /y diff --git a/MediaBrowser.Uninstaller/App.config b/MediaBrowser.Uninstaller/App.config new file mode 100644 index 0000000000..8e15646352 --- /dev/null +++ b/MediaBrowser.Uninstaller/App.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/MediaBrowser.Uninstaller/App.xaml b/MediaBrowser.Uninstaller/App.xaml new file mode 100644 index 0000000000..8d0735d423 --- /dev/null +++ b/MediaBrowser.Uninstaller/App.xaml @@ -0,0 +1,8 @@ + + + + + diff --git a/MediaBrowser.Uninstaller/App.xaml.cs b/MediaBrowser.Uninstaller/App.xaml.cs new file mode 100644 index 0000000000..b38e27e1a9 --- /dev/null +++ b/MediaBrowser.Uninstaller/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/MainWindow.xaml b/MediaBrowser.Uninstaller/MainWindow.xaml new file mode 100644 index 0000000000..54d8f961aa --- /dev/null +++ b/MediaBrowser.Uninstaller/MainWindow.xaml @@ -0,0 +1,16 @@ + + + +