From b5fe1dbc0cac81ab99ec5d71de70f4389b234888 Mon Sep 17 00:00:00 2001 From: Jens Geyer Date: Thu, 11 Feb 2021 22:49:49 +0100 Subject: Reverted wrongly pushed commits. - This reverts commit 876aee506b937d64b1fb035ff65e5e52def04c04. - This reverts commit b89316d54bb0253493b48446cb510755fb3196d2. --- tutorial/csharp/CsharpClient/CsharpClient.cs | 92 --------------- tutorial/csharp/CsharpClient/CsharpClient.csproj | 110 ------------------ .../csharp/CsharpClient/Properties/AssemblyInfo.cs | 55 --------- tutorial/csharp/CsharpServer/CsharpServer.cs | 129 --------------------- tutorial/csharp/CsharpServer/CsharpServer.csproj | 111 ------------------ .../csharp/CsharpServer/Properties/AssemblyInfo.cs | 55 --------- tutorial/csharp/tutorial.sln | 39 ------- tutorial/netstd/Client/Client.csproj | 2 +- tutorial/netstd/Server/Server.csproj | 2 +- 9 files changed, 2 insertions(+), 593 deletions(-) delete mode 100644 tutorial/csharp/CsharpClient/CsharpClient.cs delete mode 100644 tutorial/csharp/CsharpClient/CsharpClient.csproj delete mode 100644 tutorial/csharp/CsharpClient/Properties/AssemblyInfo.cs delete mode 100644 tutorial/csharp/CsharpServer/CsharpServer.cs delete mode 100644 tutorial/csharp/CsharpServer/CsharpServer.csproj delete mode 100644 tutorial/csharp/CsharpServer/Properties/AssemblyInfo.cs delete mode 100644 tutorial/csharp/tutorial.sln (limited to 'tutorial') diff --git a/tutorial/csharp/CsharpClient/CsharpClient.cs b/tutorial/csharp/CsharpClient/CsharpClient.cs deleted file mode 100644 index 113a47223..000000000 --- a/tutorial/csharp/CsharpClient/CsharpClient.cs +++ /dev/null @@ -1,92 +0,0 @@ -/* - * 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. - */ - -using System; -using Thrift; -using Thrift.Protocol; -using Thrift.Server; -using Thrift.Transport; - - -namespace CSharpTutorial -{ - public class CSharpClient - { - public static void Main() - { - try - { - TTransport transport = new TSocket("localhost", 9090); - TProtocol protocol = new TBinaryProtocol(transport); - Calculator.Client client = new Calculator.Client(protocol); - - transport.Open(); - try - { - client.ping(); - Console.WriteLine("ping()"); - - int sum = client.add(1, 1); - Console.WriteLine("1+1={0}", sum); - - Work work = new Work(); - - work.Op = Operation.DIVIDE; - work.Num1 = 1; - work.Num2 = 0; - try - { - int quotient = client.calculate(1, work); - Console.WriteLine("Whoa we can divide by 0"); - } - catch (InvalidOperation io) - { - Console.WriteLine("Invalid operation: " + io.Why); - } - - work.Op = Operation.SUBTRACT; - work.Num1 = 15; - work.Num2 = 10; - try - { - int diff = client.calculate(1, work); - Console.WriteLine("15-10={0}", diff); - } - catch (InvalidOperation io) - { - Console.WriteLine("Invalid operation: " + io.Why); - } - - SharedStruct log = client.getStruct(1); - Console.WriteLine("Check log: {0}", log.Value); - - } - finally - { - transport.Close(); - } - } - catch (TApplicationException x) - { - Console.WriteLine(x.StackTrace); - } - - } - } -} diff --git a/tutorial/csharp/CsharpClient/CsharpClient.csproj b/tutorial/csharp/CsharpClient/CsharpClient.csproj deleted file mode 100644 index 1ea7ff639..000000000 --- a/tutorial/csharp/CsharpClient/CsharpClient.csproj +++ /dev/null @@ -1,110 +0,0 @@ - - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {18F24087-4760-43DA-ACAB-7B9F0E096B11} - Exe - Properties - CsharpClient - CsharpClient - v3.5 - 512 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - 3.5 - - - 3.5 - - - 3.5 - - - - - - - Calculator.cs - - - InvalidOperation.cs - - - Operation.cs - - - SharedService.cs - - - SharedStruct.cs - - - tutorial.Constants.cs - - - Work.cs - - - - - - - {499eb63c-d74c-47e8-ae48-a2fc94538e9d} - Thrift - - - - - pushd "$(SolutionDir)" -thrift -gen csharp -r ../tutorial.thrift -popd - - - - \ No newline at end of file diff --git a/tutorial/csharp/CsharpClient/Properties/AssemblyInfo.cs b/tutorial/csharp/CsharpClient/Properties/AssemblyInfo.cs deleted file mode 100644 index 8f5b32a28..000000000 --- a/tutorial/csharp/CsharpClient/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,55 +0,0 @@ -/* - * 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. - */ - -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("CsharpClient")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("The Apache Software Foundation")] -[assembly: AssemblyProduct("Thrift")] -[assembly: AssemblyCopyright("The Apache Software Foundation")] -[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("1a461214-fa28-452a-bd1d-d23ca8e947e3")] - -// 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("0.14.0.0")] -[assembly: AssemblyFileVersion("0.14.0.0")] diff --git a/tutorial/csharp/CsharpServer/CsharpServer.cs b/tutorial/csharp/CsharpServer/CsharpServer.cs deleted file mode 100644 index 439790aaf..000000000 --- a/tutorial/csharp/CsharpServer/CsharpServer.cs +++ /dev/null @@ -1,129 +0,0 @@ -/* - * 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. - */ - -using System; -using System.Collections.Generic; -using Thrift.Server; -using Thrift.Transport; - -namespace CSharpTutorial -{ - public class CalculatorHandler : Calculator.Iface - { - Dictionary log; - - public CalculatorHandler() - { - log = new Dictionary(); - } - - public void ping() - { - Console.WriteLine("ping()"); - } - - public int add(int n1, int n2) - { - Console.WriteLine("add({0},{1})", n1, n2); - return n1 + n2; - } - - public int calculate(int logid, Work work) - { - Console.WriteLine("calculate({0}, [{1},{2},{3}])", logid, work.Op, work.Num1, work.Num2); - int val = 0; - switch (work.Op) - { - case Operation.ADD: - val = work.Num1 + work.Num2; - break; - - case Operation.SUBTRACT: - val = work.Num1 - work.Num2; - break; - - case Operation.MULTIPLY: - val = work.Num1 * work.Num2; - break; - - case Operation.DIVIDE: - if (work.Num2 == 0) - { - InvalidOperation io = new InvalidOperation(); - io.WhatOp = (int)work.Op; - io.Why = "Cannot divide by 0"; - throw io; - } - val = work.Num1 / work.Num2; - break; - - default: - { - InvalidOperation io = new InvalidOperation(); - io.WhatOp = (int)work.Op; - io.Why = "Unknown operation"; - throw io; - } - } - - SharedStruct entry = new SharedStruct(); - entry.Key = logid; - entry.Value = val.ToString(); - log[logid] = entry; - - return val; - } - - public SharedStruct getStruct(int key) - { - Console.WriteLine("getStruct({0})", key); - return log[key]; - } - - public void zip() - { - Console.WriteLine("zip()"); - } - } - - public class CSharpServer - { - public static void Main() - { - try - { - CalculatorHandler handler = new CalculatorHandler(); - Calculator.Processor processor = new Calculator.Processor(handler); - TServerTransport serverTransport = new TServerSocket(9090); - TServer server = new TSimpleServer(processor, serverTransport); - - // Use this for a multithreaded server - // server = new TThreadPoolServer(processor, serverTransport); - - Console.WriteLine("Starting the server..."); - server.Serve(); - } - catch (Exception x) - { - Console.WriteLine(x.StackTrace); - } - Console.WriteLine("done."); - } - } -} diff --git a/tutorial/csharp/CsharpServer/CsharpServer.csproj b/tutorial/csharp/CsharpServer/CsharpServer.csproj deleted file mode 100644 index 07481806c..000000000 --- a/tutorial/csharp/CsharpServer/CsharpServer.csproj +++ /dev/null @@ -1,111 +0,0 @@ - - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {66707BAE-BBF9-4F03-B53E-BE3AD58322F8} - Exe - Properties - CsharpServer - CsharpServer - v3.5 - 512 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - 3.5 - - - 3.5 - - - 3.5 - - - - - - - Calculator.cs - - - InvalidOperation.cs - - - Operation.cs - - - SharedService.cs - - - SharedStruct.cs - - - tutorial.Constants.cs - - - Work.cs - - - - - - - {499eb63c-d74c-47e8-ae48-a2fc94538e9d} - Thrift - - - - - pushd "$(SolutionDir)" -thrift -gen csharp -r ../tutorial.thrift -popd - - - - - \ No newline at end of file diff --git a/tutorial/csharp/CsharpServer/Properties/AssemblyInfo.cs b/tutorial/csharp/CsharpServer/Properties/AssemblyInfo.cs deleted file mode 100644 index 0d4f0fbb1..000000000 --- a/tutorial/csharp/CsharpServer/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,55 +0,0 @@ -/* - * 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. - */ - -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("CsharpServer")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("The Apache Software Foundation")] -[assembly: AssemblyProduct("Thrift")] -[assembly: AssemblyCopyright("The Apache Software Foundation")] -[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("e3b428f4-b2e9-4fc1-8a34-84abc4339860")] - -// 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("0.14.0.0")] -[assembly: AssemblyFileVersion("0.14.0.0")] diff --git a/tutorial/csharp/tutorial.sln b/tutorial/csharp/tutorial.sln deleted file mode 100644 index ec57a188d..000000000 --- a/tutorial/csharp/tutorial.sln +++ /dev/null @@ -1,39 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Thrift", "..\..\lib\csharp\src\Thrift.csproj", "{499EB63C-D74C-47E8-AE48-A2FC94538E9D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsharpClient", "CsharpClient\CsharpClient.csproj", "{18F24087-4760-43DA-ACAB-7B9F0E096B11}" - ProjectSection(ProjectDependencies) = postProject - {499EB63C-D74C-47E8-AE48-A2FC94538E9D} = {499EB63C-D74C-47E8-AE48-A2FC94538E9D} - {66707BAE-BBF9-4F03-B53E-BE3AD58322F8} = {66707BAE-BBF9-4F03-B53E-BE3AD58322F8} - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsharpServer", "CsharpServer\CsharpServer.csproj", "{66707BAE-BBF9-4F03-B53E-BE3AD58322F8}" - ProjectSection(ProjectDependencies) = postProject - {499EB63C-D74C-47E8-AE48-A2FC94538E9D} = {499EB63C-D74C-47E8-AE48-A2FC94538E9D} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {499EB63C-D74C-47E8-AE48-A2FC94538E9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {499EB63C-D74C-47E8-AE48-A2FC94538E9D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {499EB63C-D74C-47E8-AE48-A2FC94538E9D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {499EB63C-D74C-47E8-AE48-A2FC94538E9D}.Release|Any CPU.Build.0 = Release|Any CPU - {18F24087-4760-43DA-ACAB-7B9F0E096B11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18F24087-4760-43DA-ACAB-7B9F0E096B11}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18F24087-4760-43DA-ACAB-7B9F0E096B11}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18F24087-4760-43DA-ACAB-7B9F0E096B11}.Release|Any CPU.Build.0 = Release|Any CPU - {66707BAE-BBF9-4F03-B53E-BE3AD58322F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66707BAE-BBF9-4F03-B53E-BE3AD58322F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66707BAE-BBF9-4F03-B53E-BE3AD58322F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66707BAE-BBF9-4F03-B53E-BE3AD58322F8}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/tutorial/netstd/Client/Client.csproj b/tutorial/netstd/Client/Client.csproj index 81b503f14..10d5040f0 100644 --- a/tutorial/netstd/Client/Client.csproj +++ b/tutorial/netstd/Client/Client.csproj @@ -30,7 +30,7 @@ - + diff --git a/tutorial/netstd/Server/Server.csproj b/tutorial/netstd/Server/Server.csproj index 95eabd37d..b3ff516e3 100644 --- a/tutorial/netstd/Server/Server.csproj +++ b/tutorial/netstd/Server/Server.csproj @@ -38,7 +38,7 @@ - + -- cgit v1.2.1