diff --git a/.gitignore b/.gitignore index 93bf19e214d..99a0db4aaef 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ _ReSharper*/ /Media /setenv.bat /.nuget +.vs/ diff --git a/SS14.Client/SpaceStation14.csproj b/SS14.Client/SpaceStation14.csproj index b83a637f99e..3ea7b07e804 100644 --- a/SS14.Client/SpaceStation14.csproj +++ b/SS14.Client/SpaceStation14.csproj @@ -75,9 +75,9 @@ false - - Microsoft.Diagnostics.Runtime - False + + ..\packages\Microsoft.Diagnostics.Runtime.0.8.31-beta\lib\net40\Microsoft.Diagnostics.Runtime.dll + True @@ -259,6 +259,7 @@ Resources.resx True + diff --git a/SS14.Client/packages.config b/SS14.Client/packages.config new file mode 100644 index 00000000000..82a17ff6689 --- /dev/null +++ b/SS14.Client/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/SS14.Shared/Utility/BitStream.cs b/SS14.Shared/Utility/BitStream.cs index 84bb4669014..baa8246c0a0 100644 --- a/SS14.Shared/Utility/BitStream.cs +++ b/SS14.Shared/Utility/BitStream.cs @@ -37,6 +37,7 @@ using System.Resources; using System.Security.Cryptography; using System.Text; +[assembly: CLSCompliant(false)] namespace BKSystem.IO { @@ -1231,7 +1232,7 @@ public override void Write(byte[] bits, int offset, int count) /// from. /// /// - [CLSCompliant(false)] + public virtual void Write(sbyte bits) { Write(bits, 0, SizeOfByte); @@ -1259,7 +1260,7 @@ public virtual void Write(sbyte bits) /// /// /// - [CLSCompliant(false)] + public virtual void Write(sbyte bits, int bitIndex, int count) { // Convert the value to a byte @@ -1286,7 +1287,7 @@ public virtual void Write(sbyte bits, int bitIndex, int count) /// A array specifying the buffer to write data from. /// /// - [CLSCompliant(false)] + public virtual void Write(sbyte[] bits) { if (!_blnIsOpen) @@ -1330,7 +1331,7 @@ public virtual void Write(sbyte[] bits) /// /// /// - [CLSCompliant(false)] + public virtual void Write(sbyte[] bits, int offset, int count) { if (!_blnIsOpen) @@ -1388,7 +1389,7 @@ public override void WriteByte(byte value) /// from. /// /// - [CLSCompliant(false)] + public virtual void Write(char bits) { Write(bits, 0, SizeOfChar); @@ -1426,7 +1427,7 @@ public virtual void Write(char bits) /// /// /// - [CLSCompliant(false)] + public virtual void Write(char bits, int bitIndex, int count) { if (!_blnIsOpen) @@ -1467,7 +1468,7 @@ public virtual void Write(char bits, int bitIndex, int count) /// An array specifying the buffer to write data from. /// /// - [CLSCompliant(false)] + public virtual void Write(char[] bits) { if (!_blnIsOpen) @@ -1511,7 +1512,7 @@ public virtual void Write(char[] bits) /// /// /// - [CLSCompliant(false)] + public virtual void Write(char[] bits, int offset, int count) { if (!_blnIsOpen) @@ -1547,7 +1548,7 @@ public virtual void Write(char[] bits, int offset, int count) /// from. /// /// - [CLSCompliant(false)] + public virtual void Write(ushort bits) { Write(bits, 0, SizeOfUInt16); @@ -1585,7 +1586,7 @@ public virtual void Write(ushort bits) /// /// /// - [CLSCompliant(false)] + public virtual void Write(ushort bits, int bitIndex, int count) { if (!_blnIsOpen) @@ -1626,7 +1627,7 @@ public virtual void Write(ushort bits, int bitIndex, int count) /// An array specifying the buffer to write data from. /// /// - [CLSCompliant(false)] + public virtual void Write(ushort[] bits) { if (!_blnIsOpen) @@ -1670,7 +1671,7 @@ public virtual void Write(ushort[] bits) /// /// /// - [CLSCompliant(false)] + public virtual void Write(ushort[] bits, int offset, int count) { if (!_blnIsOpen) @@ -1842,7 +1843,7 @@ public virtual void Write(short[] bits, int offset, int count) /// from. /// /// - [CLSCompliant(false)] + public virtual void Write(uint bits) { Write(bits, 0, SizeOfUInt32); @@ -1880,7 +1881,7 @@ public virtual void Write(uint bits) /// /// /// - [CLSCompliant(false)] + public virtual void Write(uint bits, int bitIndex, int count) { if (!_blnIsOpen) @@ -1920,7 +1921,7 @@ public virtual void Write(uint bits, int bitIndex, int count) /// An array specifying the buffer to write data from. /// /// - [CLSCompliant(false)] + public virtual void Write(uint[] bits) { if (!_blnIsOpen) @@ -1964,7 +1965,7 @@ public virtual void Write(uint[] bits) /// /// /// - [CLSCompliant(false)] + public virtual void Write(uint[] bits, int offset, int count) { if (!_blnIsOpen) @@ -2265,7 +2266,7 @@ public virtual void Write(float[] bits, int offset, int count) /// from. /// /// - [CLSCompliant(false)] + public virtual void Write(ulong bits) { Write(bits, 0, SizeOfUInt64); @@ -2305,7 +2306,7 @@ public virtual void Write(ulong bits) /// /// /// - [CLSCompliant(false)] + public virtual void Write(ulong bits, int bitIndex, int count) { if (!_blnIsOpen) @@ -2360,7 +2361,7 @@ public virtual void Write(ulong bits, int bitIndex, int count) /// An array specifying the buffer to write data from. /// /// - [CLSCompliant(false)] + public virtual void Write(ulong[] bits) { if (!_blnIsOpen) @@ -2404,7 +2405,7 @@ public virtual void Write(ulong[] bits) /// /// /// - [CLSCompliant(false)] + public virtual void Write(ulong[] bits, int offset, int count) { if (!_blnIsOpen) @@ -3197,7 +3198,7 @@ public override int Read(byte[] bits, int offset, int count) /// /// /// - [CLSCompliant(false)] + public virtual int Read(out sbyte bits) { return Read(out bits, 0, SizeOfByte); @@ -3234,7 +3235,7 @@ public virtual int Read(out sbyte bits) /// /// /// - [CLSCompliant(false)] + public virtual int Read(out sbyte bits, int bitIndex, int count) { byte bytBits = 0; @@ -3272,7 +3273,7 @@ public virtual int Read(out sbyte bits, int bitIndex, int count) /// /// /// - [CLSCompliant(false)] + public virtual int Read(sbyte[] bits) { if (!_blnIsOpen) @@ -3326,7 +3327,7 @@ public virtual int Read(sbyte[] bits) /// /// /// - [CLSCompliant(false)] + public virtual int Read(sbyte[] bits, int offset, int count) { if (!_blnIsOpen) @@ -3624,7 +3625,7 @@ public virtual int Read(char[] bits, int offset, int count) /// /// /// - [CLSCompliant(false)] + public virtual int Read(out ushort bits) { return Read(out bits, 0, SizeOfUInt16); @@ -3671,7 +3672,7 @@ public virtual int Read(out ushort bits) /// /// /// - [CLSCompliant(false)] + public virtual int Read(out ushort bits, int bitIndex, int count) { if (!_blnIsOpen) @@ -3726,7 +3727,7 @@ public virtual int Read(out ushort bits, int bitIndex, int count) /// /// /// - [CLSCompliant(false)] + public virtual int Read(ushort[] bits) { if (!_blnIsOpen) @@ -3780,7 +3781,7 @@ public virtual int Read(ushort[] bits) /// /// /// - [CLSCompliant(false)] + public virtual int Read(ushort[] bits, int offset, int count) { if (!_blnIsOpen) @@ -4009,7 +4010,7 @@ public virtual int Read(short[] bits, int offset, int count) /// /// /// - [CLSCompliant(false)] + public virtual int Read(out uint bits) { return Read(out bits, 0, SizeOfUInt32); @@ -4056,7 +4057,7 @@ public virtual int Read(out uint bits) /// /// /// - [CLSCompliant(false)] + public virtual int Read(out uint bits, int bitIndex, int count) { if (!_blnIsOpen) @@ -4111,7 +4112,7 @@ public virtual int Read(out uint bits, int bitIndex, int count) /// /// /// - [CLSCompliant(false)] + public virtual int Read(uint[] bits) { if (!_blnIsOpen) @@ -4165,7 +4166,7 @@ public virtual int Read(uint[] bits) /// /// /// - [CLSCompliant(false)] + public virtual int Read(uint[] bits, int offset, int count) { if (!_blnIsOpen) @@ -4568,7 +4569,7 @@ public virtual int Read(float[] bits, int offset, int count) /// /// /// - [CLSCompliant(false)] + public virtual int Read(out ulong bits) { return Read(out bits, 0, SizeOfUInt64); @@ -4615,7 +4616,7 @@ public virtual int Read(out ulong bits) /// /// /// - [CLSCompliant(false)] + public virtual int Read(out ulong bits, int bitIndex, int count) { if (!_blnIsOpen) @@ -4686,7 +4687,7 @@ public virtual int Read(out ulong bits, int bitIndex, int count) /// /// /// - [CLSCompliant(false)] + public virtual int Read(ulong[] bits) { if (!_blnIsOpen) @@ -4740,7 +4741,7 @@ public virtual int Read(ulong[] bits) /// /// /// - [CLSCompliant(false)] + public virtual int Read(ulong[] bits, int offset, int count) { if (!_blnIsOpen) @@ -5593,7 +5594,7 @@ public static string ToString(byte bits) /// /// /// - [CLSCompliant(false)] + public static string ToString(sbyte bits) { var bytBits = (byte) bits; @@ -5668,7 +5669,7 @@ public static string ToString(char bits) /// /// /// - [CLSCompliant(false)] + public static string ToString(ushort bits) { var sBits = (short) bits; @@ -5743,7 +5744,7 @@ public static string ToString(short bits) /// /// /// - [CLSCompliant(false)] + public static string ToString(uint bits) { var sb = new StringBuilder(32); @@ -5818,7 +5819,7 @@ public static string ToString(int bits) /// /// /// - [CLSCompliant(false)] + public static string ToString(ulong bits) { var sb = new StringBuilder(64); @@ -6114,7 +6115,7 @@ public override void Close() /// /// The integer array from which this stream was created. /// - [CLSCompliant(false)] + public virtual uint[] GetBuffer() { return _auiBitBuffer;