From: Jens Geyer Date: Mon, 17 Mar 2014 20:50:39 +0000 (+0200) Subject: Fixed a bunch of inconsistent/wrong line endings in the C# part, no other changes X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=1c99e7079b45dde9dbb7197ceb337e42a550a84e;p=common%2Fthrift.git Fixed a bunch of inconsistent/wrong line endings in the C# part, no other changes --- diff --git a/lib/csharp/ThriftMSBuildTask/ThriftMSBuildTask.csproj b/lib/csharp/ThriftMSBuildTask/ThriftMSBuildTask.csproj index fc377a40..ae860815 100644 --- a/lib/csharp/ThriftMSBuildTask/ThriftMSBuildTask.csproj +++ b/lib/csharp/ThriftMSBuildTask/ThriftMSBuildTask.csproj @@ -1,4 +1,4 @@ - + - - - Debug - AnyCPU - 9.0.21022 - 2.0 - {EC0A0231-66EA-4593-A792-C6CA3BB8668E} - Library - Properties - ThriftMSBuildTask - ThriftMSBuildTask - v3.5 - 512 - - - 3.5 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - AllRules.ruleset - - - - - - - - 3.5 - - - 3.5 - - - 3.5 - - - - - - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - +--> + + + Debug + AnyCPU + 9.0.21022 + 2.0 + {EC0A0231-66EA-4593-A792-C6CA3BB8668E} + Library + Properties + ThriftMSBuildTask + ThriftMSBuildTask + v3.5 + 512 + + + 3.5 + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + AllRules.ruleset + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + AllRules.ruleset + + + + + + + + 3.5 + + + 3.5 + + + 3.5 + + + + + + + + + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + true + + + False + Windows Installer 3.1 + true + + + + --> \ No newline at end of file diff --git a/lib/csharp/src/Protocol/TBinaryProtocol.cs b/lib/csharp/src/Protocol/TBinaryProtocol.cs index 4bbd9ad1..2e86a708 100644 --- a/lib/csharp/src/Protocol/TBinaryProtocol.cs +++ b/lib/csharp/src/Protocol/TBinaryProtocol.cs @@ -337,14 +337,14 @@ namespace Thrift.Protocol { ReadAll(i32in, 0, 4); return (int)(((i32in[0] & 0xff) << 24) | ((i32in[1] & 0xff) << 16) | ((i32in[2] & 0xff) << 8) | ((i32in[3] & 0xff))); - } - -#pragma warning disable 675 - + } + +#pragma warning disable 675 + private byte[] i64in = new byte[8]; public override long ReadI64() { - ReadAll(i64in, 0, 8); + ReadAll(i64in, 0, 8); unchecked { return (long)( ((long)(i64in[0] & 0xff) << 56) | @@ -356,10 +356,10 @@ namespace Thrift.Protocol ((long)(i64in[6] & 0xff) << 8) | ((long)(i64in[7] & 0xff))); } - } - -#pragma warning restore 675 - + } + +#pragma warning restore 675 + public override double ReadDouble() { #if !SILVERLIGHT diff --git a/lib/csharp/src/Protocol/TCompactProtocol.cs b/lib/csharp/src/Protocol/TCompactProtocol.cs index a498577c..2c94c0c5 100644 --- a/lib/csharp/src/Protocol/TCompactProtocol.cs +++ b/lib/csharp/src/Protocol/TCompactProtocol.cs @@ -478,12 +478,12 @@ namespace Thrift.Protocol * Read a message header. */ public override TMessage ReadMessageBegin() - { + { byte protocolId = (byte)ReadByte(); if (protocolId != PROTOCOL_ID) { throw new TProtocolException("Expected protocol id " + PROTOCOL_ID.ToString("X") + " but got " + protocolId.ToString("X")); - } + } byte versionAndType = (byte)ReadByte(); byte version = (byte)(versionAndType & VERSION_MASK); if (version != VERSION) @@ -521,7 +521,7 @@ namespace Thrift.Protocol * Read a field header off the wire. */ public override TField ReadFieldBegin() - { + { byte type = (byte)ReadByte(); // if it's a stop, then we can return immediately, as the struct is over. @@ -566,7 +566,7 @@ namespace Thrift.Protocol */ public override TMap ReadMapBegin() { - int size = (int)ReadVarint32(); + int size = (int)ReadVarint32(); byte keyAndValueType = size == 0 ? (byte)0 : (byte)ReadByte(); return new TMap(getTType((byte)(keyAndValueType >> 4)), getTType((byte)(keyAndValueType & 0xf)), size); } @@ -578,7 +578,7 @@ namespace Thrift.Protocol * true size. */ public override TList ReadListBegin() - { + { byte size_and_type = (byte)ReadByte(); int size = (size_and_type >> 4) & 0x0f; if (size == 15) @@ -723,7 +723,7 @@ namespace Thrift.Protocol uint result = 0; int shift = 0; while (true) - { + { byte b = (byte)ReadByte(); result |= (uint)(b & 0x7f) << shift; if ((b & 0x80) != 0x80) break; @@ -741,7 +741,7 @@ namespace Thrift.Protocol int shift = 0; ulong result = 0; while (true) - { + { byte b = (byte)ReadByte(); result |= (ulong)(b & 0x7f) << shift; if ((b & 0x80) != 0x80) break; diff --git a/lib/csharp/src/Protocol/TProtocolDecorator.cs b/lib/csharp/src/Protocol/TProtocolDecorator.cs index e1977f53..218a5c11 100644 --- a/lib/csharp/src/Protocol/TProtocolDecorator.cs +++ b/lib/csharp/src/Protocol/TProtocolDecorator.cs @@ -1,262 +1,262 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - * Contains some contributions under the Thrift Software License. - * Please see doc/old-thrift-license.txt in the Thrift distribution for - * details. - */ - -using System; -using System.Text; -using Thrift.Transport; -using System.Collections.Generic; - -namespace Thrift.Protocol -{ - - /** - * TProtocolDecorator forwards all requests to an enclosed TProtocol instance, - * providing a way to author concise concrete decorator subclasses. While it has - * no abstract methods, it is marked abstract as a reminder that by itself, - * it does not modify the behaviour of the enclosed TProtocol. - * - * See p.175 of Design Patterns (by Gamma et al.) - * See TMultiplexedProtocol - */ - public abstract class TProtocolDecorator : TProtocol - { - private TProtocol WrappedProtocol; - - /** - * Encloses the specified protocol. - * @param protocol All operations will be forward to this protocol. Must be non-null. - */ - public TProtocolDecorator(TProtocol protocol) - : base( protocol.Transport) - { - - WrappedProtocol = protocol; - } - - public override void WriteMessageBegin(TMessage tMessage) - { - WrappedProtocol.WriteMessageBegin(tMessage); - } - - public override void WriteMessageEnd() - { - WrappedProtocol.WriteMessageEnd(); - } - - public override void WriteStructBegin(TStruct tStruct) - { - WrappedProtocol.WriteStructBegin(tStruct); - } - - public override void WriteStructEnd() - { - WrappedProtocol.WriteStructEnd(); - } - - public override void WriteFieldBegin(TField tField) - { - WrappedProtocol.WriteFieldBegin(tField); - } - - public override void WriteFieldEnd() - { - WrappedProtocol.WriteFieldEnd(); - } - - public override void WriteFieldStop() - { - WrappedProtocol.WriteFieldStop(); - } - - public override void WriteMapBegin(TMap tMap) - { - WrappedProtocol.WriteMapBegin(tMap); - } - - public override void WriteMapEnd() - { - WrappedProtocol.WriteMapEnd(); - } - - public override void WriteListBegin(TList tList) - { - WrappedProtocol.WriteListBegin(tList); - } - - public override void WriteListEnd() -{ - WrappedProtocol.WriteListEnd(); - } - - public override void WriteSetBegin(TSet tSet) - { - WrappedProtocol.WriteSetBegin(tSet); - } - - public override void WriteSetEnd() - { - WrappedProtocol.WriteSetEnd(); - } - - public override void WriteBool(bool b) - { - WrappedProtocol.WriteBool(b); - } - - public override void WriteByte(sbyte b) - { - WrappedProtocol.WriteByte(b); - } - - public override void WriteI16(short i) - { - WrappedProtocol.WriteI16(i); - } - - public override void WriteI32(int i) - { - WrappedProtocol.WriteI32(i); - } - - public override void WriteI64(long l) - { - WrappedProtocol.WriteI64(l); - } - - public override void WriteDouble(double v) - { - WrappedProtocol.WriteDouble(v); - } - - public override void WriteString(String s) - { - WrappedProtocol.WriteString(s); - } - - public override void WriteBinary(byte[] bytes) - { - WrappedProtocol.WriteBinary(bytes); - } - - public override TMessage ReadMessageBegin() - { - return WrappedProtocol.ReadMessageBegin(); - } - - public override void ReadMessageEnd() - { - WrappedProtocol.ReadMessageEnd(); - } - - public override TStruct ReadStructBegin() - { - return WrappedProtocol.ReadStructBegin(); - } - - public override void ReadStructEnd() - { - WrappedProtocol.ReadStructEnd(); - } - - public override TField ReadFieldBegin() - { - return WrappedProtocol.ReadFieldBegin(); - } - - public override void ReadFieldEnd() - { - WrappedProtocol.ReadFieldEnd(); - } - - public override TMap ReadMapBegin() - { - return WrappedProtocol.ReadMapBegin(); - } - - public override void ReadMapEnd() - { - WrappedProtocol.ReadMapEnd(); - } - - public override TList ReadListBegin() - { - return WrappedProtocol.ReadListBegin(); - } - - public override void ReadListEnd() - { - WrappedProtocol.ReadListEnd(); - } - - public override TSet ReadSetBegin() - { - return WrappedProtocol.ReadSetBegin(); - } - - public override void ReadSetEnd() - { - WrappedProtocol.ReadSetEnd(); - } - - public override bool ReadBool() - { - return WrappedProtocol.ReadBool(); - } - - public override sbyte ReadByte() - { - return WrappedProtocol.ReadByte(); - } - - public override short ReadI16() - { - return WrappedProtocol.ReadI16(); - } - - public override int ReadI32() - { - return WrappedProtocol.ReadI32(); - } - - public override long ReadI64() - { - return WrappedProtocol.ReadI64(); - } - - public override double ReadDouble() - { - return WrappedProtocol.ReadDouble(); - } - - public override String ReadString() - { - return WrappedProtocol.ReadString(); - } - - public override byte[] ReadBinary() - { - return WrappedProtocol.ReadBinary(); - } - } - -} +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + * Contains some contributions under the Thrift Software License. + * Please see doc/old-thrift-license.txt in the Thrift distribution for + * details. + */ + +using System; +using System.Text; +using Thrift.Transport; +using System.Collections.Generic; + +namespace Thrift.Protocol +{ + + /** + * TProtocolDecorator forwards all requests to an enclosed TProtocol instance, + * providing a way to author concise concrete decorator subclasses. While it has + * no abstract methods, it is marked abstract as a reminder that by itself, + * it does not modify the behaviour of the enclosed TProtocol. + * + * See p.175 of Design Patterns (by Gamma et al.) + * See TMultiplexedProtocol + */ + public abstract class TProtocolDecorator : TProtocol + { + private TProtocol WrappedProtocol; + + /** + * Encloses the specified protocol. + * @param protocol All operations will be forward to this protocol. Must be non-null. + */ + public TProtocolDecorator(TProtocol protocol) + : base( protocol.Transport) + { + + WrappedProtocol = protocol; + } + + public override void WriteMessageBegin(TMessage tMessage) + { + WrappedProtocol.WriteMessageBegin(tMessage); + } + + public override void WriteMessageEnd() + { + WrappedProtocol.WriteMessageEnd(); + } + + public override void WriteStructBegin(TStruct tStruct) + { + WrappedProtocol.WriteStructBegin(tStruct); + } + + public override void WriteStructEnd() + { + WrappedProtocol.WriteStructEnd(); + } + + public override void WriteFieldBegin(TField tField) + { + WrappedProtocol.WriteFieldBegin(tField); + } + + public override void WriteFieldEnd() + { + WrappedProtocol.WriteFieldEnd(); + } + + public override void WriteFieldStop() + { + WrappedProtocol.WriteFieldStop(); + } + + public override void WriteMapBegin(TMap tMap) + { + WrappedProtocol.WriteMapBegin(tMap); + } + + public override void WriteMapEnd() + { + WrappedProtocol.WriteMapEnd(); + } + + public override void WriteListBegin(TList tList) + { + WrappedProtocol.WriteListBegin(tList); + } + + public override void WriteListEnd() +{ + WrappedProtocol.WriteListEnd(); + } + + public override void WriteSetBegin(TSet tSet) + { + WrappedProtocol.WriteSetBegin(tSet); + } + + public override void WriteSetEnd() + { + WrappedProtocol.WriteSetEnd(); + } + + public override void WriteBool(bool b) + { + WrappedProtocol.WriteBool(b); + } + + public override void WriteByte(sbyte b) + { + WrappedProtocol.WriteByte(b); + } + + public override void WriteI16(short i) + { + WrappedProtocol.WriteI16(i); + } + + public override void WriteI32(int i) + { + WrappedProtocol.WriteI32(i); + } + + public override void WriteI64(long l) + { + WrappedProtocol.WriteI64(l); + } + + public override void WriteDouble(double v) + { + WrappedProtocol.WriteDouble(v); + } + + public override void WriteString(String s) + { + WrappedProtocol.WriteString(s); + } + + public override void WriteBinary(byte[] bytes) + { + WrappedProtocol.WriteBinary(bytes); + } + + public override TMessage ReadMessageBegin() + { + return WrappedProtocol.ReadMessageBegin(); + } + + public override void ReadMessageEnd() + { + WrappedProtocol.ReadMessageEnd(); + } + + public override TStruct ReadStructBegin() + { + return WrappedProtocol.ReadStructBegin(); + } + + public override void ReadStructEnd() + { + WrappedProtocol.ReadStructEnd(); + } + + public override TField ReadFieldBegin() + { + return WrappedProtocol.ReadFieldBegin(); + } + + public override void ReadFieldEnd() + { + WrappedProtocol.ReadFieldEnd(); + } + + public override TMap ReadMapBegin() + { + return WrappedProtocol.ReadMapBegin(); + } + + public override void ReadMapEnd() + { + WrappedProtocol.ReadMapEnd(); + } + + public override TList ReadListBegin() + { + return WrappedProtocol.ReadListBegin(); + } + + public override void ReadListEnd() + { + WrappedProtocol.ReadListEnd(); + } + + public override TSet ReadSetBegin() + { + return WrappedProtocol.ReadSetBegin(); + } + + public override void ReadSetEnd() + { + WrappedProtocol.ReadSetEnd(); + } + + public override bool ReadBool() + { + return WrappedProtocol.ReadBool(); + } + + public override sbyte ReadByte() + { + return WrappedProtocol.ReadByte(); + } + + public override short ReadI16() + { + return WrappedProtocol.ReadI16(); + } + + public override int ReadI32() + { + return WrappedProtocol.ReadI32(); + } + + public override long ReadI64() + { + return WrappedProtocol.ReadI64(); + } + + public override double ReadDouble() + { + return WrappedProtocol.ReadDouble(); + } + + public override String ReadString() + { + return WrappedProtocol.ReadString(); + } + + public override byte[] ReadBinary() + { + return WrappedProtocol.ReadBinary(); + } + } + +} diff --git a/lib/csharp/src/Server/TServer.cs b/lib/csharp/src/Server/TServer.cs index 19f11e4a..271b0c4c 100644 --- a/lib/csharp/src/Server/TServer.cs +++ b/lib/csharp/src/Server/TServer.cs @@ -60,11 +60,11 @@ namespace Thrift.Server */ protected TProtocolFactory outputProtocolFactory; - public delegate void LogDelegate(string str); - private LogDelegate _logDelegate; - protected LogDelegate logDelegate - { - get { return _logDelegate; } + public delegate void LogDelegate(string str); + private LogDelegate _logDelegate; + protected LogDelegate logDelegate + { + get { return _logDelegate; } set { _logDelegate = (value != null) ? value : DefaultLogDelegate; } } diff --git a/lib/csharp/src/Thrift.csproj b/lib/csharp/src/Thrift.csproj index 439b960f..58d37934 100644 --- a/lib/csharp/src/Thrift.csproj +++ b/lib/csharp/src/Thrift.csproj @@ -1,145 +1,145 @@ - - - - - Debug - AnyCPU - {499EB63C-D74C-47E8-AE48-A2FC94538E9D} - 9.0.21022 - 2.0 - Library - false - Thrift - v3.5 - 512 - Thrift - - - 3.5 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - AllRules.ruleset - - - - - 3.5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - - + + + + + Debug + AnyCPU + {499EB63C-D74C-47E8-AE48-A2FC94538E9D} + 9.0.21022 + 2.0 + Library + false + Thrift + v3.5 + 512 + Thrift + + + 3.5 + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + AllRules.ruleset + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + AllRules.ruleset + + + + + 3.5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + true + + + False + Windows Installer 3.1 + true + + + + + + + diff --git a/lib/csharp/test/JSON/JSONTest.csproj b/lib/csharp/test/JSON/JSONTest.csproj index 73303b84..510b92bc 100644 --- a/lib/csharp/test/JSON/JSONTest.csproj +++ b/lib/csharp/test/JSON/JSONTest.csproj @@ -1,67 +1,67 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {E37A0034-DCBF-4886-A0DA-25A03D12D975} - Exe - Properties - JSONTest - JSONTest - v4.0 - - - 512 - - - x86 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - x86 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - {499EB63C-D74C-47E8-AE48-A2FC94538E9D} - Thrift - - - - + + + + Debug + x86 + 8.0.30703 + 2.0 + {E37A0034-DCBF-4886-A0DA-25A03D12D975} + Exe + Properties + JSONTest + JSONTest + v4.0 + + + 512 + + + x86 + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + x86 + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + {499EB63C-D74C-47E8-AE48-A2FC94538E9D} + Thrift + + + + \ No newline at end of file diff --git a/lib/csharp/test/JSON/Properties/AssemblyInfo.cs b/lib/csharp/test/JSON/Properties/AssemblyInfo.cs index a60ebc1e..96e9ccff 100644 --- a/lib/csharp/test/JSON/Properties/AssemblyInfo.cs +++ b/lib/csharp/test/JSON/Properties/AssemblyInfo.cs @@ -1,36 +1,36 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// Allgemeine Informationen über eine Assembly werden über die folgenden -// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, -// die mit einer Assembly verknüpft sind. -[assembly: AssemblyTitle("JSONTest")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("JSONTest")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar -// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von -// COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest. -[assembly: ComVisible(false)] - -// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird -[assembly: Guid("2b2e7d56-3e65-4368-92d7-e34d56b7105e")] - -// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: -// -// Hauptversion -// Nebenversion -// Buildnummer -// Revision -// -// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern -// übernehmen, indem Sie "*" eingeben: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// Allgemeine Informationen über eine Assembly werden über die folgenden +// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, +// die mit einer Assembly verknüpft sind. +[assembly: AssemblyTitle("JSONTest")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("JSONTest")] +[assembly: AssemblyCopyright("Copyright © 2014")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar +// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von +// COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest. +[assembly: ComVisible(false)] + +// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird +[assembly: Guid("2b2e7d56-3e65-4368-92d7-e34d56b7105e")] + +// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: +// +// Hauptversion +// Nebenversion +// Buildnummer +// Revision +// +// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern +// übernehmen, indem Sie "*" eingeben: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/lib/csharp/test/ThriftTest/TestServer.cs b/lib/csharp/test/ThriftTest/TestServer.cs index ceb4368b..8a4e6054 100644 --- a/lib/csharp/test/ThriftTest/TestServer.cs +++ b/lib/csharp/test/ThriftTest/TestServer.cs @@ -115,26 +115,26 @@ namespace Test } Console.WriteLine("})"); return thing; - } - - public Dictionary testStringMap(Dictionary thing) - { - Console.WriteLine("testStringMap({"); - bool first = true; - foreach (string key in thing.Keys) - { - if (first) - { - first = false; - } - else - { - Console.WriteLine(", "); - } - Console.WriteLine(key + " => " + thing[key]); - } - Console.WriteLine("})"); - return thing; + } + + public Dictionary testStringMap(Dictionary thing) + { + Console.WriteLine("testStringMap({"); + bool first = true; + foreach (string key in thing.Keys) + { + if (first) + { + first = false; + } + else + { + Console.WriteLine(", "); + } + Console.WriteLine(key + " => " + thing[key]); + } + Console.WriteLine("})"); + return thing; } public THashSet testSet(THashSet thing) diff --git a/lib/csharp/test/ThriftTest/ThriftTest.csproj b/lib/csharp/test/ThriftTest/ThriftTest.csproj index 87178763..d6719977 100644 --- a/lib/csharp/test/ThriftTest/ThriftTest.csproj +++ b/lib/csharp/test/ThriftTest/ThriftTest.csproj @@ -1,141 +1,141 @@ - - - - - Debug - AnyCPU - 9.0.21022 - 2.0 - {48DD757F-CA95-4DD7-BDA4-58DB6F108C2C} - Exe - Properties - ThriftTest - ThriftTest - v3.5 - 512 - false - - - 3.5 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - AllRules.ruleset - - - - - False - .\ThriftImpl.dll - - - - - - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 2.0 %28x86%29 - false - - - False - .NET Framework 3.0 %28x86%29 - false - - - False - .NET Framework 3.5 - true - - - False - .NET Framework 3.5 SP1 - false - - - False - Windows Installer 3.1 - true - - - - - {499EB63C-D74C-47E8-AE48-A2FC94538E9D} - Thrift - - - - - - rmdir /s /q "$(ProjectDir)gen-csharp" -del /f /q "$(ProjectDir)ThriftImpl.dll" -SET OUTPUT_DIR=$(ProjectDir) -SET THRIFT_FILE=$(ProjectDir)\..\..\..\..\test\ThriftTest.thrift -for %25%25I in ("%25OUTPUT_DIR%25") do set SHORT_DIR=%25%25~fsI -for %25%25I in ("%25THRIFT_FILE%25") do set THRIFT_SHORT=%25%25~fsI -"$(ProjectDir)\..\..\..\..\compiler\cpp\thrift.exe" --gen csharp -o %25SHORT_DIR%25 %25THRIFT_SHORT%25 -$(MSBuildToolsPath)\Csc.exe /t:library /out:"$(ProjectDir)ThriftImpl.dll" /recurse:"$(ProjectDir)gen-csharp"\* /reference:"$(ProjectDir)..\..\src\bin\Debug\Thrift.dll" - + + + + + Debug + AnyCPU + 9.0.21022 + 2.0 + {48DD757F-CA95-4DD7-BDA4-58DB6F108C2C} + Exe + Properties + ThriftTest + ThriftTest + v3.5 + 512 + false + + + 3.5 + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + AllRules.ruleset + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + AllRules.ruleset + + + + + False + .\ThriftImpl.dll + + + + + + + + + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 2.0 %28x86%29 + false + + + False + .NET Framework 3.0 %28x86%29 + false + + + False + .NET Framework 3.5 + true + + + False + .NET Framework 3.5 SP1 + false + + + False + Windows Installer 3.1 + true + + + + + {499EB63C-D74C-47E8-AE48-A2FC94538E9D} + Thrift + + + + + + rmdir /s /q "$(ProjectDir)gen-csharp" +del /f /q "$(ProjectDir)ThriftImpl.dll" +SET OUTPUT_DIR=$(ProjectDir) +SET THRIFT_FILE=$(ProjectDir)\..\..\..\..\test\ThriftTest.thrift +for %25%25I in ("%25OUTPUT_DIR%25") do set SHORT_DIR=%25%25~fsI +for %25%25I in ("%25THRIFT_FILE%25") do set THRIFT_SHORT=%25%25~fsI +"$(ProjectDir)\..\..\..\..\compiler\cpp\thrift.exe" --gen csharp -o %25SHORT_DIR%25 %25THRIFT_SHORT%25 +$(MSBuildToolsPath)\Csc.exe /t:library /out:"$(ProjectDir)ThriftImpl.dll" /recurse:"$(ProjectDir)gen-csharp"\* /reference:"$(ProjectDir)..\..\src\bin\Debug\Thrift.dll" + \ No newline at end of file