WinGui: Update the assembly info / version numbers / manifest.

diff --git a/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs b/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs
index 46b5a063802df3a6359e0ade6fc6fa9b14176014..7155a8c70a8c1503b87e92b71b9205077f2cb92b 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs
+++ b/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs
@@ -43,5 +43,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers \r
 // by using the '*' as shown below:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("1.0.3.0")]\r
+[assembly: AssemblyVersion("1.1.0.0")]\r
 [assembly: NeutralResourcesLanguage("")]\r

diff --git a/win/CS/HandBrakeTools/Properties/AssemblyInfo.cs b/win/CS/HandBrakeTools/Properties/AssemblyInfo.cs
index a5c0b3a191384fd3af9a60e8574a054ae3c77353..59e15a1888a32e96417eefd6d246934dcb86ef16 100644 (file)
--- a/win/CS/HandBrakeTools/Properties/AssemblyInfo.cs
+++ b/win/CS/HandBrakeTools/Properties/AssemblyInfo.cs
@@ -41,5 +41,5 @@ using System.Windows;
 // 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.3.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
 [assembly: NeutralResourcesLanguage("")]
\ No newline at end of file

diff --git a/win/CS/HandBrakeWPF/App.xaml.cs b/win/CS/HandBrakeWPF/App.xaml.cs
index 501fffa1d54711e8c2f89f462d2e034b7bd73b4f..c7ce7d3f5d407ec49aebeb409e727fada3d34646 100644 (file)
--- a/win/CS/HandBrakeWPF/App.xaml.cs
+++ b/win/CS/HandBrakeWPF/App.xaml.cs
@@ -49,10 +49,12 @@ namespace HandBrakeWPF
         /// </param>\r
         protected override void OnStartup(StartupEventArgs e)\r
         {\r
+            // We don't support Windows XP / 2003 / 2003 R2 / Vista / 2008\r
             OperatingSystem os = Environment.OSVersion;\r
-            if ((os.Platform == PlatformID.Win32NT) && (os.Version.Major == 5 && os.Version.Minor <= 1))\r
+            if ((os.Platform == PlatformID.Win32NT) && (os.Version.Major == 5) ||\r
+                (os.Platform == PlatformID.Win32NT) && (os.Version.Major == 6 && os.Version.Minor < 1))\r
             {\r
-                MessageBox.Show("Windows XP and earlier are no longer supported. Version 0.9.9 was the last version to support these versions. ", "Notice", MessageBoxButton.OK, MessageBoxImage.Warning);\r
+                MessageBox.Show("HandBrake requires Windows 7 or later to run. Version 0.9.9 (XP) and 0.10.5 (Vista) was the last version to support these versions.", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning);\r
                 Application.Current.Shutdown();\r
                 return;\r
             }\r

diff --git a/win/CS/HandBrakeWPF/Installer/Installer.nsi b/win/CS/HandBrakeWPF/Installer/Installer.nsi
index 39149d30cbcba95a7074921073e5ce6a3938308c..5752309edcf6a7a0f10a51d96c5bbd3927f39a05 100644 (file)
--- a/win/CS/HandBrakeWPF/Installer/Installer.nsi
+++ b/win/CS/HandBrakeWPF/Installer/Installer.nsi
@@ -8,8 +8,8 @@
 \r
 ; HM NIS Edit Wizard helper defines\r
 !define PRODUCT_NAME "HandBrake"\r
-!define PRODUCT_VERSION "1.0.3"\r
-!define PRODUCT_VERSION_NUMBER "1.0.3"\r
+!define PRODUCT_VERSION "1.1.0"\r
+!define PRODUCT_VERSION_NUMBER "1.1.0"\r
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}"\r
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"\r
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"\r
@@ -78,9 +78,9 @@ Function .onInit
   MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK\r
   Abort\r
   \r
-  ; Detect if the intsaller is running on Windows XP and abort if it is.\r
-  ${IfNot} ${AtLeastWinVista}\r
-    MessageBox MB_OK "Windows Vista with Service Pack 1 or later is required in order to run HandBrake."\r
+  ; Detect if the intsaller is running on Windows XP/Vista and abort if it is.\r
+  ${IfNot} ${AtLeastWin7}\r
+    MessageBox MB_OK "Windows 7 with Service Pack 1 or later is required in order to run HandBrake."\r
     Quit\r
   ${EndIf}\r
 \r

diff --git a/win/CS/HandBrakeWPF/Installer/Installer64.nsi b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
index 1b42902f1287867428088bc78e56360879938880..a12b393f37a0ff8c5911d0643f3c13850b476991 100644 (file)
--- a/win/CS/HandBrakeWPF/Installer/Installer64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
@@ -8,8 +8,8 @@
 \r
 ; HM NIS Edit Wizard helper defines\r
 !define PRODUCT_NAME "HandBrake"\r
-!define PRODUCT_VERSION "1.0.3"\r
-!define PRODUCT_VERSION_NUMBER "1.0.3"\r
+!define PRODUCT_VERSION "1.1.0"\r
+!define PRODUCT_VERSION_NUMBER "1.1.0"\r
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}"\r
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"\r
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"\r
@@ -78,9 +78,9 @@ Function .onInit
   MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK\r
   Abort\r
 \r
-  ; Detect if the intsaller is running on Windows XP and abort if it is.\r
-  ${IfNot} ${AtLeastWinVista}\r
-    MessageBox MB_OK "Windows Vista with Service Pack 1 or later is required in order to run HandBrake."\r
+  ; Detect if the intsaller is running on Windows XP/Vista and abort if it is.\r
+  ${IfNot} ${AtLeastWin7}\r
+    MessageBox MB_OK "Windows 7 with Service Pack 1 or later is required in order to run HandBrake."\r
     Quit\r
   ${EndIf}\r
 \r

diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi
index 62214e7d9611aca675220fada733c1e25707fdb1..178bbbcc626ba8f815ba08df5f9639cd46629b76 100644 (file)
--- a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi
+++ b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi
@@ -78,9 +78,9 @@ Function .onInit
   MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK\r
   Abort\r
 \r
-  ; Detect if the intsaller is running on Windows XP and abort if it is.\r
-  ${IfNot} ${AtLeastWinVista}\r
-    MessageBox MB_OK "Windows Vista with Service Pack 1 or later is required in order to run HandBrake."\r
+  ; Detect if the intsaller is running on Windows XP/Vista and abort if it is.\r
+  ${IfNot} ${AtLeastWin7}\r
+    MessageBox MB_OK "Windows 7 with Service Pack 1 or later is required in order to run HandBrake."\r
     Quit\r
   ${EndIf}\r
 \r

diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
index ff560121daccc4780fd8a6ca5463b5b497fb35b4..07bda3722b030cd3b3e07592e4bbc898cbd2fe04 100644 (file)
--- a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
@@ -77,9 +77,9 @@ Function .onInit
   MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK\r
   Abort\r
 \r
-  ; Detect if the intsaller is running on Windows XP and abort if it is.\r
-  ${IfNot} ${AtLeastWinVista}\r
-    MessageBox MB_OK "Windows Vista with Service Pack 1 or later is required in order to run HandBrake."\r
+  ; Detect if the intsaller is running on Windows XP/Vista and abort if it is.\r
+  ${IfNot} ${AtLeastWin7}\r
+    MessageBox MB_OK "Windows 7 with Service Pack 1 or later is required in order to run HandBrake."\r
     Quit\r
   ${EndIf}\r
 \r

diff --git a/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs b/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs
index 5cbf7ed896a05cd00dd19dc6d32915135c2fa9f9..04529d8ebc7526364155da43f83ad42bf2c2dad7 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs
+++ b/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs
@@ -61,5 +61,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers \r
 // by using the '*' as shown below:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("1.0.3.0")]\r
+[assembly: AssemblyVersion("1.1.0.0")]\r
 [assembly: NeutralResourcesLanguage("")]
\ No newline at end of file

diff --git a/win/CS/HandBrakeWPF/app.manifest b/win/CS/HandBrakeWPF/app.manifest
index 389e81f24d57c3cb966325ff391a9ef55020c888..b81b54bec115dc09b18e37120fe0e1d270f6b5b5 100644 (file)
--- a/win/CS/HandBrakeWPF/app.manifest
+++ b/win/CS/HandBrakeWPF/app.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.3.0" name="HandBrake.app"/>
+  <assemblyIdentity version="1.1.0.0" name="HandBrake.app"/>
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
@@ -27,8 +27,8 @@
            is designed to work with. Uncomment the appropriate elements and Windows will 
            automatically selected the most compatible environment. -->
 
-      <!-- Windows Vista -->
-      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />
+      <!-- Windows Vista 
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
 
       <!-- Windows 7 -->
       <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />