Skip to content

Commit

Permalink
Merge branch 'master' into connectionpool
Browse files Browse the repository at this point in the history
  • Loading branch information
tiggerite committed Dec 12, 2021
2 parents f9b2a7a + 36ba079 commit e87fd3f
Show file tree
Hide file tree
Showing 95 changed files with 2,661 additions and 826 deletions.
6 changes: 6 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,9 @@

# IDE0090: Use 'new(...)'
csharp_style_implicit_object_creation_when_type_is_apparent = false

# IDE1006: Naming Styles
dotnet_diagnostic.IDE1006.severity = none

# IDE0057: Use range operator
dotnet_diagnostic.IDE0057.severity = none
2 changes: 1 addition & 1 deletion .github/workflows/master-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.400
dotnet-version: 6.0.100

- name: Install dependencies
run: dotnet restore Tesseract.sln
Expand Down
18 changes: 5 additions & 13 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.400
dotnet-version: 6.0.100

- name: Install dependencies
run: dotnet restore Tesseract.sln
Expand Down Expand Up @@ -74,29 +74,21 @@ jobs:
VERSION_FILE_PATH: version.props
PROJECT_FILE_PATH: src/HouseofCat.Dapper/HouseofCat.Dapper.csproj

- name: Publish HouseofCat.Dapper.LegacySqlServer
uses: brandedoutcast/publish-nuget@v2.5.2
continue-on-error: true
with:
NUGET_KEY: ${{secrets.NUGET_API_KEY}}
VERSION_FILE_PATH: version.props
PROJECT_FILE_PATH: src/HouseofCat.Dapper.LegacySqlServer/HouseofCat.Dapper.LegacySqlServer.csproj

- name: Publish HouseofCat.Dapper.SqlServer
- name: Publish HouseofCat.Data
uses: brandedoutcast/publish-nuget@v2.5.2
continue-on-error: true
with:
NUGET_KEY: ${{secrets.NUGET_API_KEY}}
VERSION_FILE_PATH: version.props
PROJECT_FILE_PATH: src/HouseofCat.Dapper.SqlServer/HouseofCat.Dapper.SqlServer.csproj
PROJECT_FILE_PATH: src/HouseofCat.Data/HouseofCat.Data.csproj

- name: Publish HouseofCat.Data
- name: Publish HouseofCat.Data.Parquet
uses: brandedoutcast/publish-nuget@v2.5.2
continue-on-error: true
with:
NUGET_KEY: ${{secrets.NUGET_API_KEY}}
VERSION_FILE_PATH: version.props
PROJECT_FILE_PATH: src/HouseofCat.Data/HouseofCat.Data.csproj
PROJECT_FILE_PATH: src/HouseofCat.Data.Parquet/HouseofCat.Data.Parquet.csproj

- name: Publish HouseofCat.Data.Recyclable
uses: brandedoutcast/publish-nuget@v2.5.2
Expand Down
24 changes: 9 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,21 +93,15 @@ A library that has a collection of builtin NetCore compression providers that us
[![NuGet](https://img.shields.io/nuget/v/HouseofCat.Dapper.svg)](https://www.nuget.org/packages/HouseofCat.Dapper/)
[![NuGet](https://img.shields.io/nuget/dt/HouseofCat.Dapper.svg)](https://www.nuget.org/packages/HouseofCat.Dapper/)

A library that provides a standard for Dapper implementation.


## HouseofCat.Dapper.LegacySqlServer
[![NuGet](https://img.shields.io/nuget/v/HouseofCat.Dapper.LegacySqlServer.svg)](https://www.nuget.org/packages/HouseofCat.Dapper.LegacySqlServer/)
[![NuGet](https://img.shields.io/nuget/dt/HouseofCat.Dapper.LegacySqlServer.svg)](https://www.nuget.org/packages/HouseofCat.Dapper.LegacySqlServer/)

A library that provides a standard System.Data.SqlClient implementation.


## HouseofCat.Dapper.SqlServer
[![NuGet](https://img.shields.io/nuget/v/HouseofCat.Dapper.SqlServer.svg)](https://www.nuget.org/packages/HouseofCat.Dapper.SqlServer/)
[![NuGet](https://img.shields.io/nuget/dt/HouseofCat.Dapper.SqlServer.svg)](https://www.nuget.org/packages/HouseofCat.Dapper.SqlServer/)

A library that provides a standard Microsoft.Data.SqlClient implementation.
A library that provides helper methods for integrating Dapper with the following drivers:

* System.Data.SqlClient
* Microsoft.Data.SqlClient
* MySql.Data.MySqlClient
* Npgsq
* MySql.Data
* System.Data.Odbc
* System.Data.OleDb


## HouseofCat.Data
Expand Down
35 changes: 19 additions & 16 deletions Tesseract.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30320.27
# Visual Studio Version 17
VisualStudioVersion = 17.0.31912.275
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{29F4C0CA-2EA4-433C-8112-9A1336392E52}"
ProjectSection(SolutionItems) = preProject
Expand Down Expand Up @@ -32,10 +32,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HouseofCat.Logger", "src\Ho
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HouseofCat.Algorithms", "src\HouseofCat.Algorithms\HouseofCat.Algorithms.csproj", "{6300805C-D8A6-4F9C-BAC7-67964B792CB4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HouseofCat.Dapper.SqlServer", "src\HouseofCat.Dapper.SqlServer\HouseofCat.Dapper.SqlServer.csproj", "{8F9C35D4-D79E-4E37-B18D-B8E56F68BD35}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HouseofCat.Dapper.LegacySqlServer", "src\HouseofCat.Dapper.LegacySqlServer\HouseofCat.Dapper.LegacySqlServer.csproj", "{1614AA07-D30F-4847-B506-957DD0109E70}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HouseofCat.Dapper", "src\HouseofCat.Dapper\HouseofCat.Dapper.csproj", "{BAB7F573-FD85-4C02-9FBB-A4390FF35D21}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HouseofCat.Extensions.Host.Serilog", "src\HouseofCat.Extensions.Host.Serilog\HouseofCat.Extensions.Host.Serilog.csproj", "{F87490D3-D318-4425-8044-1FA2BD1B24A6}"
Expand Down Expand Up @@ -129,6 +125,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "golang", "golang", "{824F17
guides\golang\GoDependencyPatch.md = guides\golang\GoDependencyPatch.md
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{C073DF79-5344-4980-AA69-4E3CAF9369D9}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{1604298C-6A9B-44F8-9C4F-7CBBDF99B5FF}"
ProjectSection(SolutionItems) = preProject
.github\workflows\master-build.yml = .github\workflows\master-build.yml
.github\workflows\publish.yml = .github\workflows\publish.yml
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HouseofCat.Data.Parquet", "src\HouseofCat.Data.Parquet\HouseofCat.Data.Parquet.csproj", "{3A68765A-365D-46AE-8CB4-FCD99C5ED783}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -163,14 +169,6 @@ Global
{6300805C-D8A6-4F9C-BAC7-67964B792CB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6300805C-D8A6-4F9C-BAC7-67964B792CB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6300805C-D8A6-4F9C-BAC7-67964B792CB4}.Release|Any CPU.Build.0 = Release|Any CPU
{8F9C35D4-D79E-4E37-B18D-B8E56F68BD35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8F9C35D4-D79E-4E37-B18D-B8E56F68BD35}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8F9C35D4-D79E-4E37-B18D-B8E56F68BD35}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8F9C35D4-D79E-4E37-B18D-B8E56F68BD35}.Release|Any CPU.Build.0 = Release|Any CPU
{1614AA07-D30F-4847-B506-957DD0109E70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1614AA07-D30F-4847-B506-957DD0109E70}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1614AA07-D30F-4847-B506-957DD0109E70}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1614AA07-D30F-4847-B506-957DD0109E70}.Release|Any CPU.Build.0 = Release|Any CPU
{BAB7F573-FD85-4C02-9FBB-A4390FF35D21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BAB7F573-FD85-4C02-9FBB-A4390FF35D21}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BAB7F573-FD85-4C02-9FBB-A4390FF35D21}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -323,6 +321,10 @@ Global
{69F52489-3B63-437A-AA92-F651E2AB8273}.Debug|Any CPU.Build.0 = Debug|Any CPU
{69F52489-3B63-437A-AA92-F651E2AB8273}.Release|Any CPU.ActiveCfg = Release|Any CPU
{69F52489-3B63-437A-AA92-F651E2AB8273}.Release|Any CPU.Build.0 = Release|Any CPU
{3A68765A-365D-46AE-8CB4-FCD99C5ED783}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3A68765A-365D-46AE-8CB4-FCD99C5ED783}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3A68765A-365D-46AE-8CB4-FCD99C5ED783}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3A68765A-365D-46AE-8CB4-FCD99C5ED783}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -335,8 +337,6 @@ Global
{E7F4AFF1-3D8D-4250-B813-F7BD5D558451} = {4FCA30F5-D19B-4756-BC68-6BA7E668F786}
{0FEAE831-B148-4EA8-AD4F-1E85606C156F} = {4FCA30F5-D19B-4756-BC68-6BA7E668F786}
{6300805C-D8A6-4F9C-BAC7-67964B792CB4} = {4FCA30F5-D19B-4756-BC68-6BA7E668F786}
{8F9C35D4-D79E-4E37-B18D-B8E56F68BD35} = {4FCA30F5-D19B-4756-BC68-6BA7E668F786}
{1614AA07-D30F-4847-B506-957DD0109E70} = {4FCA30F5-D19B-4756-BC68-6BA7E668F786}
{BAB7F573-FD85-4C02-9FBB-A4390FF35D21} = {4FCA30F5-D19B-4756-BC68-6BA7E668F786}
{F87490D3-D318-4425-8044-1FA2BD1B24A6} = {4FCA30F5-D19B-4756-BC68-6BA7E668F786}
{FA0ED709-D706-46E1-801A-2D43F1093840} = {4FCA30F5-D19B-4756-BC68-6BA7E668F786}
Expand Down Expand Up @@ -378,6 +378,9 @@ Global
{1AB5E832-AD36-40AF-A7E9-A105A778116C} = {29F4C0CA-2EA4-433C-8112-9A1336392E52}
{018DB970-F843-4D69-AAE1-C3CDF5FC7093} = {1AB5E832-AD36-40AF-A7E9-A105A778116C}
{824F178C-4D64-4944-8C18-1B460F83F5C3} = {1AB5E832-AD36-40AF-A7E9-A105A778116C}
{C073DF79-5344-4980-AA69-4E3CAF9369D9} = {29F4C0CA-2EA4-433C-8112-9A1336392E52}
{1604298C-6A9B-44F8-9C4F-7CBBDF99B5FF} = {C073DF79-5344-4980-AA69-4E3CAF9369D9}
{3A68765A-365D-46AE-8CB4-FCD99C5ED783} = {4FCA30F5-D19B-4756-BC68-6BA7E668F786}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {D7099845-267C-4232-8764-5DF25D6B2C79}
Expand Down
6 changes: 3 additions & 3 deletions common.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="version.props" />
<PropertyGroup>
<!-- Shared Project Properties -->
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>net5.0;net6.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<NoWarn>1591</NoWarn>
<IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
Expand All @@ -12,7 +12,7 @@
<!-- NuGet Attributes -->
<Authors>HouseofCat.io</Authors>
<Description>HouseofCat.io Tesseract library is used across many projects.</Description>
<Copyright>Copyright © 2020</Copyright>
<Copyright>Copyright © 2022</Copyright>
<Product>HouseofCat.io - Tesseract</Product>
<PackageIcon>houseofcat.png</PackageIcon>
<PackageTags>C# NetCore HouseofCat HouseofCat.io</PackageTags>
Expand Down Expand Up @@ -60,7 +60,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>net5.0</TargetFrameworks>
<AssemblyName>ConsumerWorkflow</AssemblyName>
<RootNamespace>Examples.RabbitMQ.ConsumerWorkflow</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
<PackageReference Include="RabbitMQ.Client" Version="6.2.2" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="K4os.Compression.LZ4" Version="1.2.6" />
<PackageReference Include="prometheus-net" Version="4.2.0" />
<PackageReference Include="prometheus-net.AspNetCore" Version="4.2.0" />
<PackageReference Include="K4os.Compression.LZ4" Version="1.2.16" />
<PackageReference Include="prometheus-net" Version="5.0.2" />
<PackageReference Include="prometheus-net.AspNetCore" Version="5.0.2" />
<PackageReference Include="Utf8Json" Version="1.3.7" />
<PackageReference Include="RabbitMQ.Client" Version="6.2.2" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>net5.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
<PackageReference Include="RabbitMQ.Client" Version="6.2.2" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions examples/src/RabbitMQ/DataProducer/DataProducer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>net5.0</TargetFrameworks>
<AssemblyName>DataProducer</AssemblyName>
<RootNamespace>Examples.RabbitMQ.DataProducer</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
<PackageReference Include="RabbitMQ.Client" Version="6.2.2" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion examples/src/RabbitMQ/SimpleClient/SimpleClient.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
<RunAnalyzersDuringLiveAnalysis>false</RunAnalyzersDuringLiveAnalysis>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\common.props" />
<ItemGroup>
<PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.2.12" />
<PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.2.16" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\HouseofCat.Compression\HouseofCat.Compression.csproj" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\common.props" />
<ItemGroup>
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.1.3" />
<PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.0.2" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.2.0" />
<PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.1.2" />
<PackageReference Include="System.Memory" Version="4.5.4" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/HouseofCat.Compression/HouseofCat.Compression.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\common.props" />
<ItemGroup>
<PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.0.2" />
<PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.1.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\HouseofCat.Utilities\HouseofCat.Utilities.csproj" />
Expand Down

This file was deleted.

Loading

0 comments on commit e87fd3f

Please sign in to comment.