From 17f5c632738141dd05a78b00399f78b0fc4201a4 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 20 Oct 2013 17:00:51 +0000 Subject: [PATCH] Move 7z stuff from Bizhawk.Util to BizHawk.Multiclient and delete the Bizhawk.Util project --- .../7z/ArchiveEmulationStreamProxy.cs | 0 .../7z/ArchiveExtractCallback.cs | 0 .../7z/ArchiveOpenCallback.cs | 0 .../7z/ArchiveUpdateCallback.cs | 0 .../7z/COM.cs | 0 .../7z/Common.cs | 0 .../7z/EventArgs.cs | 0 .../7z/Exceptions.cs | 0 .../7z/FileSignatureChecker.cs | 0 .../7z/Formats.cs | 0 .../7z/LibraryFeature.cs | 0 .../7z/LibraryManager.cs | 0 .../7z/LzmaDecodeStream.cs | 0 .../7z/LzmaEncodeStream.cs | 0 .../7z/LzmaProgressCallback.cs | 0 .../7z/NativeMethods.cs | 0 .../7z/SevenZipCompressor.cs | 0 .../7z/SevenZipCompressorAsynchronous.cs | 0 .../7z/SevenZipExtractor.cs | 0 .../7z/SevenZipExtractorAsynchronous.cs | 0 .../7z/SevenZipSfx.cs | 0 .../7z/StreamWrappers.cs | 0 .../7z/arch/Test.bzip2.7z | Bin .../7z/arch/Test.lzma.7z | Bin .../7z/arch/Test.lzma2.7z | Bin .../7z/arch/Test.ppmd.7z | Bin .../7z/arch/Test.rar | Bin .../7z/arch/Test.tar | Bin .../7z/arch/Test.txt | 0 .../7z/arch/Test.txt.bz2 | Bin .../7z/arch/Test.txt.gz | Bin .../7z/arch/Test.txt.xz | Bin .../7z/arch/Test.zip | Bin .../7z/sdk/Common/CRC.cs | 0 .../7z/sdk/Common/InBuffer.cs | 0 .../7z/sdk/Common/OutBuffer.cs | 0 .../7z/sdk/Compress/LZ/IMatchFinder.cs | 0 .../7z/sdk/Compress/LZ/LzBinTree.cs | 0 .../7z/sdk/Compress/LZ/LzInWindow.cs | 0 .../7z/sdk/Compress/LZ/LzOutWindow.cs | 0 .../7z/sdk/Compress/LZMA/LzmaBase.cs | 0 .../7z/sdk/Compress/LZMA/LzmaDecoder.cs | 0 .../7z/sdk/Compress/LZMA/LzmaEncoder.cs | 0 .../7z/sdk/Compress/RangeCoder/RangeCoder.cs | 0 .../sdk/Compress/RangeCoder/RangeCoderBit.cs | 0 .../Compress/RangeCoder/RangeCoderBitTree.cs | 0 .../7z/sdk/ICoder.cs | 0 .../BizHawk.MultiClient.csproj | 52 +++++- .../BizHawk.PCE_Debugger.csproj | 4 - BizHawk.Util/7z.dll | Bin 878592 -> 0 bytes BizHawk.Util/BizHawk.Util.csproj | 166 ------------------ BizHawk.Util/Properties/AssemblyInfo.cs | 31 ---- BizHawk.Util/Properties/svnrev_template | 4 - BizHawk.sln | 16 -- 54 files changed, 48 insertions(+), 225 deletions(-) rename {BizHawk.Util => BizHawk.MultiClient}/7z/ArchiveEmulationStreamProxy.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/ArchiveExtractCallback.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/ArchiveOpenCallback.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/ArchiveUpdateCallback.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/COM.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/Common.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/EventArgs.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/Exceptions.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/FileSignatureChecker.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/Formats.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/LibraryFeature.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/LibraryManager.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/LzmaDecodeStream.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/LzmaEncodeStream.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/LzmaProgressCallback.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/NativeMethods.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/SevenZipCompressor.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/SevenZipCompressorAsynchronous.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/SevenZipExtractor.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/SevenZipExtractorAsynchronous.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/SevenZipSfx.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/StreamWrappers.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/arch/Test.bzip2.7z (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/arch/Test.lzma.7z (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/arch/Test.lzma2.7z (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/arch/Test.ppmd.7z (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/arch/Test.rar (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/arch/Test.tar (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/arch/Test.txt (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/arch/Test.txt.bz2 (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/arch/Test.txt.gz (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/arch/Test.txt.xz (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/arch/Test.zip (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/sdk/Common/CRC.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/sdk/Common/InBuffer.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/sdk/Common/OutBuffer.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/sdk/Compress/LZ/IMatchFinder.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/sdk/Compress/LZ/LzBinTree.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/sdk/Compress/LZ/LzInWindow.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/sdk/Compress/LZ/LzOutWindow.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/sdk/Compress/LZMA/LzmaBase.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/sdk/Compress/LZMA/LzmaDecoder.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/sdk/Compress/LZMA/LzmaEncoder.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/sdk/Compress/RangeCoder/RangeCoder.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/sdk/Compress/RangeCoder/RangeCoderBit.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/sdk/Compress/RangeCoder/RangeCoderBitTree.cs (100%) rename {BizHawk.Util => BizHawk.MultiClient}/7z/sdk/ICoder.cs (100%) delete mode 100644 BizHawk.Util/7z.dll delete mode 100644 BizHawk.Util/BizHawk.Util.csproj delete mode 100644 BizHawk.Util/Properties/AssemblyInfo.cs delete mode 100644 BizHawk.Util/Properties/svnrev_template diff --git a/BizHawk.Util/7z/ArchiveEmulationStreamProxy.cs b/BizHawk.MultiClient/7z/ArchiveEmulationStreamProxy.cs similarity index 100% rename from BizHawk.Util/7z/ArchiveEmulationStreamProxy.cs rename to BizHawk.MultiClient/7z/ArchiveEmulationStreamProxy.cs diff --git a/BizHawk.Util/7z/ArchiveExtractCallback.cs b/BizHawk.MultiClient/7z/ArchiveExtractCallback.cs similarity index 100% rename from BizHawk.Util/7z/ArchiveExtractCallback.cs rename to BizHawk.MultiClient/7z/ArchiveExtractCallback.cs diff --git a/BizHawk.Util/7z/ArchiveOpenCallback.cs b/BizHawk.MultiClient/7z/ArchiveOpenCallback.cs similarity index 100% rename from BizHawk.Util/7z/ArchiveOpenCallback.cs rename to BizHawk.MultiClient/7z/ArchiveOpenCallback.cs diff --git a/BizHawk.Util/7z/ArchiveUpdateCallback.cs b/BizHawk.MultiClient/7z/ArchiveUpdateCallback.cs similarity index 100% rename from BizHawk.Util/7z/ArchiveUpdateCallback.cs rename to BizHawk.MultiClient/7z/ArchiveUpdateCallback.cs diff --git a/BizHawk.Util/7z/COM.cs b/BizHawk.MultiClient/7z/COM.cs similarity index 100% rename from BizHawk.Util/7z/COM.cs rename to BizHawk.MultiClient/7z/COM.cs diff --git a/BizHawk.Util/7z/Common.cs b/BizHawk.MultiClient/7z/Common.cs similarity index 100% rename from BizHawk.Util/7z/Common.cs rename to BizHawk.MultiClient/7z/Common.cs diff --git a/BizHawk.Util/7z/EventArgs.cs b/BizHawk.MultiClient/7z/EventArgs.cs similarity index 100% rename from BizHawk.Util/7z/EventArgs.cs rename to BizHawk.MultiClient/7z/EventArgs.cs diff --git a/BizHawk.Util/7z/Exceptions.cs b/BizHawk.MultiClient/7z/Exceptions.cs similarity index 100% rename from BizHawk.Util/7z/Exceptions.cs rename to BizHawk.MultiClient/7z/Exceptions.cs diff --git a/BizHawk.Util/7z/FileSignatureChecker.cs b/BizHawk.MultiClient/7z/FileSignatureChecker.cs similarity index 100% rename from BizHawk.Util/7z/FileSignatureChecker.cs rename to BizHawk.MultiClient/7z/FileSignatureChecker.cs diff --git a/BizHawk.Util/7z/Formats.cs b/BizHawk.MultiClient/7z/Formats.cs similarity index 100% rename from BizHawk.Util/7z/Formats.cs rename to BizHawk.MultiClient/7z/Formats.cs diff --git a/BizHawk.Util/7z/LibraryFeature.cs b/BizHawk.MultiClient/7z/LibraryFeature.cs similarity index 100% rename from BizHawk.Util/7z/LibraryFeature.cs rename to BizHawk.MultiClient/7z/LibraryFeature.cs diff --git a/BizHawk.Util/7z/LibraryManager.cs b/BizHawk.MultiClient/7z/LibraryManager.cs similarity index 100% rename from BizHawk.Util/7z/LibraryManager.cs rename to BizHawk.MultiClient/7z/LibraryManager.cs diff --git a/BizHawk.Util/7z/LzmaDecodeStream.cs b/BizHawk.MultiClient/7z/LzmaDecodeStream.cs similarity index 100% rename from BizHawk.Util/7z/LzmaDecodeStream.cs rename to BizHawk.MultiClient/7z/LzmaDecodeStream.cs diff --git a/BizHawk.Util/7z/LzmaEncodeStream.cs b/BizHawk.MultiClient/7z/LzmaEncodeStream.cs similarity index 100% rename from BizHawk.Util/7z/LzmaEncodeStream.cs rename to BizHawk.MultiClient/7z/LzmaEncodeStream.cs diff --git a/BizHawk.Util/7z/LzmaProgressCallback.cs b/BizHawk.MultiClient/7z/LzmaProgressCallback.cs similarity index 100% rename from BizHawk.Util/7z/LzmaProgressCallback.cs rename to BizHawk.MultiClient/7z/LzmaProgressCallback.cs diff --git a/BizHawk.Util/7z/NativeMethods.cs b/BizHawk.MultiClient/7z/NativeMethods.cs similarity index 100% rename from BizHawk.Util/7z/NativeMethods.cs rename to BizHawk.MultiClient/7z/NativeMethods.cs diff --git a/BizHawk.Util/7z/SevenZipCompressor.cs b/BizHawk.MultiClient/7z/SevenZipCompressor.cs similarity index 100% rename from BizHawk.Util/7z/SevenZipCompressor.cs rename to BizHawk.MultiClient/7z/SevenZipCompressor.cs diff --git a/BizHawk.Util/7z/SevenZipCompressorAsynchronous.cs b/BizHawk.MultiClient/7z/SevenZipCompressorAsynchronous.cs similarity index 100% rename from BizHawk.Util/7z/SevenZipCompressorAsynchronous.cs rename to BizHawk.MultiClient/7z/SevenZipCompressorAsynchronous.cs diff --git a/BizHawk.Util/7z/SevenZipExtractor.cs b/BizHawk.MultiClient/7z/SevenZipExtractor.cs similarity index 100% rename from BizHawk.Util/7z/SevenZipExtractor.cs rename to BizHawk.MultiClient/7z/SevenZipExtractor.cs diff --git a/BizHawk.Util/7z/SevenZipExtractorAsynchronous.cs b/BizHawk.MultiClient/7z/SevenZipExtractorAsynchronous.cs similarity index 100% rename from BizHawk.Util/7z/SevenZipExtractorAsynchronous.cs rename to BizHawk.MultiClient/7z/SevenZipExtractorAsynchronous.cs diff --git a/BizHawk.Util/7z/SevenZipSfx.cs b/BizHawk.MultiClient/7z/SevenZipSfx.cs similarity index 100% rename from BizHawk.Util/7z/SevenZipSfx.cs rename to BizHawk.MultiClient/7z/SevenZipSfx.cs diff --git a/BizHawk.Util/7z/StreamWrappers.cs b/BizHawk.MultiClient/7z/StreamWrappers.cs similarity index 100% rename from BizHawk.Util/7z/StreamWrappers.cs rename to BizHawk.MultiClient/7z/StreamWrappers.cs diff --git a/BizHawk.Util/7z/arch/Test.bzip2.7z b/BizHawk.MultiClient/7z/arch/Test.bzip2.7z similarity index 100% rename from BizHawk.Util/7z/arch/Test.bzip2.7z rename to BizHawk.MultiClient/7z/arch/Test.bzip2.7z diff --git a/BizHawk.Util/7z/arch/Test.lzma.7z b/BizHawk.MultiClient/7z/arch/Test.lzma.7z similarity index 100% rename from BizHawk.Util/7z/arch/Test.lzma.7z rename to BizHawk.MultiClient/7z/arch/Test.lzma.7z diff --git a/BizHawk.Util/7z/arch/Test.lzma2.7z b/BizHawk.MultiClient/7z/arch/Test.lzma2.7z similarity index 100% rename from BizHawk.Util/7z/arch/Test.lzma2.7z rename to BizHawk.MultiClient/7z/arch/Test.lzma2.7z diff --git a/BizHawk.Util/7z/arch/Test.ppmd.7z b/BizHawk.MultiClient/7z/arch/Test.ppmd.7z similarity index 100% rename from BizHawk.Util/7z/arch/Test.ppmd.7z rename to BizHawk.MultiClient/7z/arch/Test.ppmd.7z diff --git a/BizHawk.Util/7z/arch/Test.rar b/BizHawk.MultiClient/7z/arch/Test.rar similarity index 100% rename from BizHawk.Util/7z/arch/Test.rar rename to BizHawk.MultiClient/7z/arch/Test.rar diff --git a/BizHawk.Util/7z/arch/Test.tar b/BizHawk.MultiClient/7z/arch/Test.tar similarity index 100% rename from BizHawk.Util/7z/arch/Test.tar rename to BizHawk.MultiClient/7z/arch/Test.tar diff --git a/BizHawk.Util/7z/arch/Test.txt b/BizHawk.MultiClient/7z/arch/Test.txt similarity index 100% rename from BizHawk.Util/7z/arch/Test.txt rename to BizHawk.MultiClient/7z/arch/Test.txt diff --git a/BizHawk.Util/7z/arch/Test.txt.bz2 b/BizHawk.MultiClient/7z/arch/Test.txt.bz2 similarity index 100% rename from BizHawk.Util/7z/arch/Test.txt.bz2 rename to BizHawk.MultiClient/7z/arch/Test.txt.bz2 diff --git a/BizHawk.Util/7z/arch/Test.txt.gz b/BizHawk.MultiClient/7z/arch/Test.txt.gz similarity index 100% rename from BizHawk.Util/7z/arch/Test.txt.gz rename to BizHawk.MultiClient/7z/arch/Test.txt.gz diff --git a/BizHawk.Util/7z/arch/Test.txt.xz b/BizHawk.MultiClient/7z/arch/Test.txt.xz similarity index 100% rename from BizHawk.Util/7z/arch/Test.txt.xz rename to BizHawk.MultiClient/7z/arch/Test.txt.xz diff --git a/BizHawk.Util/7z/arch/Test.zip b/BizHawk.MultiClient/7z/arch/Test.zip similarity index 100% rename from BizHawk.Util/7z/arch/Test.zip rename to BizHawk.MultiClient/7z/arch/Test.zip diff --git a/BizHawk.Util/7z/sdk/Common/CRC.cs b/BizHawk.MultiClient/7z/sdk/Common/CRC.cs similarity index 100% rename from BizHawk.Util/7z/sdk/Common/CRC.cs rename to BizHawk.MultiClient/7z/sdk/Common/CRC.cs diff --git a/BizHawk.Util/7z/sdk/Common/InBuffer.cs b/BizHawk.MultiClient/7z/sdk/Common/InBuffer.cs similarity index 100% rename from BizHawk.Util/7z/sdk/Common/InBuffer.cs rename to BizHawk.MultiClient/7z/sdk/Common/InBuffer.cs diff --git a/BizHawk.Util/7z/sdk/Common/OutBuffer.cs b/BizHawk.MultiClient/7z/sdk/Common/OutBuffer.cs similarity index 100% rename from BizHawk.Util/7z/sdk/Common/OutBuffer.cs rename to BizHawk.MultiClient/7z/sdk/Common/OutBuffer.cs diff --git a/BizHawk.Util/7z/sdk/Compress/LZ/IMatchFinder.cs b/BizHawk.MultiClient/7z/sdk/Compress/LZ/IMatchFinder.cs similarity index 100% rename from BizHawk.Util/7z/sdk/Compress/LZ/IMatchFinder.cs rename to BizHawk.MultiClient/7z/sdk/Compress/LZ/IMatchFinder.cs diff --git a/BizHawk.Util/7z/sdk/Compress/LZ/LzBinTree.cs b/BizHawk.MultiClient/7z/sdk/Compress/LZ/LzBinTree.cs similarity index 100% rename from BizHawk.Util/7z/sdk/Compress/LZ/LzBinTree.cs rename to BizHawk.MultiClient/7z/sdk/Compress/LZ/LzBinTree.cs diff --git a/BizHawk.Util/7z/sdk/Compress/LZ/LzInWindow.cs b/BizHawk.MultiClient/7z/sdk/Compress/LZ/LzInWindow.cs similarity index 100% rename from BizHawk.Util/7z/sdk/Compress/LZ/LzInWindow.cs rename to BizHawk.MultiClient/7z/sdk/Compress/LZ/LzInWindow.cs diff --git a/BizHawk.Util/7z/sdk/Compress/LZ/LzOutWindow.cs b/BizHawk.MultiClient/7z/sdk/Compress/LZ/LzOutWindow.cs similarity index 100% rename from BizHawk.Util/7z/sdk/Compress/LZ/LzOutWindow.cs rename to BizHawk.MultiClient/7z/sdk/Compress/LZ/LzOutWindow.cs diff --git a/BizHawk.Util/7z/sdk/Compress/LZMA/LzmaBase.cs b/BizHawk.MultiClient/7z/sdk/Compress/LZMA/LzmaBase.cs similarity index 100% rename from BizHawk.Util/7z/sdk/Compress/LZMA/LzmaBase.cs rename to BizHawk.MultiClient/7z/sdk/Compress/LZMA/LzmaBase.cs diff --git a/BizHawk.Util/7z/sdk/Compress/LZMA/LzmaDecoder.cs b/BizHawk.MultiClient/7z/sdk/Compress/LZMA/LzmaDecoder.cs similarity index 100% rename from BizHawk.Util/7z/sdk/Compress/LZMA/LzmaDecoder.cs rename to BizHawk.MultiClient/7z/sdk/Compress/LZMA/LzmaDecoder.cs diff --git a/BizHawk.Util/7z/sdk/Compress/LZMA/LzmaEncoder.cs b/BizHawk.MultiClient/7z/sdk/Compress/LZMA/LzmaEncoder.cs similarity index 100% rename from BizHawk.Util/7z/sdk/Compress/LZMA/LzmaEncoder.cs rename to BizHawk.MultiClient/7z/sdk/Compress/LZMA/LzmaEncoder.cs diff --git a/BizHawk.Util/7z/sdk/Compress/RangeCoder/RangeCoder.cs b/BizHawk.MultiClient/7z/sdk/Compress/RangeCoder/RangeCoder.cs similarity index 100% rename from BizHawk.Util/7z/sdk/Compress/RangeCoder/RangeCoder.cs rename to BizHawk.MultiClient/7z/sdk/Compress/RangeCoder/RangeCoder.cs diff --git a/BizHawk.Util/7z/sdk/Compress/RangeCoder/RangeCoderBit.cs b/BizHawk.MultiClient/7z/sdk/Compress/RangeCoder/RangeCoderBit.cs similarity index 100% rename from BizHawk.Util/7z/sdk/Compress/RangeCoder/RangeCoderBit.cs rename to BizHawk.MultiClient/7z/sdk/Compress/RangeCoder/RangeCoderBit.cs diff --git a/BizHawk.Util/7z/sdk/Compress/RangeCoder/RangeCoderBitTree.cs b/BizHawk.MultiClient/7z/sdk/Compress/RangeCoder/RangeCoderBitTree.cs similarity index 100% rename from BizHawk.Util/7z/sdk/Compress/RangeCoder/RangeCoderBitTree.cs rename to BizHawk.MultiClient/7z/sdk/Compress/RangeCoder/RangeCoderBitTree.cs diff --git a/BizHawk.Util/7z/sdk/ICoder.cs b/BizHawk.MultiClient/7z/sdk/ICoder.cs similarity index 100% rename from BizHawk.Util/7z/sdk/ICoder.cs rename to BizHawk.MultiClient/7z/sdk/ICoder.cs diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj index ab7f10487e..3b07750f91 100644 --- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj +++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj @@ -60,6 +60,7 @@ true false AllRules.ruleset + WINDOWS;DOTNET20;UNMANAGED;COMPRESS true @@ -104,6 +105,42 @@ VersionInfo.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Form @@ -955,6 +992,16 @@ WatchEditor.cs + + + + + + + + + + SettingsSingleFileGenerator Settings.Designer.cs @@ -999,10 +1046,6 @@ {197D4314-8A9F-49BA-977D-54ACEFAEB6BA} BizHawk.Emulation - - {EE135301-08B3-4EFC-A61C-1C53E1C65CB9} - BizHawk.Util - @@ -1178,6 +1221,7 @@ + diff --git a/BizHawk.PCE_Debugger/BizHawk.PCE_Debugger.csproj b/BizHawk.PCE_Debugger/BizHawk.PCE_Debugger.csproj index e73df4edeb..4ba7913714 100644 --- a/BizHawk.PCE_Debugger/BizHawk.PCE_Debugger.csproj +++ b/BizHawk.PCE_Debugger/BizHawk.PCE_Debugger.csproj @@ -81,10 +81,6 @@ {197D4314-8A9F-49BA-977D-54ACEFAEB6BA} BizHawk.Emulation - - {EE135301-08B3-4EFC-A61C-1C53E1C65CB9} - BizHawk.Util - - \ No newline at end of file diff --git a/BizHawk.Util/Properties/AssemblyInfo.cs b/BizHawk.Util/Properties/AssemblyInfo.cs deleted file mode 100644 index c78a21b9f3..0000000000 --- a/BizHawk.Util/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,31 +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.Util")] -[assembly: AssemblyDescription("http://code.google.com/p/bizhawk")] -[assembly: AssemblyCompany("BizHawk")] - -// 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("53c04c97-2bac-4fa9-af11-2540b483674f")] - -// 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.Util/Properties/svnrev_template b/BizHawk.Util/Properties/svnrev_template deleted file mode 100644 index 31c5a95c9c..0000000000 --- a/BizHawk.Util/Properties/svnrev_template +++ /dev/null @@ -1,4 +0,0 @@ -static class SubWCRev -{ - public const string SVN_REV = "$WCREV$"; -} diff --git a/BizHawk.sln b/BizHawk.sln index 087f95c8a0..0355e2d56d 100644 --- a/BizHawk.sln +++ b/BizHawk.sln @@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Emulation", "BizHawk.Emulation\BizHawk.Emulation.csproj", "{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Util", "BizHawk.Util\BizHawk.Util.csproj", "{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.MultiClient", "BizHawk.MultiClient\BizHawk.MultiClient.csproj", "{DD448B37-BA3F-4544-9754-5406E8094723}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscoHawk", "DiscoHawk\DiscoHawk.csproj", "{C4366030-6D03-424B-AE53-F4F43BB217C3}" @@ -39,20 +37,6 @@ Global {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Win32.ActiveCfg = Release|Any CPU {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Win32.Build.0 = Release|Any CPU {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|x86.ActiveCfg = Release|Any CPU - {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|Win32.ActiveCfg = Debug|Any CPU - {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|Win32.Build.0 = Debug|Any CPU - {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|x86.ActiveCfg = Debug|Any CPU - {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|Any CPU.Build.0 = Release|Any CPU - {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|Win32.ActiveCfg = Release|Any CPU - {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|Win32.Build.0 = Release|Any CPU - {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|x86.ActiveCfg = Release|Any CPU {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Any CPU.Build.0 = Debug|Any CPU {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU