run all version numbers through one place so that gui version numbers and assembly/dll version resources can be the same

This commit is contained in:
zeromus 2012-10-21 05:21:59 +00:00
parent 83a06c4f63
commit a34337691a
6 changed files with 20 additions and 9 deletions

View File

@ -27,5 +27,10 @@ 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.1." + SubWCRev.SVN_REV)]
[assembly: AssemblyFileVersion("1.0.1." + SubWCRev.SVN_REV)]
[assembly: AssemblyVersion(VersionInfo.MAINVERSION + "." + SubWCRev.SVN_REV)]
[assembly: AssemblyFileVersion(VersionInfo.MAINVERSION + "." + SubWCRev.SVN_REV)]
public static class VersionInfo
{
public const string MAINVERSION = "1.2.0";
}

View File

@ -24,7 +24,7 @@ namespace BizHawk.MultiClient
public partial class MainForm : Form
{
public bool INTERIM = true;
public const string EMUVERSION = "Version 1.2.0";
public const string EMUVERSION = "Version " + VersionInfo.MAINVERSION;
public const string RELEASEDATE = "October 20, 2012";
private Control renderTarget;
private RetainedViewportPanel retainedPanel;

View File

@ -27,5 +27,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.1." + SubWCRev.SVN_REV)]
[assembly: AssemblyFileVersion("1.0.1." + SubWCRev.SVN_REV)]
[assembly: AssemblyVersion(VersionInfo.MAINVERSION + "." + SubWCRev.SVN_REV)]
[assembly: AssemblyFileVersion(VersionInfo.MAINVERSION + "." + SubWCRev.SVN_REV)]

View File

@ -178,6 +178,12 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\BizHawk.Emulation\BizHawk.Emulation.csproj">
<Project>{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}</Project>
<Name>BizHawk.Emulation</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">"$(SolutionDir)subwcrev.bat" "$(ProjectDir)"</PreBuildEvent>

View File

@ -27,5 +27,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.1." + SubWCRev.SVN_REV)]
[assembly: AssemblyFileVersion("1.0.1." + SubWCRev.SVN_REV)]
[assembly: AssemblyVersion(VersionInfo.MAINVERSION + "." + SubWCRev.SVN_REV)]
[assembly: AssemblyFileVersion(VersionInfo.MAINVERSION + "." + SubWCRev.SVN_REV)]

View File

@ -27,5 +27,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.1." + SubWCRev.SVN_REV)]
[assembly: AssemblyFileVersion("1.0.1." + SubWCRev.SVN_REV)]
[assembly: AssemblyVersion(VersionInfo.MAINVERSION + "." + SubWCRev.SVN_REV)]
[assembly: AssemblyFileVersion(VersionInfo.MAINVERSION + "." + SubWCRev.SVN_REV)]