Skip to content

Commit d095ad4

Browse files
C0nquistadoreC0nquistadore
committed
Move framework dependent code out of Dibix.Http.Server
1 parent 4a3e6d5 commit d095ad4

79 files changed

Lines changed: 370 additions & 404 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Dibix.sln‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msbuild-targets", "msbuild-
104104
build\msbuild-targets\Generator.targets = build\msbuild-targets\Generator.targets
105105
EndProjectSection
106106
EndProject
107+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dibix.Http.Server.AspNetCore", "src\Dibix.Http.Server.AspNetCore\Dibix.Http.Server.AspNetCore.csproj", "{E1988D12-7E51-415E-A621-BB8D36666E9C}"
108+
EndProject
109+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dibix.Http.Server.AspNet", "src\Dibix.Http.Server.AspNet\Dibix.Http.Server.AspNet.csproj", "{7D55F9E2-8CB0-4B5C-800D-12F21D38B9C7}"
110+
EndProject
107111
Global
108112
GlobalSection(SolutionConfigurationPlatforms) = preSolution
109113
Debug|Any CPU = Debug|Any CPU
@@ -201,6 +205,14 @@ Global
201205
{C573AC5D-0380-4752-B6EE-2E2F3806B111}.Debug|Any CPU.Build.0 = Debug|Any CPU
202206
{C573AC5D-0380-4752-B6EE-2E2F3806B111}.Release|Any CPU.ActiveCfg = Release|Any CPU
203207
{C573AC5D-0380-4752-B6EE-2E2F3806B111}.Release|Any CPU.Build.0 = Release|Any CPU
208+
{E1988D12-7E51-415E-A621-BB8D36666E9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
209+
{E1988D12-7E51-415E-A621-BB8D36666E9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
210+
{E1988D12-7E51-415E-A621-BB8D36666E9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
211+
{E1988D12-7E51-415E-A621-BB8D36666E9C}.Release|Any CPU.Build.0 = Release|Any CPU
212+
{7D55F9E2-8CB0-4B5C-800D-12F21D38B9C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
213+
{7D55F9E2-8CB0-4B5C-800D-12F21D38B9C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
214+
{7D55F9E2-8CB0-4B5C-800D-12F21D38B9C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
215+
{7D55F9E2-8CB0-4B5C-800D-12F21D38B9C7}.Release|Any CPU.Build.0 = Release|Any CPU
204216
EndGlobalSection
205217
GlobalSection(SolutionProperties) = preSolution
206218
HideSolutionNode = FALSE
@@ -231,6 +243,8 @@ Global
231243
{E2042ADB-46CB-4CA6-A807-39E9A43F1CC1} = {118B0BCE-C81F-4DA0-814C-2F8AC4867710}
232244
{C573AC5D-0380-4752-B6EE-2E2F3806B111} = {118B0BCE-C81F-4DA0-814C-2F8AC4867710}
233245
{65F20838-0EDA-4D61-BB19-15818EB8E447} = {62C58971-8516-42E1-8D2A-70A0CE779FFE}
246+
{E1988D12-7E51-415E-A621-BB8D36666E9C} = {118B0BCE-C81F-4DA0-814C-2F8AC4867710}
247+
{7D55F9E2-8CB0-4B5C-800D-12F21D38B9C7} = {118B0BCE-C81F-4DA0-814C-2F8AC4867710}
234248
EndGlobalSection
235249
GlobalSection(ExtensibilityGlobals) = postSolution
236250
SolutionGuid = {F25BA702-70BE-4E04-8583-C71369C6D3D0}

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Seamlessly create use case oriented REST APIs based on T-SQL stored procedures.
1010
| [Dibix.Dapper](https://www.nuget.org/packages/Dibix.Dapper) | [![Dibix.Dapper](https://img.shields.io/nuget/v/Dibix.Dapper.svg)](https://www.nuget.org/packages/Dibix.Dapper) |
1111
| [Dibix.Http.Client](https://www.nuget.org/packages/Dibix.Http.Client) | [![Dibix.Http.Client](https://img.shields.io/nuget/v/Dibix.Http.Client.svg)](https://www.nuget.org/packages/Dibix.Http.Client) |
1212
| [Dibix.Http.Server](https://www.nuget.org/packages/Dibix.Http.Server) | [![Dibix.Http.Server](https://img.shields.io/nuget/v/Dibix.Http.Server.svg)](https://www.nuget.org/packages/Dibix.Http.Server) |
13+
| [Dibix.Http.Server.AspNet](https://www.nuget.org/packages/Dibix.Http.Server.AspNet) | [![Dibix.Http.Server.AspNet](https://img.shields.io/nuget/v/Dibix.Http.Server.AspNet.svg)](https://www.nuget.org/packages/Dibix.Http.Server.AspNet) |
14+
| [Dibix.Http.Server.AspNetCore](https://www.nuget.org/packages/Dibix.Http.Server.AspNetCore) | [![Dibix.Http.Server.AspNetCore](https://img.shields.io/nuget/v/Dibix.Http.Server.AspNetCore.svg)](https://www.nuget.org/packages/Dibix.Http.Server.AspNetCore) |
1315
| [Dibix.Sdk](https://www.nuget.org/packages/Dibix.Sdk) | [![Dibix.Sdk](https://img.shields.io/nuget/v/Dibix.Sdk.svg)](https://www.nuget.org/packages/Dibix.Sdk) |
1416
| [Dibix.Testing](https://www.nuget.org/packages/Dibix.Testing) | [![Dibix.Testing](https://img.shields.io/nuget/v/Dibix.Testing.svg)](https://www.nuget.org/packages/Dibix.Testing) |
1517
| [Dibix.Worker.Abstractions](https://www.nuget.org/packages/Dibix.Worker.Abstractions) | [![Dibix.Worker.Abstractions](https://img.shields.io/nuget/v/Dibix.Worker.Abstractions.svg)](https://www.nuget.org/packages/Dibix.Worker.Abstractions) |

‎build/azure-pipelines-template/build.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ steps:
2121
- Dibix.Sdk.Abstractions
2222
- Dibix.Http.Client
2323
- Dibix.Http.Server
24+
- Dibix.Http.Server.AspNet
25+
- Dibix.Http.Server.AspNetCore
2426
- Dibix.Sdk.Sql
2527
- Dibix.Sdk.CodeAnalysis
2628
- Dibix.Sdk.Generators

‎build/azure-pipelines-template/pack.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ steps:
1313
- Dibix.Dapper
1414
- Dibix.Http.Client
1515
- Dibix.Http.Server
16+
- Dibix.Http.Server.AspNet
17+
- Dibix.Http.Server.AspNetCore
1618
- Dibix.Sdk.Cli
1719
- Dibix.Testing
1820
- Dibix.Worker.Abstractions

‎build/build.ps1‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ $rootPath = Resolve-Path (Join-Path $PSScriptRoot '..')
2222
$sourcePath = Join-Path $rootPath 'src'
2323
$cleanPath = Join-Path $PSScriptRoot 'clean.bat'
2424

25-
Write-Warning -WarningAction Inquire "Please ensure, that none of the projects are currently opened in Visual Studio, before running this script. Otherwise it will automatically restore these projects after clean using the wrong runtimes."
25+
Write-Warning -WarningAction Inquire "Please ensure, that none of the projects are currently open in Visual Studio, before running this script. Otherwise it will automatically restore these projects after clean using the wrong runtimes."
2626

2727
# The dotnet CLI picks up the global.json, which selects the SDK, only from the current working directory
2828
# See: https://github.com/dotnet/sdk/issues/7465
@@ -42,6 +42,8 @@ try
4242
'Dibix.Sdk.Abstractions'
4343
'Dibix.Http.Client'
4444
'Dibix.Http.Server'
45+
'Dibix.Http.Server.AspNet'
46+
'Dibix.Http.Server.AspNetCore'
4547
'Dibix.Sdk.Sql'
4648
'Dibix.Sdk.CodeAnalysis'
4749
'Dibix.Sdk.Generators'

‎src/Dibix.Http.Client/Client/HttpClientExtensions.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Diagnostics;
4-
using System.IO;
53
using System.Linq;
64
using System.Net.Http;
75
using System.Net.Http.Formatting;

‎src/Dibix.Http.Host/Data/DatabaseScopeMiddleware.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Threading.Tasks;
22
using Dibix.Http.Server;
3+
using Dibix.Http.Server.AspNetCore;
34
using Microsoft.AspNetCore.Http;
45
using Microsoft.Extensions.DependencyInjection;
56

‎src/Dibix.Http.Host/Diagnostics/DiagnosticsMiddleware.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Collections.Generic;
22
using System.Threading.Tasks;
3-
using Dibix.Http.Server;
3+
using Dibix.Http.Server.AspNetCore;
44
using Microsoft.AspNetCore.Http;
55
using Microsoft.Extensions.Logging;
66
using Microsoft.Extensions.Options;

‎src/Dibix.Http.Host/Diagnostics/DiagnosticsOptions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Dibix.Http.Server;
1+
using Dibix.Http.Server.AspNetCore;
22

33
namespace Dibix.Http.Host
44
{

‎src/Dibix.Http.Host/Dibix.Http.Host.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
<ItemGroup>
2929
<ProjectReference Include="..\Dibix.Dapper\Dibix.Dapper.csproj" />
30-
<ProjectReference Include="..\Dibix.Http.Server\Dibix.Http.Server.csproj" />
30+
<ProjectReference Include="..\Dibix.Http.Server.AspNetCore\Dibix.Http.Server.AspNetCore.csproj" />
3131
</ItemGroup>
3232

3333
</Project>

0 commit comments

Comments
 (0)