From 489084242fb3090b1e3792ea44039daa9c7ece85 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Fri, 20 Mar 2020 09:37:31 +1000 Subject: [PATCH] Move [AssemblyVersion]/[AssemblyFileVersion] to VersionInfo.cs ApiHawk was using hardcoded "1.1.0.0". BizInvoke, Bizware.BizwareGL, and WinForms.Controls were not annotated, and had the default "0.0.0.0". All four of these projects did not include the Version source files. --- BizHawk.BizInvoke/BizHawk.BizInvoke.csproj | 2 ++ .../BizHawk.Client.ApiHawk.csproj | 2 ++ BizHawk.Client.ApiHawk/Properties/AssemblyInfo.cs | 14 -------------- BizHawk.Client.Common/Properties/AssemblyInfo.cs | 13 ------------- .../Properties/AssemblyInfo.cs | 14 -------------- BizHawk.Client.EmuHawk/Properties/AssemblyInfo.cs | 13 ------------- BizHawk.Common/Properties/AssemblyInfo.cs | 13 ------------- .../Properties/AssemblyInfo.cs | 13 ------------- BizHawk.Emulation.Cores/Properties/AssemblyInfo.cs | 13 ------------- .../Properties/AssemblyInfo.cs | 13 ------------- .../BizHawk.WinForms.Controls.csproj | 2 ++ .../BizHawk.Bizware.BizwareGL.csproj | 2 ++ Version/VersionInfo.cs | 3 +++ 13 files changed, 11 insertions(+), 106 deletions(-) diff --git a/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj b/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj index 7ef927a3b2..8f18f09409 100644 --- a/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj +++ b/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj @@ -7,5 +7,7 @@ + + diff --git a/BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj b/BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj index dd128756e0..ab7756ddc1 100644 --- a/BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj +++ b/BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj @@ -18,6 +18,8 @@ + + diff --git a/BizHawk.Client.ApiHawk/Properties/AssemblyInfo.cs b/BizHawk.Client.ApiHawk/Properties/AssemblyInfo.cs index 53f24b5e3c..bd0d432274 100644 --- a/BizHawk.Client.ApiHawk/Properties/AssemblyInfo.cs +++ b/BizHawk.Client.ApiHawk/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following @@ -21,16 +20,3 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("8e2f11f2-3955-4382-8c3a-ceba1276caea")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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.1.0.0")] -[assembly: AssemblyFileVersion("1.1.0.0")] diff --git a/BizHawk.Client.Common/Properties/AssemblyInfo.cs b/BizHawk.Client.Common/Properties/AssemblyInfo.cs index 4b146615a3..65864f6ebe 100644 --- a/BizHawk.Client.Common/Properties/AssemblyInfo.cs +++ b/BizHawk.Client.Common/Properties/AssemblyInfo.cs @@ -19,16 +19,3 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("8281b376-a1d5-4157-97b8-dab7246ef4c8")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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(VersionInfo.MainVersion + "." + SubWCRev.SVN_REV)] -[assembly: AssemblyFileVersion(VersionInfo.MainVersion + "." + SubWCRev.SVN_REV)] diff --git a/BizHawk.Client.DiscoHawk/Properties/AssemblyInfo.cs b/BizHawk.Client.DiscoHawk/Properties/AssemblyInfo.cs index 0aba12848b..0bcf45fd91 100644 --- a/BizHawk.Client.DiscoHawk/Properties/AssemblyInfo.cs +++ b/BizHawk.Client.DiscoHawk/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following @@ -20,16 +19,3 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("0DE267F2-039C-44A3-8489-97A4D99649C2")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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(VersionInfo.MainVersion + "." + SubWCRev.SVN_REV)] -[assembly: AssemblyFileVersion(VersionInfo.MainVersion + "." + SubWCRev.SVN_REV)] diff --git a/BizHawk.Client.EmuHawk/Properties/AssemblyInfo.cs b/BizHawk.Client.EmuHawk/Properties/AssemblyInfo.cs index 85a553e247..c8665a7464 100644 --- a/BizHawk.Client.EmuHawk/Properties/AssemblyInfo.cs +++ b/BizHawk.Client.EmuHawk/Properties/AssemblyInfo.cs @@ -19,16 +19,3 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("c282f0e2-86cb-4a6b-b83e-ad74f90ebe83")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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(VersionInfo.MainVersion + "." + SubWCRev.SVN_REV)] -[assembly: AssemblyFileVersion(VersionInfo.MainVersion + "." + SubWCRev.SVN_REV)] diff --git a/BizHawk.Common/Properties/AssemblyInfo.cs b/BizHawk.Common/Properties/AssemblyInfo.cs index 449595248e..105b332dca 100644 --- a/BizHawk.Common/Properties/AssemblyInfo.cs +++ b/BizHawk.Common/Properties/AssemblyInfo.cs @@ -19,16 +19,3 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("f8e9ad29-89d8-478b-a699-ed3369703b6a")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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(VersionInfo.MainVersion + "." + SubWCRev.SVN_REV)] -[assembly: AssemblyFileVersion(VersionInfo.MainVersion + "." + SubWCRev.SVN_REV)] diff --git a/BizHawk.Emulation.Common/Properties/AssemblyInfo.cs b/BizHawk.Emulation.Common/Properties/AssemblyInfo.cs index af4295ee55..b20cd8e547 100644 --- a/BizHawk.Emulation.Common/Properties/AssemblyInfo.cs +++ b/BizHawk.Emulation.Common/Properties/AssemblyInfo.cs @@ -19,16 +19,3 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("b4ade60b-b857-4604-860b-fa0d27f99171")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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(VersionInfo.MainVersion + "." + SubWCRev.SVN_REV)] -[assembly: AssemblyFileVersion(VersionInfo.MainVersion + "." + SubWCRev.SVN_REV)] diff --git a/BizHawk.Emulation.Cores/Properties/AssemblyInfo.cs b/BizHawk.Emulation.Cores/Properties/AssemblyInfo.cs index d9a76f3097..5e3715d3a1 100644 --- a/BizHawk.Emulation.Cores/Properties/AssemblyInfo.cs +++ b/BizHawk.Emulation.Cores/Properties/AssemblyInfo.cs @@ -19,16 +19,3 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("38dc7bf9-d86c-4217-acd8-36dc09f8ba57")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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(VersionInfo.MainVersion + "." + SubWCRev.SVN_REV)] -[assembly: AssemblyFileVersion(VersionInfo.MainVersion + "." + SubWCRev.SVN_REV)] diff --git a/BizHawk.Emulation.DiscSystem/Properties/AssemblyInfo.cs b/BizHawk.Emulation.DiscSystem/Properties/AssemblyInfo.cs index caf4c4eab4..65558cc5a8 100644 --- a/BizHawk.Emulation.DiscSystem/Properties/AssemblyInfo.cs +++ b/BizHawk.Emulation.DiscSystem/Properties/AssemblyInfo.cs @@ -19,16 +19,3 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("1ad4da36-4e98-4d1a-bd75-17d63c0e30dc")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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(VersionInfo.MainVersion + "." + SubWCRev.SVN_REV)] -[assembly: AssemblyFileVersion(VersionInfo.MainVersion + "." + SubWCRev.SVN_REV)] diff --git a/BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj b/BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj index 799d1188b8..1b8dc5b02f 100644 --- a/BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj +++ b/BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj @@ -7,5 +7,7 @@ + + diff --git a/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj b/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj index 9bbce10ce4..bebf9268ce 100644 --- a/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj +++ b/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj @@ -9,6 +9,8 @@ + + diff --git a/Version/VersionInfo.cs b/Version/VersionInfo.cs index 193dda2d0f..c4709bb232 100644 --- a/Version/VersionInfo.cs +++ b/Version/VersionInfo.cs @@ -3,6 +3,9 @@ using System.IO; using System.Reflection; +[assembly: AssemblyVersion(VersionInfo.MainVersion + "." + SubWCRev.SVN_REV)] +[assembly: AssemblyFileVersion(VersionInfo.MainVersion + "." + SubWCRev.SVN_REV)] + internal static class VersionInfo { // keep this updated at every major release