summaryrefslogtreecommitdiffstats
path: root/win/CS
diff options
context:
space:
mode:
Diffstat (limited to 'win/CS')
-rw-r--r--win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs2
-rw-r--r--win/CS/HandBrakeTools/Properties/AssemblyInfo.cs2
-rw-r--r--win/CS/HandBrakeWPF/App.xaml.cs6
-rw-r--r--win/CS/HandBrakeWPF/Installer/Installer.nsi10
-rw-r--r--win/CS/HandBrakeWPF/Installer/Installer64.nsi10
-rw-r--r--win/CS/HandBrakeWPF/Installer/MakeNightly.nsi6
-rw-r--r--win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi6
-rw-r--r--win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs2
-rw-r--r--win/CS/HandBrakeWPF/app.manifest6
9 files changed, 26 insertions, 24 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs b/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs
index 46b5a0638..7155a8c70 100644
--- 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
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.3.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
[assembly: NeutralResourcesLanguage("")]
diff --git a/win/CS/HandBrakeTools/Properties/AssemblyInfo.cs b/win/CS/HandBrakeTools/Properties/AssemblyInfo.cs
index a5c0b3a19..59e15a188 100644
--- 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 501fffa1d..c7ce7d3f5 100644
--- a/win/CS/HandBrakeWPF/App.xaml.cs
+++ b/win/CS/HandBrakeWPF/App.xaml.cs
@@ -49,10 +49,12 @@ namespace HandBrakeWPF
/// </param>
protected override void OnStartup(StartupEventArgs e)
{
+ // We don't support Windows XP / 2003 / 2003 R2 / Vista / 2008
OperatingSystem os = Environment.OSVersion;
- if ((os.Platform == PlatformID.Win32NT) && (os.Version.Major == 5 && os.Version.Minor <= 1))
+ if ((os.Platform == PlatformID.Win32NT) && (os.Version.Major == 5) ||
+ (os.Platform == PlatformID.Win32NT) && (os.Version.Major == 6 && os.Version.Minor < 1))
{
- 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);
+ 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);
Application.Current.Shutdown();
return;
}
diff --git a/win/CS/HandBrakeWPF/Installer/Installer.nsi b/win/CS/HandBrakeWPF/Installer/Installer.nsi
index 39149d30c..5752309ed 100644
--- a/win/CS/HandBrakeWPF/Installer/Installer.nsi
+++ b/win/CS/HandBrakeWPF/Installer/Installer.nsi
@@ -8,8 +8,8 @@
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "HandBrake"
-!define PRODUCT_VERSION "1.0.3"
-!define PRODUCT_VERSION_NUMBER "1.0.3"
+!define PRODUCT_VERSION "1.1.0"
+!define PRODUCT_VERSION_NUMBER "1.1.0"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKLM"
@@ -78,9 +78,9 @@ Function .onInit
MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK
Abort
- ; Detect if the intsaller is running on Windows XP and abort if it is.
- ${IfNot} ${AtLeastWinVista}
- MessageBox MB_OK "Windows Vista with Service Pack 1 or later is required in order to run HandBrake."
+ ; Detect if the intsaller is running on Windows XP/Vista and abort if it is.
+ ${IfNot} ${AtLeastWin7}
+ MessageBox MB_OK "Windows 7 with Service Pack 1 or later is required in order to run HandBrake."
Quit
${EndIf}
diff --git a/win/CS/HandBrakeWPF/Installer/Installer64.nsi b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
index 1b42902f1..a12b393f3 100644
--- a/win/CS/HandBrakeWPF/Installer/Installer64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
@@ -8,8 +8,8 @@
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "HandBrake"
-!define PRODUCT_VERSION "1.0.3"
-!define PRODUCT_VERSION_NUMBER "1.0.3"
+!define PRODUCT_VERSION "1.1.0"
+!define PRODUCT_VERSION_NUMBER "1.1.0"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKLM"
@@ -78,9 +78,9 @@ Function .onInit
MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK
Abort
- ; Detect if the intsaller is running on Windows XP and abort if it is.
- ${IfNot} ${AtLeastWinVista}
- MessageBox MB_OK "Windows Vista with Service Pack 1 or later is required in order to run HandBrake."
+ ; Detect if the intsaller is running on Windows XP/Vista and abort if it is.
+ ${IfNot} ${AtLeastWin7}
+ MessageBox MB_OK "Windows 7 with Service Pack 1 or later is required in order to run HandBrake."
Quit
${EndIf}
diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi
index 62214e7d9..178bbbcc6 100644
--- 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
Abort
- ; Detect if the intsaller is running on Windows XP and abort if it is.
- ${IfNot} ${AtLeastWinVista}
- MessageBox MB_OK "Windows Vista with Service Pack 1 or later is required in order to run HandBrake."
+ ; Detect if the intsaller is running on Windows XP/Vista and abort if it is.
+ ${IfNot} ${AtLeastWin7}
+ MessageBox MB_OK "Windows 7 with Service Pack 1 or later is required in order to run HandBrake."
Quit
${EndIf}
diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
index ff560121d..07bda3722 100644
--- 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
Abort
- ; Detect if the intsaller is running on Windows XP and abort if it is.
- ${IfNot} ${AtLeastWinVista}
- MessageBox MB_OK "Windows Vista with Service Pack 1 or later is required in order to run HandBrake."
+ ; Detect if the intsaller is running on Windows XP/Vista and abort if it is.
+ ${IfNot} ${AtLeastWin7}
+ MessageBox MB_OK "Windows 7 with Service Pack 1 or later is required in order to run HandBrake."
Quit
${EndIf}
diff --git a/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs b/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs
index 5cbf7ed89..04529d8eb 100644
--- 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
// 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.manifest b/win/CS/HandBrakeWPF/app.manifest
index 389e81f24..b81b54bec 100644
--- 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}" />
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 01:24:32 +0000