From 1e0ff55413f2d51069eb0b1849c139a5cfd947e6 Mon Sep 17 00:00:00 2001 From: Rob Lambell Date: Thu, 13 Mar 2014 18:43:25 +0000 Subject: [PATCH] Amended for VS2010 on Win7x64 targeting .NET v2 --- xk3yScanner.suo | Bin 0 -> 26624 bytes xk3yScanner/Classes/Game.cs | 4 ++-- .../Classes/Processors/Helpers/MoveAsync.cs | 2 +- xk3yScanner/Classes/Utils.cs | 2 +- xk3yScanner/ExceptionForm.cs | 4 ++-- xk3yScanner/Properties/Resources.Designer.cs | 2 +- xk3yScanner/Properties/Resources.resx | 14 +++++++------- xk3yScanner/xkeyBrew/IsoGameReader/XeXHeader.cs | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 xk3yScanner.suo diff --git a/xk3yScanner.suo b/xk3yScanner.suo new file mode 100644 index 0000000000000000000000000000000000000000..2d64ede9de568912bf7ac37eb1da7d7d0b1483d0 GIT binary patch literal 26624 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 Kt-qThe exception to log. - public static string CompanyName { get { object[] attributes = Assembly.GetCallingAssembly().GetCustomAttributes(typeof(AssemblyCompanyAttribute), false); return attributes.Length == 0 ? "" : ((AssemblyCompanyAttribute)attributes[0]).Company; } } + public new static string CompanyName { get { object[] attributes = Assembly.GetCallingAssembly().GetCustomAttributes(typeof(AssemblyCompanyAttribute), false); return attributes.Length == 0 ? "" : ((AssemblyCompanyAttribute)attributes[0]).Company; } } public static string CopyrightHolder { get { object[] attributes = Assembly.GetCallingAssembly().GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false); return attributes.Length == 0 ? "" : ((AssemblyCopyrightAttribute)attributes[0]).Copyright; } } public static string Description { get { object[] attributes = Assembly.GetCallingAssembly().GetCustomAttributes(typeof(AssemblyDescriptionAttribute), false); return attributes.Length == 0 ? "" : ((AssemblyDescriptionAttribute)attributes[0]).Description; } } - public static string ProductName { get { object[] attributes = Assembly.GetCallingAssembly().GetCustomAttributes(typeof(AssemblyProductAttribute), false); return attributes.Length == 0 ? "" : ((AssemblyProductAttribute)attributes[0]).Product; } } + public new static string ProductName { get { object[] attributes = Assembly.GetCallingAssembly().GetCustomAttributes(typeof(AssemblyProductAttribute), false); return attributes.Length == 0 ? "" : ((AssemblyProductAttribute)attributes[0]).Product; } } public static string Title { get { object[] attributes = Assembly.GetCallingAssembly().GetCustomAttributes(typeof(AssemblyTitleAttribute), false); if (attributes.Length > 0) { AssemblyTitleAttribute titleAttribute = (AssemblyTitleAttribute)attributes[0]; if (titleAttribute.Title.Length > 0) return titleAttribute.Title; } return System.IO.Path.GetFileNameWithoutExtension(Assembly.GetExecutingAssembly().CodeBase); } } public static Version Version { get { return Assembly.GetCallingAssembly().GetName().Version; } } diff --git a/xk3yScanner/Properties/Resources.Designer.cs b/xk3yScanner/Properties/Resources.Designer.cs index a409b6b..688d6b9 100644 --- a/xk3yScanner/Properties/Resources.Designer.cs +++ b/xk3yScanner/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18046 +// Runtime Version:4.0.30319.18444 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/xk3yScanner/Properties/Resources.resx b/xk3yScanner/Properties/Resources.resx index 763c1f5..51592f2 100644 --- a/xk3yScanner/Properties/Resources.resx +++ b/xk3yScanner/Properties/Resources.resx @@ -122,7 +122,7 @@ ..\Resources\abgx360.bin;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\Active.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Active.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\banner.bin;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -131,22 +131,22 @@ ..\Resources\cover.bin;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\Error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Error.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Green.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Inactive.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Inactive.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Ok.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Ok.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Warning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Warning.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\xkey.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\xkey.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\None.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/xk3yScanner/xkeyBrew/IsoGameReader/XeXHeader.cs b/xk3yScanner/xkeyBrew/IsoGameReader/XeXHeader.cs index 52bcd5b..666ee70 100644 --- a/xk3yScanner/xkeyBrew/IsoGameReader/XeXHeader.cs +++ b/xk3yScanner/xkeyBrew/IsoGameReader/XeXHeader.cs @@ -125,7 +125,7 @@ public void Dispose() this.discCount = 0; } - public string ToString() + public new string ToString() { StringBuilder builder = new StringBuilder(); PropertyInfo[] properties = typeof(XeXHeader).GetProperties(BindingFlags.Public | BindingFlags.Instance);