diff --git a/Common.props b/Common.props index 1dda6800e9..cfac721a93 100644 --- a/Common.props +++ b/Common.props @@ -1,7 +1,6 @@ prompt - false 8.0 AnyCPU false diff --git a/src/BizHawk.Client.Common/AssemblyInfo.cs b/src/BizHawk.Client.Common/AssemblyInfo.cs new file mode 100644 index 0000000000..c5959f82da --- /dev/null +++ b/src/BizHawk.Client.Common/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("BizHawk.Tests")] diff --git a/src/BizHawk.Client.Common/Properties/AssemblyInfo.cs b/src/BizHawk.Client.Common/Properties/AssemblyInfo.cs deleted file mode 100644 index 6dd6499e23..0000000000 --- a/src/BizHawk.Client.Common/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("BizHawk.Client.Common")] -[assembly: AssemblyDescription("http://tasvideos.org/Bizhawk.html")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("BizHawk")] -[assembly: AssemblyProduct("BizHawk.Client.Common")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("8281b376-a1d5-4157-97b8-dab7246ef4c8")] - -[assembly: InternalsVisibleTo("BizHawk.Tests")] \ No newline at end of file diff --git a/src/BizHawk.Client.DiscoHawk/Properties/AssemblyInfo.cs b/src/BizHawk.Client.DiscoHawk/Properties/AssemblyInfo.cs deleted file mode 100644 index 0bcf45fd91..0000000000 --- a/src/BizHawk.Client.DiscoHawk/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("BizHawk.Client.DiscoHawk")] -[assembly: AssemblyDescription("http://tasvideos.org/Bizhawk.html")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("BizHawk")] -[assembly: AssemblyProduct("BizHawk.Client.DiscoHawk")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("0DE267F2-039C-44A3-8489-97A4D99649C2")] diff --git a/src/BizHawk.Client.EmuHawk/Program.cs b/src/BizHawk.Client.EmuHawk/Program.cs index f518ce87ce..36ba9f474d 100644 --- a/src/BizHawk.Client.EmuHawk/Program.cs +++ b/src/BizHawk.Client.EmuHawk/Program.cs @@ -87,18 +87,19 @@ namespace BizHawk.Client.EmuHawk // and there was a TypeLoadException before the first line of SubMain was reached (some static ColorType init?) // zero 25-dec-2012 - only do for public builds. its annoying during development // and don't bother when installed from a package manager i.e. not Windows --yoshi - if (!VersionInfo.DeveloperBuild && !OSTC.IsUnixHost) - { - var thisversion = typeof(Program).Assembly.GetName().Version; - var utilversion = Assembly.Load(new AssemblyName("BizHawk.Client.Common")).GetName().Version; - var emulversion = Assembly.Load(new AssemblyName("BizHawk.Emulation.Cores")).GetName().Version; - - if (thisversion != utilversion || thisversion != emulversion) - { - MessageBox.Show("Conflicting revisions found! Don't mix .dll versions!"); - return -1; - } - } + // commenting this out until I get it generated properly --yoshi +// if (!VersionInfo.DeveloperBuild && !OSTC.IsUnixHost) +// { +// var thisversion = typeof(Program).Assembly.GetName().Version; +// var utilversion = Assembly.Load(new AssemblyName("BizHawk.Client.Common")).GetName().Version; +// var emulversion = Assembly.Load(new AssemblyName("BizHawk.Emulation.Cores")).GetName().Version; +// +// if (thisversion != utilversion || thisversion != emulversion) +// { +// MessageBox.Show("Conflicting revisions found! Don't mix .dll versions!"); +// return -1; +// } +// } TempFileManager.Start(); diff --git a/src/BizHawk.Client.EmuHawk/Properties/AssemblyInfo.cs b/src/BizHawk.Client.EmuHawk/Properties/AssemblyInfo.cs deleted file mode 100644 index c8665a7464..0000000000 --- a/src/BizHawk.Client.EmuHawk/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("BizHawk.Client.EmuHawk")] -[assembly: AssemblyDescription("http://tasvideos.org/Bizhawk.html")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("BizHawk")] -[assembly: AssemblyProduct("BizHawk.Client.EmuHawk")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("c282f0e2-86cb-4a6b-b83e-ad74f90ebe83")] diff --git a/src/BizHawk.Common/Properties/AssemblyInfo.cs b/src/BizHawk.Common/Properties/AssemblyInfo.cs deleted file mode 100644 index 105b332dca..0000000000 --- a/src/BizHawk.Common/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("BizHawk.Common")] -[assembly: AssemblyDescription("http://tasvideos.org/Bizhawk.html")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("BizHawk")] -[assembly: AssemblyProduct("BizHawk.Common")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f8e9ad29-89d8-478b-a699-ed3369703b6a")] diff --git a/src/BizHawk.Emulation.Common/Properties/AssemblyInfo.cs b/src/BizHawk.Emulation.Common/Properties/AssemblyInfo.cs deleted file mode 100644 index b20cd8e547..0000000000 --- a/src/BizHawk.Emulation.Common/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("BizHawk.Emulation.Common")] -[assembly: AssemblyDescription("http://tasvideos.org/Bizhawk.html")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("BizHawk")] -[assembly: AssemblyProduct("BizHawk.Emulation.Common")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("b4ade60b-b857-4604-860b-fa0d27f99171")] diff --git a/src/BizHawk.Emulation.Cores/Properties/AssemblyInfo.cs b/src/BizHawk.Emulation.Cores/Properties/AssemblyInfo.cs deleted file mode 100644 index 5e3715d3a1..0000000000 --- a/src/BizHawk.Emulation.Cores/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("BizHawk.Emulation")] -[assembly: AssemblyDescription("http://tasvideos.org/Bizhawk.html")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("BizHawk")] -[assembly: AssemblyProduct("BizHawk.Emulation")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("38dc7bf9-d86c-4217-acd8-36dc09f8ba57")] diff --git a/src/BizHawk.Emulation.DiscSystem/Properties/AssemblyInfo.cs b/src/BizHawk.Emulation.DiscSystem/Properties/AssemblyInfo.cs deleted file mode 100644 index 65558cc5a8..0000000000 --- a/src/BizHawk.Emulation.DiscSystem/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("BizHawk.Emulation.DiscSystem")] -[assembly: AssemblyDescription("http://tasvideos.org/Bizhawk.html")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("BizHawk")] -[assembly: AssemblyProduct("BizHawk.Emulation.DiscSystem")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("1ad4da36-4e98-4d1a-bd75-17d63c0e30dc")] diff --git a/src/BizHawk.Version/VersionInfo.cs b/src/BizHawk.Version/VersionInfo.cs index e5fdecae8c..36f7bf09c9 100644 --- a/src/BizHawk.Version/VersionInfo.cs +++ b/src/BizHawk.Version/VersionInfo.cs @@ -3,9 +3,6 @@ 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