// 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("0.0.0.0")]\r
+[assembly: AssemblyVersion("1.0.0.0")]\r
[assembly: NeutralResourcesLanguage("")]\r
/// </returns>\r
public static string GetVersion()\r
{\r
- Version version = Assembly.GetEntryAssembly().GetName().Version;\r
-\r
IHandBrakeInstance instance = HandBrakeInstanceManager.GetScanInstance(1);\r
\r
- return IsNightly() ? string.Format("Nightly {0} ({1})", instance.Version, instance.Build) : string.Format("{0}.{1}.{2}.{3}", version.Major, version.Minor, version.Build, version.Revision);\r
+ return IsNightly() ? string.Format("Nightly {0} ({1})", instance.Version, instance.Build) : string.Format("{0} ({1})", instance.Version, instance.Build);\r
}\r
\r
/// <summary>\r
/// </returns>\r
public static bool IsNightly()\r
{\r
- Version version = Assembly.GetEntryAssembly().GetName().Version;\r
+ IHandBrakeInstance instance = HandBrakeInstanceManager.GetScanInstance(1);\r
\r
- // The MSBuild.xml script sets 0.0.0 for nightly builds.\r
- return version.Major == 0 && version.Minor == 0 && version.Build == 0;\r
+ // 01 = Unofficial Builds. 00 = Official Tagged Releases.\r
+ return instance.Build.ToString().EndsWith("01");\r
}\r
\r
/// <summary>\r
/// </returns>\r
public static string GetPlatformBitnessVersion()\r
{\r
- return System.Environment.Is64BitProcess ? "64bit Version" : "32bit Version";\r
+ return System.Environment.Is64BitProcess ? "64bit" : "32bit";\r
}\r
\r
/// <summary>\r
<None Include="Installer\Installer64.nsi" />\r
<None Include="Installer\MakeNightly.nsi" />\r
<None Include="Installer\MakeNightly64.nsi" />\r
- <None Include="Properties\AssemblyInfo.cs.Nightly.tmpl" />\r
- <None Include="Properties\AssemblyInfo.cs.tmpl" />\r
<AppDesigner Include="Properties\" />\r
<EmbeddedResource Include="public.key" />\r
</ItemGroup>\r
// 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("0.0.0.0")]\r
+[assembly: AssemblyVersion("1.0.0.0")]\r
[assembly: NeutralResourcesLanguage("")]
\ No newline at end of file
+++ /dev/null
-// --------------------------------------------------------------------------------------------------------------------\r
-// <copyright file="ListBoxHelper.cs" company="HandBrake Project (http://handbrake.fr)">\r
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.\r
-// </copyright>\r
-// <summary>\r
-// Assembly Info\r
-// </summary>\r
-// <auto-generated/>\r
-// --------------------------------------------------------------------------------------------------------------------\r
-\r
-using System.Reflection;\r
-using System.Resources;\r
-using System.Runtime.CompilerServices;\r
-using System.Runtime.InteropServices;\r
-using System.Windows;\r
-\r
-// General Information about an assembly is controlled through the following \r
-// set of attributes. Change these attribute values to modify the information\r
-// associated with an assembly.\r
-[assembly: AssemblyTitle("HandBrake")]\r
-[assembly: AssemblyDescription("HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded video transcoder.")]\r
-[assembly: AssemblyConfiguration("")]\r
-[assembly: AssemblyCompany("HandBrake")]\r
-[assembly: AssemblyProduct("HandBrake")]\r
-[assembly: AssemblyCopyright("Copyright © 2003-2016 HandBrake Team")]\r
-[assembly: AssemblyTrademark("")]\r
-[assembly: AssemblyCulture("")]\r
-\r
-// Setting ComVisible to false makes the types in this assembly not visible \r
-// to COM components. If you need to access a type in this assembly from \r
-// COM, set the ComVisible attribute to true on that type.\r
-[assembly: ComVisible(false)]\r
-\r
-//In order to begin building localizable applications, set \r
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file\r
-//inside a <PropertyGroup>. For example, if you are using US english\r
-//in your source files, set the <UICulture> to en-US. Then uncomment\r
-//the NeutralResourceLanguage attribute below. Update the "en-US" in\r
-//the line below to match the UICulture setting in the project file.\r
-\r
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]\r
-\r
-\r
-[assembly: ThemeInfo(\r
- ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located\r
- //(used if a resource is not found in the page, \r
- // or application resource dictionaries)\r
- ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located\r
- //(used if a resource is not found in the page, \r
- // app, or any theme specific resource dictionaries)\r
-)]\r
-\r
-\r
-// Version information for an assembly consists of the following four values:\r
-//\r
-// Major Version\r
-// Minor Version \r
-// Build Number\r
-// Revision\r
-//\r
-// 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.*")] $WCREV$\r
-[assembly: AssemblyVersion("0.0.0.0")]\r
-[assembly: NeutralResourcesLanguage("")]
\ No newline at end of file
+++ /dev/null
-// --------------------------------------------------------------------------------------------------------------------\r
-// <copyright file="ListBoxHelper.cs" company="HandBrake Project (http://handbrake.fr)">\r
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.\r
-// </copyright>\r
-// <summary>\r
-// Assembly Info\r
-// </summary>\r
-// <auto-generated/>\r
-// --------------------------------------------------------------------------------------------------------------------\r
-\r
-using System.Reflection;\r
-using System.Resources;\r
-using System.Runtime.CompilerServices;\r
-using System.Runtime.InteropServices;\r
-using System.Windows;\r
-\r
-// General Information about an assembly is controlled through the following \r
-// set of attributes. Change these attribute values to modify the information\r
-// associated with an assembly.\r
-[assembly: AssemblyTitle("HandBrake")]\r
-[assembly: AssemblyDescription("HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded video transcoder.")]\r
-[assembly: AssemblyConfiguration("")]\r
-[assembly: AssemblyCompany("HandBrake")]\r
-[assembly: AssemblyProduct("HandBrake")]\r
-[assembly: AssemblyCopyright("Copyright © 2003-2016 HandBrake Team")]\r
-[assembly: AssemblyTrademark("")]\r
-[assembly: AssemblyCulture("")]\r
-\r
-// Setting ComVisible to false makes the types in this assembly not visible \r
-// to COM components. If you need to access a type in this assembly from \r
-// COM, set the ComVisible attribute to true on that type.\r
-[assembly: ComVisible(false)]\r
-\r
-//In order to begin building localizable applications, set \r
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file\r
-//inside a <PropertyGroup>. For example, if you are using US english\r
-//in your source files, set the <UICulture> to en-US. Then uncomment\r
-//the NeutralResourceLanguage attribute below. Update the "en-US" in\r
-//the line below to match the UICulture setting in the project file.\r
-\r
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]\r
-\r
-\r
-[assembly: ThemeInfo(\r
- ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located\r
- //(used if a resource is not found in the page, \r
- // or application resource dictionaries)\r
- ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located\r
- //(used if a resource is not found in the page, \r
- // app, or any theme specific resource dictionaries)\r
-)]\r
-\r
-\r
-// Version information for an assembly consists of the following four values:\r
-//\r
-// Major Version\r
-// Minor Version \r
-// Build Number\r
-// Revision\r
-//\r
-// 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.*")] $WCREV$\r
-[assembly: AssemblyVersion("0.1.0.0")]\r
-[assembly: NeutralResourcesLanguage("")]
\ No newline at end of file
\r
<!-- Dependencies -->\r
<PropertyGroup>\r
- <NightlyDependsOn>NightlyPreBuild;BuildRelease;NightlyPostBuild</NightlyDependsOn>\r
+ <NightlyDependsOn>BuildRelease;NightlyPostBuild</NightlyDependsOn>\r
</PropertyGroup>\r
\r
<PropertyGroup>\r
- <InstallDependsOn>PreBuild;BuildRelease;ReleasePostBuild</InstallDependsOn>\r
+ <InstallDependsOn>BuildRelease;ReleasePostBuild</InstallDependsOn>\r
</PropertyGroup>\r
\r
<!-- Builds /t: -->\r
</MSBuild>\r
</Target>\r
\r
- <!-- Pre Build Events. You must do a full checkout as it takes the svn from the main directory. $(MSBuildProjectDirectory)\. is not used. -->\r
- <Target Name="NightlyPreBuild">\r
- <!--<Exec Command="subwcrev.exe ../../ $(MSBuildProjectDirectory)\HandBrakeWPF\Properties\AssemblyInfo.cs.Nightly.tmpl $(MSBuildProjectDirectory)\HandBrakeWPF\Properties\AssemblyInfo.cs" />\r
- <Exec Command="subwcrev.exe ../../ $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\MakeNightly.nsi.tmpl $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\MakeNightly.nsi" Condition="$(Platform) == 'x86'" />\r
- <Exec Command="subwcrev.exe ../../ $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\MakeNightly64.nsi.tmpl $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\MakeNightly64.nsi" Condition="$(Platform) == 'x64'" />\r
- <Exec Command="subwcrev.exe ../../ $(MSBuildProjectDirectory)\HandBrake.ApplicationServices\Properties\AssemblyInfo.cs.Nightly.tmpl $(MSBuildProjectDirectory)\HandBrake.ApplicationServices\Properties\AssemblyInfo.cs" />-->\r
- </Target>\r
-\r
- <Target Name="PreBuild">\r
- <!-- <Exec Command="subwcrev.exe ../../ $(MSBuildProjectDirectory)\HandBrakeWPF\Properties\AssemblyInfo.cs.tmpl $(MSBuildProjectDirectory)\HandBrakeWPF\Properties\AssemblyInfo.cs" />\r
- <Exec Command="subwcrev.exe ../../ $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\MakeNightly.nsi.tmpl $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\MakeNightly.nsi" Condition="$(Platform) == 'x86'" />\r
- <Exec Command="subwcrev.exe ../../ $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\MakeNightly64.nsi.tmpl $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\MakeNightly64.nsi" Condition="$(Platform) == 'x64'" />\r
- <Exec Command="subwcrev.exe ../../ $(MSBuildProjectDirectory)\HandBrake.ApplicationServices\Properties\AssemblyInfo.cs.tmpl $(MSBuildProjectDirectory)\HandBrake.ApplicationServices\Properties\AssemblyInfo.cs" />-->\r
- </Target>\r
-\r
<!-- Post Build Events -->\r
<Target Name="NightlyPostBuild">\r
<Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\MakeNightly.nsi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x86\Release /Y" Condition="$(Platform) == 'x86'" />\r