From 93e19f842a02912d61e7b2086a3e4117070373be Mon Sep 17 00:00:00 2001 From: Hans Mulder Date: Mon, 11 Jun 2018 09:51:15 +0200 Subject: [PATCH] Port Tapeti to .NET Standard --- Tapeti.Annotations/Properties/AssemblyInfo.cs | 23 ---- Tapeti.Annotations/Tapeti.Annotations.csproj | 64 +-------- .../Properties/AssemblyInfo.cs | 23 ---- .../Tapeti.DataAnnotations.csproj | 69 ++-------- Tapeti.Flow.SQL/Properties/AssemblyInfo.cs | 23 ---- .../SqlConnectionFlowRepository.cs | 2 - Tapeti.Flow.SQL/Tapeti.Flow.SQL.csproj | 79 ++--------- Tapeti.Flow.SQL/packages.config | 4 - Tapeti.Flow/Properties/AssemblyInfo.cs | 22 --- Tapeti.Flow/Tapeti.Flow.csproj | 104 ++------------ Tapeti.Flow/packages.config | 5 - .../Properties/AssemblyInfo.cs | 22 --- .../Tapeti.SimpleInjector.csproj | 73 ++-------- Tapeti.SimpleInjector/packages.config | 4 - Tapeti.Tests/ConnectionStringParser.cs | 7 +- Tapeti.Tests/Properties/AssemblyInfo.cs | 23 ---- Tapeti.Tests/Tapeti.Tests.csproj | 98 ++----------- Tapeti.Tests/packages.config | 10 -- Tapeti.sln | 87 ++++++------ Tapeti/Properties/AssemblyInfo.cs | 22 --- Tapeti/Tapeti.csproj | 130 ++---------------- Tapeti/packages.config | 5 - Test/App.config | 6 - Test/MyLogger.cs | 32 +++++ Test/Properties/AssemblyInfo.cs | 35 ----- Test/Test.csproj | 113 ++------------- Test/packages.config | 5 - 27 files changed, 155 insertions(+), 935 deletions(-) delete mode 100644 Tapeti.Annotations/Properties/AssemblyInfo.cs delete mode 100644 Tapeti.DataAnnotations/Properties/AssemblyInfo.cs delete mode 100644 Tapeti.Flow.SQL/Properties/AssemblyInfo.cs delete mode 100644 Tapeti.Flow.SQL/packages.config delete mode 100644 Tapeti.Flow/Properties/AssemblyInfo.cs delete mode 100644 Tapeti.Flow/packages.config delete mode 100644 Tapeti.SimpleInjector/Properties/AssemblyInfo.cs delete mode 100644 Tapeti.SimpleInjector/packages.config delete mode 100644 Tapeti.Tests/Properties/AssemblyInfo.cs delete mode 100644 Tapeti.Tests/packages.config delete mode 100644 Tapeti/Properties/AssemblyInfo.cs delete mode 100644 Tapeti/packages.config delete mode 100644 Test/App.config create mode 100644 Test/MyLogger.cs delete mode 100644 Test/Properties/AssemblyInfo.cs delete mode 100644 Test/packages.config diff --git a/Tapeti.Annotations/Properties/AssemblyInfo.cs b/Tapeti.Annotations/Properties/AssemblyInfo.cs deleted file mode 100644 index 82731ed..0000000 --- a/Tapeti.Annotations/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,23 +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("Tapeti.Annotations")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Tapeti.Annotations")] -[assembly: AssemblyCopyright("")] -[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("c4897d64-d04e-4ae9-bd98-d64295d1d13a")] diff --git a/Tapeti.Annotations/Tapeti.Annotations.csproj b/Tapeti.Annotations/Tapeti.Annotations.csproj index 6b258c6..9f5c4f4 100644 --- a/Tapeti.Annotations/Tapeti.Annotations.csproj +++ b/Tapeti.Annotations/Tapeti.Annotations.csproj @@ -1,61 +1,7 @@ - - - + + - Debug - AnyCPU - {C4897D64-D04E-4AE9-BD98-D64295D1D13A} - Library - Properties - Tapeti.Annotations - Tapeti.Annotations - v4.6.1 - 512 - - - + netstandard2.0 - - true - full - false - lib\net46\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - lib\net46\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + diff --git a/Tapeti.DataAnnotations/Properties/AssemblyInfo.cs b/Tapeti.DataAnnotations/Properties/AssemblyInfo.cs deleted file mode 100644 index acc2c1e..0000000 --- a/Tapeti.DataAnnotations/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,23 +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("Tapeti.DataAnnotations")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Tapeti.DataAnnotations")] -[assembly: AssemblyCopyright("")] -[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("db1c6e81-4545-4670-a167-46e3265a9743")] diff --git a/Tapeti.DataAnnotations/Tapeti.DataAnnotations.csproj b/Tapeti.DataAnnotations/Tapeti.DataAnnotations.csproj index 4447f62..3df5704 100644 --- a/Tapeti.DataAnnotations/Tapeti.DataAnnotations.csproj +++ b/Tapeti.DataAnnotations/Tapeti.DataAnnotations.csproj @@ -1,66 +1,15 @@ - - - + + - Debug - AnyCPU - {DB1C6E81-4545-4670-A167-46E3265A9743} - Library - Properties - Tapeti.DataAnnotations - Tapeti.DataAnnotations - v4.6.1 - 512 - - - - - true - full - false - lib\net46\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - lib\net46\ - TRACE - prompt - 4 + netstandard2.0 + - - - - - - - - - + + - - - - - + - - - {8ab4fd33-4aaa-465c-8579-9db3f3b23813} - Tapeti - - - - - \ No newline at end of file + + diff --git a/Tapeti.Flow.SQL/Properties/AssemblyInfo.cs b/Tapeti.Flow.SQL/Properties/AssemblyInfo.cs deleted file mode 100644 index a949957..0000000 --- a/Tapeti.Flow.SQL/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,23 +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("Tapeti.Flow.SQL")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Tapeti.Flow.SQL")] -[assembly: AssemblyCopyright("")] -[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("6de7b122-eb6a-46b8-aeaf-f84dde18f9c7")] diff --git a/Tapeti.Flow.SQL/SqlConnectionFlowRepository.cs b/Tapeti.Flow.SQL/SqlConnectionFlowRepository.cs index 78e47a7..e66c568 100644 --- a/Tapeti.Flow.SQL/SqlConnectionFlowRepository.cs +++ b/Tapeti.Flow.SQL/SqlConnectionFlowRepository.cs @@ -2,8 +2,6 @@ using System.Collections.Generic; using System.Data; using System.Data.SqlClient; -using System.Linq; -using System.Text; using System.Threading.Tasks; using Newtonsoft.Json; diff --git a/Tapeti.Flow.SQL/Tapeti.Flow.SQL.csproj b/Tapeti.Flow.SQL/Tapeti.Flow.SQL.csproj index 8d54f56..b80a796 100644 --- a/Tapeti.Flow.SQL/Tapeti.Flow.SQL.csproj +++ b/Tapeti.Flow.SQL/Tapeti.Flow.SQL.csproj @@ -1,75 +1,16 @@ - - - + + - Debug - AnyCPU - {6DE7B122-EB6A-46B8-AEAF-F84DDE18F9C7} - Library - Properties - Tapeti.Flow.SQL - Tapeti.Flow.SQL - v4.6.1 - 512 - - - - - - true - full - false - lib\net46\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - lib\net46\ - TRACE - prompt - 4 + netstandard2.0 + - - ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - True - - - - - - - - - + + - - - + + - - - {f84ad920-d5a1-455d-aed5-2542b3a47b85} - Tapeti.Flow - - - {8ab4fd33-4aaa-465c-8579-9db3f3b23813} - Tapeti - - - - - - - - \ No newline at end of file + + diff --git a/Tapeti.Flow.SQL/packages.config b/Tapeti.Flow.SQL/packages.config deleted file mode 100644 index e4ac9c6..0000000 --- a/Tapeti.Flow.SQL/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Tapeti.Flow/Properties/AssemblyInfo.cs b/Tapeti.Flow/Properties/AssemblyInfo.cs deleted file mode 100644 index 29fc76f..0000000 --- a/Tapeti.Flow/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Reflection; -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("Tapeti.Flow")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Tapeti.Flow")] -[assembly: AssemblyCopyright("")] -[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("f84ad920-d5a1-455d-aed5-2542b3a47b85")] diff --git a/Tapeti.Flow/Tapeti.Flow.csproj b/Tapeti.Flow/Tapeti.Flow.csproj index b4cb237..cc0d9d9 100644 --- a/Tapeti.Flow/Tapeti.Flow.csproj +++ b/Tapeti.Flow/Tapeti.Flow.csproj @@ -1,100 +1,12 @@ - - - + + - Debug - AnyCPU - {F84AD920-D5A1-455D-AED5-2542B3A47B85} - Library - Properties - Tapeti.Flow - Tapeti.Flow - v4.6.1 - 512 - - - - - - true - full - false - lib\net46\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - lib\net46\ - TRACE - prompt - 4 + netstandard2.0 + - - ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - True - - - ..\packages\RabbitMQ.Client.4.1.3\lib\net451\RabbitMQ.Client.dll - True - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {c4897d64-d04e-4ae9-bd98-d64295d1d13a} - Tapeti.Annotations - - - {8ab4fd33-4aaa-465c-8579-9db3f3b23813} - Tapeti - - - - - - - - \ No newline at end of file + + diff --git a/Tapeti.Flow/packages.config b/Tapeti.Flow/packages.config deleted file mode 100644 index 48a0bc6..0000000 --- a/Tapeti.Flow/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Tapeti.SimpleInjector/Properties/AssemblyInfo.cs b/Tapeti.SimpleInjector/Properties/AssemblyInfo.cs deleted file mode 100644 index 13e1035..0000000 --- a/Tapeti.SimpleInjector/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Reflection; -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("Tapeti.SimpleInjector")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Tapeti.SimpleInjector")] -[assembly: AssemblyCopyright("")] -[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("d7ec6f86-eb3b-49c3-8fe7-6e8c1bb413a6")] diff --git a/Tapeti.SimpleInjector/Tapeti.SimpleInjector.csproj b/Tapeti.SimpleInjector/Tapeti.SimpleInjector.csproj index 9129567..25ed29e 100644 --- a/Tapeti.SimpleInjector/Tapeti.SimpleInjector.csproj +++ b/Tapeti.SimpleInjector/Tapeti.SimpleInjector.csproj @@ -1,70 +1,15 @@ - - - + + - Debug - AnyCPU - {D7EC6F86-EB3B-49C3-8FE7-6E8C1BB413A6} - Library - Properties - Tapeti.SimpleInjector - Tapeti.SimpleInjector - v4.6.1 - 512 - - - - - - true - full - false - lib\net46\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - lib\net46\ - TRACE - prompt - 4 + netstandard2.0 + - - ..\packages\SimpleInjector.4.0.8\lib\net45\SimpleInjector.dll - True - - - - - - - - - + + - - + - - - {8ab4fd33-4aaa-465c-8579-9db3f3b23813} - Tapeti - - - - - - - - \ No newline at end of file + + diff --git a/Tapeti.SimpleInjector/packages.config b/Tapeti.SimpleInjector/packages.config deleted file mode 100644 index feecdd0..0000000 --- a/Tapeti.SimpleInjector/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Tapeti.Tests/ConnectionStringParser.cs b/Tapeti.Tests/ConnectionStringParser.cs index d56e95f..4c20c4c 100644 --- a/Tapeti.Tests/ConnectionStringParser.cs +++ b/Tapeti.Tests/ConnectionStringParser.cs @@ -1,5 +1,4 @@ -using System; -using Tapeti; +using Tapeti; using Tapeti.Helpers; using Xunit; @@ -164,10 +163,10 @@ namespace Tapet.Tests { HostName = "messagebus.universe.local", Port = 80, - VirtualHost= "/test", + VirtualHost = "/test", Username = "myApplication", Password = "1234", - PrefetchCount= 10 + PrefetchCount = 10 }); } diff --git a/Tapeti.Tests/Properties/AssemblyInfo.cs b/Tapeti.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index fed8cc8..0000000 --- a/Tapeti.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,23 +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("Tapet.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Tapet.Tests")] -[assembly: AssemblyCopyright("")] -[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("ba6bc046-5e60-410a-ae84-be1d91561a96")] diff --git a/Tapeti.Tests/Tapeti.Tests.csproj b/Tapeti.Tests/Tapeti.Tests.csproj index 0b3c92c..674cbd2 100644 --- a/Tapeti.Tests/Tapeti.Tests.csproj +++ b/Tapeti.Tests/Tapeti.Tests.csproj @@ -1,93 +1,17 @@ - - - - + + - Debug - AnyCPU - {BA6BC046-5E60-410A-AE84-BE1D91561A96} - Library - Properties - Tapet.Tests - Tapet.Tests - v4.6.1 - 512 - - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + netcoreapp2.1 + - - - - - - - - - - ..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll - True - - - ..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll - True - - - ..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll - True - - - ..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll - True - + + + + - - - + - - - - - - {8ab4fd33-4aaa-465c-8579-9db3f3b23813} - Tapeti - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file + + diff --git a/Tapeti.Tests/packages.config b/Tapeti.Tests/packages.config deleted file mode 100644 index eeb4764..0000000 --- a/Tapeti.Tests/packages.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/Tapeti.sln b/Tapeti.sln index 24d185b..ad1c189 100644 --- a/Tapeti.sln +++ b/Tapeti.sln @@ -1,23 +1,23 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.27703.2026 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tapeti", "Tapeti\Tapeti.csproj", "{8AB4FD33-4AAA-465C-8579-9DB3F3B23813}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tapeti.Annotations", "Tapeti.Annotations\Tapeti.Annotations.csproj", "{4B742AB2-59DD-4792-8E0F-D80B5366B844}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tapeti.SimpleInjector", "Tapeti.SimpleInjector\Tapeti.SimpleInjector.csproj", "{D7EC6F86-EB3B-49C3-8FE7-6E8C1BB413A6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tapeti", "Tapeti\Tapeti.csproj", "{2952B141-C54D-4E6F-8108-CAD735B0279F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{90559950-1B32-4119-A78E-517E2C71EE23}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tapeti.DataAnnotations", "Tapeti.DataAnnotations\Tapeti.DataAnnotations.csproj", "{6504D430-AB4A-4DE3-AE76-0384591BEEE7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tapeti.Flow", "Tapeti.Flow\Tapeti.Flow.csproj", "{F84AD920-D5A1-455D-AED5-2542B3A47B85}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tapeti.Flow", "Tapeti.Flow\Tapeti.Flow.csproj", "{14CF8F01-570B-4B84-AB4A-E0C3EC117F89}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tapeti.Flow.SQL", "Tapeti.Flow.SQL\Tapeti.Flow.SQL.csproj", "{6DE7B122-EB6A-46B8-AEAF-F84DDE18F9C7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tapeti.Flow.SQL", "Tapeti.Flow.SQL\Tapeti.Flow.SQL.csproj", "{775CAB72-F443-442E-8E10-313B2548EDF8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tapeti.Annotations", "Tapeti.Annotations\Tapeti.Annotations.csproj", "{C4897D64-D04E-4AE9-BD98-D64295D1D13A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tapeti.SimpleInjector", "Tapeti.SimpleInjector\Tapeti.SimpleInjector.csproj", "{A190C736-E95A-4BDA-AA80-6211226DFCAD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tapeti.Tests", "Tapeti.Tests\Tapeti.Tests.csproj", "{BA6BC046-5E60-410A-AE84-BE1D91561A96}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test", "Test\Test.csproj", "{1A4B7136-B7DF-41EA-BEA2-E87B4607D420}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tapeti.DataAnnotations", "Tapeti.DataAnnotations\Tapeti.DataAnnotations.csproj", "{DB1C6E81-4545-4670-A167-46E3265A9743}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tapeti.Tests", "Tapeti.Tests\Tapeti.Tests.csproj", "{334F3715-63CF-4D13-B09A-38E2A616D4F5}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -25,40 +25,43 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8AB4FD33-4AAA-465C-8579-9DB3F3B23813}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8AB4FD33-4AAA-465C-8579-9DB3F3B23813}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8AB4FD33-4AAA-465C-8579-9DB3F3B23813}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8AB4FD33-4AAA-465C-8579-9DB3F3B23813}.Release|Any CPU.Build.0 = Release|Any CPU - {D7EC6F86-EB3B-49C3-8FE7-6E8C1BB413A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D7EC6F86-EB3B-49C3-8FE7-6E8C1BB413A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D7EC6F86-EB3B-49C3-8FE7-6E8C1BB413A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D7EC6F86-EB3B-49C3-8FE7-6E8C1BB413A6}.Release|Any CPU.Build.0 = Release|Any CPU - {90559950-1B32-4119-A78E-517E2C71EE23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90559950-1B32-4119-A78E-517E2C71EE23}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90559950-1B32-4119-A78E-517E2C71EE23}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90559950-1B32-4119-A78E-517E2C71EE23}.Release|Any CPU.Build.0 = Release|Any CPU - {F84AD920-D5A1-455D-AED5-2542B3A47B85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F84AD920-D5A1-455D-AED5-2542B3A47B85}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F84AD920-D5A1-455D-AED5-2542B3A47B85}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F84AD920-D5A1-455D-AED5-2542B3A47B85}.Release|Any CPU.Build.0 = Release|Any CPU - {6DE7B122-EB6A-46B8-AEAF-F84DDE18F9C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6DE7B122-EB6A-46B8-AEAF-F84DDE18F9C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6DE7B122-EB6A-46B8-AEAF-F84DDE18F9C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6DE7B122-EB6A-46B8-AEAF-F84DDE18F9C7}.Release|Any CPU.Build.0 = Release|Any CPU - {C4897D64-D04E-4AE9-BD98-D64295D1D13A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4897D64-D04E-4AE9-BD98-D64295D1D13A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4897D64-D04E-4AE9-BD98-D64295D1D13A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4897D64-D04E-4AE9-BD98-D64295D1D13A}.Release|Any CPU.Build.0 = Release|Any CPU - {BA6BC046-5E60-410A-AE84-BE1D91561A96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA6BC046-5E60-410A-AE84-BE1D91561A96}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA6BC046-5E60-410A-AE84-BE1D91561A96}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA6BC046-5E60-410A-AE84-BE1D91561A96}.Release|Any CPU.Build.0 = Release|Any CPU - {DB1C6E81-4545-4670-A167-46E3265A9743}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB1C6E81-4545-4670-A167-46E3265A9743}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB1C6E81-4545-4670-A167-46E3265A9743}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB1C6E81-4545-4670-A167-46E3265A9743}.Release|Any CPU.Build.0 = Release|Any CPU + {4B742AB2-59DD-4792-8E0F-D80B5366B844}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4B742AB2-59DD-4792-8E0F-D80B5366B844}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4B742AB2-59DD-4792-8E0F-D80B5366B844}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4B742AB2-59DD-4792-8E0F-D80B5366B844}.Release|Any CPU.Build.0 = Release|Any CPU + {2952B141-C54D-4E6F-8108-CAD735B0279F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2952B141-C54D-4E6F-8108-CAD735B0279F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2952B141-C54D-4E6F-8108-CAD735B0279F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2952B141-C54D-4E6F-8108-CAD735B0279F}.Release|Any CPU.Build.0 = Release|Any CPU + {6504D430-AB4A-4DE3-AE76-0384591BEEE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6504D430-AB4A-4DE3-AE76-0384591BEEE7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6504D430-AB4A-4DE3-AE76-0384591BEEE7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6504D430-AB4A-4DE3-AE76-0384591BEEE7}.Release|Any CPU.Build.0 = Release|Any CPU + {14CF8F01-570B-4B84-AB4A-E0C3EC117F89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {14CF8F01-570B-4B84-AB4A-E0C3EC117F89}.Debug|Any CPU.Build.0 = Debug|Any CPU + {14CF8F01-570B-4B84-AB4A-E0C3EC117F89}.Release|Any CPU.ActiveCfg = Release|Any CPU + {14CF8F01-570B-4B84-AB4A-E0C3EC117F89}.Release|Any CPU.Build.0 = Release|Any CPU + {775CAB72-F443-442E-8E10-313B2548EDF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {775CAB72-F443-442E-8E10-313B2548EDF8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {775CAB72-F443-442E-8E10-313B2548EDF8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {775CAB72-F443-442E-8E10-313B2548EDF8}.Release|Any CPU.Build.0 = Release|Any CPU + {A190C736-E95A-4BDA-AA80-6211226DFCAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A190C736-E95A-4BDA-AA80-6211226DFCAD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A190C736-E95A-4BDA-AA80-6211226DFCAD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A190C736-E95A-4BDA-AA80-6211226DFCAD}.Release|Any CPU.Build.0 = Release|Any CPU + {1A4B7136-B7DF-41EA-BEA2-E87B4607D420}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1A4B7136-B7DF-41EA-BEA2-E87B4607D420}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1A4B7136-B7DF-41EA-BEA2-E87B4607D420}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1A4B7136-B7DF-41EA-BEA2-E87B4607D420}.Release|Any CPU.Build.0 = Release|Any CPU + {334F3715-63CF-4D13-B09A-38E2A616D4F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {334F3715-63CF-4D13-B09A-38E2A616D4F5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {334F3715-63CF-4D13-B09A-38E2A616D4F5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {334F3715-63CF-4D13-B09A-38E2A616D4F5}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {B09CC2BF-B2AF-4CB6-8728-5D1D8E5C50FA} + EndGlobalSection EndGlobal diff --git a/Tapeti/Properties/AssemblyInfo.cs b/Tapeti/Properties/AssemblyInfo.cs deleted file mode 100644 index a43ad5a..0000000 --- a/Tapeti/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Reflection; -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("Tapeti")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Tapeti")] -[assembly: AssemblyCopyright("")] -[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("8ab4fd33-4aaa-465c-8579-9db3f3b23813")] diff --git a/Tapeti/Tapeti.csproj b/Tapeti/Tapeti.csproj index 5ce8b98..ecc266a 100644 --- a/Tapeti/Tapeti.csproj +++ b/Tapeti/Tapeti.csproj @@ -1,125 +1,17 @@ - - - + + - Debug - AnyCPU - {8AB4FD33-4AAA-465C-8579-9DB3F3B23813} - Library - Properties - Tapeti - Tapeti - v4.6.1 - 512 - - - - True - - - true - full - false - lib\net46\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - lib\net46\ - TRACE - prompt - 4 + netstandard2.0 + - - ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - True - - - ..\packages\RabbitMQ.Client.4.1.3\lib\net451\RabbitMQ.Client.dll - True - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - {c4897d64-d04e-4ae9-bd98-d64295d1d13a} - Tapeti.Annotations - - - - - \ No newline at end of file + + diff --git a/Tapeti/packages.config b/Tapeti/packages.config deleted file mode 100644 index 48a0bc6..0000000 --- a/Tapeti/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Test/App.config b/Test/App.config deleted file mode 100644 index bae5d6d..0000000 --- a/Test/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/Test/MyLogger.cs b/Test/MyLogger.cs new file mode 100644 index 0000000..679493a --- /dev/null +++ b/Test/MyLogger.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tapeti; + +namespace Test +{ + public class MyLogger : ILogger + { + public void Connect(TapetiConnectionParams connectionParams) + { + throw new NotImplementedException(); + } + + public void ConnectFailed(TapetiConnectionParams connectionParams) + { + throw new NotImplementedException(); + } + + public void ConnectSuccess(TapetiConnectionParams connectionParams) + { + throw new NotImplementedException(); + } + + public void HandlerException(Exception e) + { + Console.WriteLine("Mylogger: " + e.Message); + } + } +} diff --git a/Test/Properties/AssemblyInfo.cs b/Test/Properties/AssemblyInfo.cs deleted file mode 100644 index f56a1a2..0000000 --- a/Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -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("Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Test")] -[assembly: AssemblyCopyright("")] -[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("90559950-1b32-4119-a78e-517e2c71ee23")] - -// 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("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Test/Test.csproj b/Test/Test.csproj index ef1c3c7..7aa20f6 100644 --- a/Test/Test.csproj +++ b/Test/Test.csproj @@ -1,106 +1,17 @@ - - - - + + - Debug - AnyCPU - {90559950-1B32-4119-A78E-517E2C71EE23} Exe - Properties - Test - Test - v4.6.1 - 512 - true - - - - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + netcoreapp2.1 + - - ..\packages\SimpleInjector.4.0.8\lib\net45\SimpleInjector.dll - True - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - {c4897d64-d04e-4ae9-bd98-d64295d1d13a} - Tapeti.Annotations - - - {db1c6e81-4545-4670-a167-46e3265a9743} - Tapeti.DataAnnotations - - - {6de7b122-eb6a-46b8-aeaf-f84dde18f9c7} - Tapeti.Flow.SQL - - - {8ab4fd33-4aaa-465c-8579-9db3f3b23813} - Tapeti - - - {f84ad920-d5a1-455d-aed5-2542b3a47b85} - Tapeti.Flow - - - {d7ec6f86-eb3b-49c3-8fe7-6e8c1bb413a6} - Tapeti.SimpleInjector - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file + + diff --git a/Test/packages.config b/Test/packages.config deleted file mode 100644 index 4bc307c..0000000 --- a/Test/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file