From e743e900d3b23d0fb3db8db244ab8d492d862ac3 Mon Sep 17 00:00:00 2001 From: Trevor Pilley Date: Sun, 16 Feb 2020 17:32:34 +0000 Subject: [PATCH 01/20] Updated csharp_style_expression_bodied_* --- .editorconfig | 12 ++++++------ .../MicroLiteApiController.cs | 4 +--- .../MicroLiteApiController{TEntity,TId}.cs | 5 +---- .../MicroLiteReadOnlyApiController.cs | 4 +--- 4 files changed, 9 insertions(+), 16 deletions(-) diff --git a/.editorconfig b/.editorconfig index ccb1111..d547bcd 100644 --- a/.editorconfig +++ b/.editorconfig @@ -107,12 +107,12 @@ dotnet_style_prefer_conditional_expression_over_return = true:refactoring csharp_prefer_simple_default_expression = true:suggestion # Expression-bodied members -csharp_style_expression_bodied_methods = true:refactoring -csharp_style_expression_bodied_constructors = true:refactoring -csharp_style_expression_bodied_operators = true:refactoring -csharp_style_expression_bodied_properties = true:refactoring -csharp_style_expression_bodied_indexers = true:refactoring -csharp_style_expression_bodied_accessors = true:refactoring +csharp_style_expression_bodied_methods = true:suggestion +csharp_style_expression_bodied_constructors = true:suggestion +csharp_style_expression_bodied_operators = true:suggestion +csharp_style_expression_bodied_properties = true:suggestion +csharp_style_expression_bodied_indexers = true:suggestion +csharp_style_expression_bodied_accessors = true:suggestion csharp_style_expression_bodied_lambdas = true:refactoring csharp_style_expression_bodied_local_functions = true:refactoring diff --git a/MicroLite.Extensions.WebApi/MicroLiteApiController.cs b/MicroLite.Extensions.WebApi/MicroLiteApiController.cs index 84e95ae..823c977 100644 --- a/MicroLite.Extensions.WebApi/MicroLiteApiController.cs +++ b/MicroLite.Extensions.WebApi/MicroLiteApiController.cs @@ -29,9 +29,7 @@ public abstract class MicroLiteApiController : ApiController, IHaveAsyncSession /// This constructor allows for an inheriting class to easily inject an ISession via an IOC container. /// protected MicroLiteApiController(IAsyncSession session) - { - Session = session ?? throw new ArgumentNullException(nameof(session)); - } + => Session = session ?? throw new ArgumentNullException(nameof(session)); /// /// Gets or sets the for the current HTTP request. diff --git a/MicroLite.Extensions.WebApi/MicroLiteApiController{TEntity,TId}.cs b/MicroLite.Extensions.WebApi/MicroLiteApiController{TEntity,TId}.cs index b1b2d8a..7348232 100644 --- a/MicroLite.Extensions.WebApi/MicroLiteApiController{TEntity,TId}.cs +++ b/MicroLite.Extensions.WebApi/MicroLiteApiController{TEntity,TId}.cs @@ -36,10 +36,7 @@ public abstract class MicroLiteApiController : MicroLiteApiControl /// This constructor allows for an inheriting class to easily inject an ISession via an IOC container. /// protected MicroLiteApiController(IAsyncSession session) - : base(session) - { - GetEntityResourceUri = (TId id) => new Uri(Url.Link("DefaultApi", new { id })); - } + : base(session) => GetEntityResourceUri = (TId id) => new Uri(Url.Link("DefaultApi", new { id })); /// /// Gets or sets a function which returns the entity resource URI for the entity with the supplied . diff --git a/MicroLite.Extensions.WebApi/MicroLiteReadOnlyApiController.cs b/MicroLite.Extensions.WebApi/MicroLiteReadOnlyApiController.cs index b0a91ec..98db234 100644 --- a/MicroLite.Extensions.WebApi/MicroLiteReadOnlyApiController.cs +++ b/MicroLite.Extensions.WebApi/MicroLiteReadOnlyApiController.cs @@ -29,9 +29,7 @@ public abstract class MicroLiteReadOnlyApiController : ApiController, IHaveAsync /// This constructor allows for an inheriting class to easily inject an IReadOnlySession via an IOC container. /// protected MicroLiteReadOnlyApiController(IAsyncReadOnlySession session) - { - Session = session ?? throw new ArgumentNullException(nameof(session)); - } + => Session = session ?? throw new ArgumentNullException(nameof(session)); /// /// Gets or sets the for the current HTTP request. From 0ab7e5f9826b1eb6c72fd13184015d4bc7d51675 Mon Sep 17 00:00:00 2001 From: Trevor Pilley Date: Mon, 17 Feb 2020 11:36:47 +0000 Subject: [PATCH 02/20] Removed CustomDictionary as not needed --- CustomDictionary.xml | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 CustomDictionary.xml diff --git a/CustomDictionary.xml b/CustomDictionary.xml deleted file mode 100644 index 83530a4..0000000 --- a/CustomDictionary.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - Api - Asc - Desc - Lite - - - - - - - - - - - - - - Db - - - \ No newline at end of file From 880ea4630066e0fa50f5e0f388aa3904b9271d6f Mon Sep 17 00:00:00 2001 From: Trevor Pilley Date: Mon, 17 Feb 2020 11:36:49 +0000 Subject: [PATCH 03/20] Update MicroLite.Extensions.WebApi.csproj --- .../MicroLite.Extensions.WebApi.csproj | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj b/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj index 00f0c83..ce81cad 100644 --- a/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj +++ b/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj @@ -30,6 +30,7 @@ + @@ -58,8 +59,4 @@ - - - - From fb8bf5a4dea65ef652330b2ea336b616344deb88 Mon Sep 17 00:00:00 2001 From: Trevor Pilley Date: Mon, 17 Feb 2020 15:43:04 +0000 Subject: [PATCH 04/20] Update README.md --- README.md | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 1111501..c21a557 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,19 @@ -MicroLite.Extensions.WebApi -=========================== +# MicroLite.Extensions.WebApi + +## Status |Service|Status| |-------|------| -||[![NuGet version](https://badge.fury.io/nu/MicroLite.Extensions.WebApi.svg)](http://badge.fury.io/nu/MicroLite.Extensions.WebApi)| +|nuget|[![NuGet version](https://badge.fury.io/nu/MicroLite.Extensions.WebApi.svg)](http://badge.fury.io/nu/MicroLite.Extensions.WebApi)| |/develop|[![Build Status](https://dev.azure.com/trevorpilley/MicroLite-ORM/_apis/build/status/MicroLite-ORM.MicroLite.Extensions.WebApi?branchName=develop)](https://dev.azure.com/trevorpilley/MicroLite-ORM/_build/latest?definitionId=28&branchName=develop)| |/master|[![Build Status](https://dev.azure.com/trevorpilley/MicroLite-ORM/_apis/build/status/MicroLite-ORM.MicroLite.Extensions.WebApi?branchName=master)](https://dev.azure.com/trevorpilley/MicroLite-ORM/_build/latest?definitionId=28&branchName=master)| +## Installation + +Install the nuget package `Install-Package MicroLite.Extensions.WebApi` + +## Summary + MicroLite.Extensions.WebAp is a .NET 4.5 library which adds an extension for the MicroLite ORM Framework to integrate with ASP.NET WebApi. It is easy to use MicroLite with ASP.NET WebApi, simply supply your controller with a Session `IAsyncSession` or `IAsyncReadOnlySession` and use it in your controller actions. However, using the WebApi extension for MicroLite makes it even easier and contains some useful extras. @@ -17,10 +24,10 @@ Also, check out the [WebApi](http://microliteorm.wordpress.com/tag/WebApi/) tag For OData support, check out the [MicroLite.Extensions.WebApi.OData](https://github.com/MicroLite-ORM/MicroLite.Extensions.WebApi.OData) add-on. -### Supported .NET Versions +## Supported .NET Versions -The NuGet Package contains binaries compiled against: +The NuGet Package contains binaries compiled against (dependencies indented): * .NET Framework 4.5 -* - MicroLite 6.3.1 -* - Microsoft.AspNet.WebApi.Core 5.2.7 + * MicroLite 6.3.1 + * Microsoft.AspNet.WebApi.Core 5.2.7 From b07e0ef4d4741b8e759abe36f92f377642949429 Mon Sep 17 00:00:00 2001 From: Trevor Pilley Date: Wed, 19 Feb 2020 16:06:30 +0000 Subject: [PATCH 05/20] Updated to MicroLite 7.0.0-preview --- .../MicroLite.Extensions.WebApi.Tests.csproj | 10 +++++++--- MicroLite.Extensions.WebApi.Tests/app.config | 19 +++++++++++++++++++ .../packages.config | 2 +- .../MicroLite.Extensions.WebApi.csproj | 4 ++-- 4 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 MicroLite.Extensions.WebApi.Tests/app.config diff --git a/MicroLite.Extensions.WebApi.Tests/MicroLite.Extensions.WebApi.Tests.csproj b/MicroLite.Extensions.WebApi.Tests/MicroLite.Extensions.WebApi.Tests.csproj index 8455693..64dbde6 100644 --- a/MicroLite.Extensions.WebApi.Tests/MicroLite.Extensions.WebApi.Tests.csproj +++ b/MicroLite.Extensions.WebApi.Tests/MicroLite.Extensions.WebApi.Tests.csproj @@ -46,9 +46,10 @@ ..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll - - ..\packages\MicroLite.6.3.1\lib\net46\MicroLite.dll + + ..\packages\MicroLite.7.0.0-preview20200219.1\lib\net45\MicroLite.dll + ..\packages\Microsoft.CodeCoverage.16.5.0\lib\net45\Microsoft.VisualStudio.CodeCoverage.Shim.dll @@ -75,6 +76,8 @@ ..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll + + ..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll @@ -103,6 +106,7 @@ MicroLite.snk + @@ -130,4 +134,4 @@ - + \ No newline at end of file diff --git a/MicroLite.Extensions.WebApi.Tests/app.config b/MicroLite.Extensions.WebApi.Tests/app.config new file mode 100644 index 0000000..d331eb9 --- /dev/null +++ b/MicroLite.Extensions.WebApi.Tests/app.config @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MicroLite.Extensions.WebApi.Tests/packages.config b/MicroLite.Extensions.WebApi.Tests/packages.config index 4de1244..6570c8a 100644 --- a/MicroLite.Extensions.WebApi.Tests/packages.config +++ b/MicroLite.Extensions.WebApi.Tests/packages.config @@ -1,7 +1,7 @@  - + diff --git a/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj b/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj index ce81cad..da6c636 100644 --- a/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj +++ b/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj @@ -5,7 +5,7 @@ 7.3 true ..\MicroLite.snk - 6.7.0 + 7.0.0 Trevor Pilley and Project Contributors A .NET 4.5 library which adds an extension for the MicroLite ORM Framework to integrate with ASP.NET WebApi. Copyright 2012 - 2020 Project Contributors @@ -35,7 +35,7 @@ - + all From bbcaaf52c7c48de157666327619b4d2567f45a7b Mon Sep 17 00:00:00 2001 From: Trevor Pilley Date: Thu, 20 Feb 2020 10:35:10 +0000 Subject: [PATCH 06/20] Updated MicroLite 7.0.0-preview --- .../AutoManageTransactionAttributeTests.cs | 36 +++++++++---------- .../MicroLite.Extensions.WebApi.Tests.csproj | 2 +- .../MicroLiteApiControllerTests.cs | 2 +- .../MicroLiteApiController{T}Tests.cs | 20 +++++------ .../MicroLiteReadOnlyApiControllerTests.cs | 2 +- .../ValidateModelNotNullAttributeTests.cs | 1 - .../ValidateModelStateAttributeTests.cs | 1 - .../packages.config | 2 +- .../AutoManageTransactionAttribute.cs | 10 +++--- .../MicroLite.Extensions.WebApi.csproj | 2 +- .../MicroLiteApiController.cs | 6 ++-- .../MicroLiteApiController{TEntity,TId}.cs | 2 +- .../MicroLiteReadOnlyApiController.cs | 6 ++-- 13 files changed, 45 insertions(+), 47 deletions(-) diff --git a/MicroLite.Extensions.WebApi.Tests/AutoManageTransactionAttributeTests.cs b/MicroLite.Extensions.WebApi.Tests/AutoManageTransactionAttributeTests.cs index 840e7cc..37e7512 100644 --- a/MicroLite.Extensions.WebApi.Tests/AutoManageTransactionAttributeTests.cs +++ b/MicroLite.Extensions.WebApi.Tests/AutoManageTransactionAttributeTests.cs @@ -14,7 +14,7 @@ public class AutoManageTransactionAttributeTests { public class WhenCallingOnActionExecuted_WithAMicroLiteApiController_AndAnActiveTransaction { - private readonly Mock _mockSession = new Mock(); + private readonly Mock _mockSession = new Mock(); private readonly Mock _mockTransaction = new Mock(); public WhenCallingOnActionExecuted_WithAMicroLiteApiController_AndAnActiveTransaction() @@ -60,7 +60,7 @@ public void TheTransactionIsNotRolledBack() public class WhenCallingOnActionExecuted_WithAMicroLiteApiController_AndAutoManageTransactionIsFalse { - private readonly Mock _mockSession = new Mock(); + private readonly Mock _mockSession = new Mock(); private readonly Mock _mockTransaction = new Mock(); public WhenCallingOnActionExecuted_WithAMicroLiteApiController_AndAutoManageTransactionIsFalse() @@ -109,7 +109,7 @@ public void TheTransactionIsNotRolledBack() public class WhenCallingOnActionExecuted_WithAMicroLiteApiController_AndCommittingAnActiveTransactionThrowsAnException { - private readonly Mock _mockSession = new Mock(); + private readonly Mock _mockSession = new Mock(); private readonly Mock _mockTransaction = new Mock(); public WhenCallingOnActionExecuted_WithAMicroLiteApiController_AndCommittingAnActiveTransactionThrowsAnException() @@ -157,7 +157,7 @@ public void TheTransactionIsNotRolledBack() public class WhenCallingOnActionExecuted_WithAMicroLiteApiController_AndNoActiveTransaction { - private readonly Mock _mockSession = new Mock(); + private readonly Mock _mockSession = new Mock(); private readonly Mock _mockTransaction = new Mock(); public WhenCallingOnActionExecuted_WithAMicroLiteApiController_AndNoActiveTransaction() @@ -203,7 +203,7 @@ public void TheTransactionIsNotRolledBack() public class WhenCallingOnActionExecuted_WithAMicroLiteApiController_AndNoCurrentTransaction { - private readonly Mock _mockSession = new Mock(); + private readonly Mock _mockSession = new Mock(); [Fact] public void OnActionExecutedDoesNotThrowAnException() @@ -228,7 +228,7 @@ public void OnActionExecutedDoesNotThrowAnException() public class WhenCallingOnActionExecuted_WithAMicroLiteApiController_AndTheContextContainsAnException_AndTheTransactionHasBeenRolledBack { - private readonly Mock _mockSession = new Mock(); + private readonly Mock _mockSession = new Mock(); private readonly Mock _mockTransaction = new Mock(); public WhenCallingOnActionExecuted_WithAMicroLiteApiController_AndTheContextContainsAnException_AndTheTransactionHasBeenRolledBack() @@ -275,7 +275,7 @@ public void TheTransactionIsNotRolledBackAgain() public class WhenCallingOnActionExecuted_WithAMicroLiteApiController_AndTheContextContainsAnException_AndTheTransactionHasNotBeenRolledBack { - private readonly Mock _mockSession = new Mock(); + private readonly Mock _mockSession = new Mock(); private readonly Mock _mockTransaction = new Mock(); public WhenCallingOnActionExecuted_WithAMicroLiteApiController_AndTheContextContainsAnException_AndTheTransactionHasNotBeenRolledBack() @@ -322,7 +322,7 @@ public void TheTransactionIsRolledBack() public class WhenCallingOnActionExecuted_WithAMicroLiteReadOnlyApiController_AndAnActiveTransaction { - private readonly Mock _mockSession = new Mock(); + private readonly Mock _mockSession = new Mock(); private readonly Mock _mockTransaction = new Mock(); public WhenCallingOnActionExecuted_WithAMicroLiteReadOnlyApiController_AndAnActiveTransaction() @@ -368,7 +368,7 @@ public void TheTransactionIsNotRolledBack() public class WhenCallingOnActionExecuted_WithAMicroLiteReadOnlyApiController_AndAutoManageTransactionIsFalse { - private readonly Mock _mockSession = new Mock(); + private readonly Mock _mockSession = new Mock(); private readonly Mock _mockTransaction = new Mock(); public WhenCallingOnActionExecuted_WithAMicroLiteReadOnlyApiController_AndAutoManageTransactionIsFalse() @@ -417,7 +417,7 @@ public void TheTransactionIsNotRolledBack() public class WhenCallingOnActionExecuted_WithAMicroLiteReadOnlyApiController_AndCommittingAnActiveTransactionThrowsAnException { - private readonly Mock _mockSession = new Mock(); + private readonly Mock _mockSession = new Mock(); private readonly Mock _mockTransaction = new Mock(); public WhenCallingOnActionExecuted_WithAMicroLiteReadOnlyApiController_AndCommittingAnActiveTransactionThrowsAnException() @@ -465,7 +465,7 @@ public void TheTransactionIsNotRolledBack() public class WhenCallingOnActionExecuted_WithAMicroLiteReadOnlyApiController_AndNoActiveTransaction { - private readonly Mock _mockSession = new Mock(); + private readonly Mock _mockSession = new Mock(); private readonly Mock _mockTransaction = new Mock(); public WhenCallingOnActionExecuted_WithAMicroLiteReadOnlyApiController_AndNoActiveTransaction() @@ -511,7 +511,7 @@ public void TheTransactionIsNotRolledBack() public class WhenCallingOnActionExecuted_WithAMicroLiteReadOnlyApiController_AndNoCurrentTransaction { - private readonly Mock _mockSession = new Mock(); + private readonly Mock _mockSession = new Mock(); [Fact] public void OnActionExecutedDoesNotThrowAnException() @@ -536,7 +536,7 @@ public void OnActionExecutedDoesNotThrowAnException() public class WhenCallingOnActionExecuted_WithAMicroLiteReadOnlyApiController_AndTheContextContainsAnException_AndTheTransactionHasBeenRolledBack { - private readonly Mock _mockSession = new Mock(); + private readonly Mock _mockSession = new Mock(); private readonly Mock _mockTransaction = new Mock(); public WhenCallingOnActionExecuted_WithAMicroLiteReadOnlyApiController_AndTheContextContainsAnException_AndTheTransactionHasBeenRolledBack() @@ -583,7 +583,7 @@ public void TheTransactionIsNotRolledBackAgain() public class WhenCallingOnActionExecuted_WithAMicroLiteReadOnlyApiController_AndTheContextContainsAnException_AndTheTransactionHasNotBeenRolledBack { - private readonly Mock _mockSession = new Mock(); + private readonly Mock _mockSession = new Mock(); private readonly Mock _mockTransaction = new Mock(); public WhenCallingOnActionExecuted_WithAMicroLiteReadOnlyApiController_AndTheContextContainsAnException_AndTheTransactionHasNotBeenRolledBack() @@ -630,7 +630,7 @@ public void TheTransactionIsRolledBack() public class WhenCallingOnActionExecuting_WithAMicroLiteApiController { - private readonly Mock _mockSession = new Mock(); + private readonly Mock _mockSession = new Mock(); public WhenCallingOnActionExecuting_WithAMicroLiteApiController() { @@ -657,7 +657,7 @@ public void ATransactionIsStarted() public class WhenCallingOnActionExecuting_WithAMicroLiteApiController_AndAutoManageTransactionIsFalse { - private readonly Mock _mockSession = new Mock(); + private readonly Mock _mockSession = new Mock(); public WhenCallingOnActionExecuting_WithAMicroLiteApiController_AndAutoManageTransactionIsFalse() { @@ -687,7 +687,7 @@ public void ATransactionIsNotStarted() public class WhenCallingOnActionExecuting_WithAMicroLiteReadOnlyApiController { - private readonly Mock _mockSession = new Mock(); + private readonly Mock _mockSession = new Mock(); public WhenCallingOnActionExecuting_WithAMicroLiteReadOnlyApiController() { @@ -714,7 +714,7 @@ public void ATransactionIsStarted() public class WhenCallingOnActionExecuting_WithAMicroLiteReadOnlyApiController_AndAutoManageTransactionIsFalse { - private readonly Mock _mockSession = new Mock(); + private readonly Mock _mockSession = new Mock(); public WhenCallingOnActionExecuting_WithAMicroLiteReadOnlyApiController_AndAutoManageTransactionIsFalse() { diff --git a/MicroLite.Extensions.WebApi.Tests/MicroLite.Extensions.WebApi.Tests.csproj b/MicroLite.Extensions.WebApi.Tests/MicroLite.Extensions.WebApi.Tests.csproj index 64dbde6..137cb48 100644 --- a/MicroLite.Extensions.WebApi.Tests/MicroLite.Extensions.WebApi.Tests.csproj +++ b/MicroLite.Extensions.WebApi.Tests/MicroLite.Extensions.WebApi.Tests.csproj @@ -47,7 +47,7 @@ ..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll - ..\packages\MicroLite.7.0.0-preview20200219.1\lib\net45\MicroLite.dll + ..\packages\MicroLite.7.0.0-preview20200220.1\lib\net45\MicroLite.dll diff --git a/MicroLite.Extensions.WebApi.Tests/MicroLiteApiControllerTests.cs b/MicroLite.Extensions.WebApi.Tests/MicroLiteApiControllerTests.cs index 87865ed..2e0335b 100644 --- a/MicroLite.Extensions.WebApi.Tests/MicroLiteApiControllerTests.cs +++ b/MicroLite.Extensions.WebApi.Tests/MicroLiteApiControllerTests.cs @@ -11,7 +11,7 @@ public class MicroLiteApiControllerTests public class WhenConstructedWithAnISession { private readonly MicroLiteApiController _controller; - private readonly IAsyncSession _session = new Mock().Object; + private readonly ISession _session = new Mock().Object; public WhenConstructedWithAnISession() { diff --git a/MicroLite.Extensions.WebApi.Tests/MicroLiteApiController{T}Tests.cs b/MicroLite.Extensions.WebApi.Tests/MicroLiteApiController{T}Tests.cs index b4fa241..c7f13cc 100644 --- a/MicroLite.Extensions.WebApi.Tests/MicroLiteApiController{T}Tests.cs +++ b/MicroLite.Extensions.WebApi.Tests/MicroLiteApiController{T}Tests.cs @@ -16,7 +16,7 @@ public class WhenCallingDeleteAndAnEntityIsDeleted { private readonly CustomerController _controller; private readonly int _identifier = 12345; - private readonly Mock _mockSession = new Mock(); + private readonly Mock _mockSession = new Mock(); private readonly HttpResponseMessage _response; public WhenCallingDeleteAndAnEntityIsDeleted() @@ -42,7 +42,7 @@ public class WhenCallingDeleteAndAnEntityIsNotDeleted { private readonly CustomerController _controller; private readonly int _identifier = 12345; - private readonly Mock _mockSession = new Mock(); + private readonly Mock _mockSession = new Mock(); private readonly HttpResponseMessage _response; public WhenCallingDeleteAndAnEntityIsNotDeleted() @@ -68,7 +68,7 @@ public class WhenCallingGetAndAnEntityIsNotReturned { private readonly CustomerController _controller; private readonly int _identifier = 12345; - private readonly Mock _mockSession = new Mock(); + private readonly Mock _mockSession = new Mock(); private readonly HttpResponseMessage _response; public WhenCallingGetAndAnEntityIsNotReturned() @@ -101,7 +101,7 @@ public class WhenCallingGetAndAnEntityIsReturned private readonly CustomerController _controller; private readonly Customer _customer = new Customer(); private readonly int _identifier = 12345; - private readonly Mock _mockSession = new Mock(); + private readonly Mock _mockSession = new Mock(); private readonly HttpResponseMessage _response; public WhenCallingGetAndAnEntityIsReturned() @@ -135,7 +135,7 @@ public class WhenCallingPost private readonly CustomerController _controller; private readonly Customer _customer = new Customer(); private readonly int _identifier = 12345; - private readonly Mock _mockSession = new Mock(); + private readonly Mock _mockSession = new Mock(); private readonly HttpResponseMessage _response; public WhenCallingPost() @@ -179,7 +179,7 @@ public class WhenCallingPutAndAnEntityIsNotReturned { private readonly CustomerController _controller; private readonly int _identifier = 12345; - private readonly Mock _mockSession = new Mock(); + private readonly Mock _mockSession = new Mock(); private readonly HttpResponseMessage _response; public WhenCallingPutAndAnEntityIsNotReturned() @@ -211,7 +211,7 @@ public class WhenCallingPutAndAnEntityIsNotUpdated { private readonly CustomerController _controller; private readonly int _identifier = 12345; - private readonly Mock _mockSession = new Mock(); + private readonly Mock _mockSession = new Mock(); private readonly HttpResponseMessage _response; public WhenCallingPutAndAnEntityIsNotUpdated() @@ -244,7 +244,7 @@ public class WhenCallingPutAndAnEntityIsUpdated { private readonly CustomerController _controller; private readonly int _identifier = 12345; - private readonly Mock _mockSession = new Mock(); + private readonly Mock _mockSession = new Mock(); private readonly HttpResponseMessage _response; private readonly Customer _updatedCustomer = new Customer @@ -287,7 +287,7 @@ public void TheUpdatedCustomerShouldHaveTheIdentifierSet() public class WhenConstructedWithAnISession { private readonly MicroLiteApiController _controller; - private readonly IAsyncSession _session = new Mock().Object; + private readonly ISession _session = new Mock().Object; public WhenConstructedWithAnISession() { @@ -308,7 +308,7 @@ public void TheSessionIsSet() private class CustomerController : MicroLiteApiController { - public CustomerController(IAsyncSession session) + public CustomerController(ISession session) : base(session) { GetEntityResourceUri = (int id) => diff --git a/MicroLite.Extensions.WebApi.Tests/MicroLiteReadOnlyApiControllerTests.cs b/MicroLite.Extensions.WebApi.Tests/MicroLiteReadOnlyApiControllerTests.cs index 2b9a723..610709f 100644 --- a/MicroLite.Extensions.WebApi.Tests/MicroLiteReadOnlyApiControllerTests.cs +++ b/MicroLite.Extensions.WebApi.Tests/MicroLiteReadOnlyApiControllerTests.cs @@ -11,7 +11,7 @@ public class MicroLiteReadOnlyApiControllerTests public class WhenConstructedWithAnIReadOnlySession { private readonly MicroLiteReadOnlyApiController _controller; - private readonly IAsyncReadOnlySession _session = new Mock().Object; + private readonly IReadOnlySession _session = new Mock().Object; public WhenConstructedWithAnIReadOnlySession() { diff --git a/MicroLite.Extensions.WebApi.Tests/ValidateModelNotNullAttributeTests.cs b/MicroLite.Extensions.WebApi.Tests/ValidateModelNotNullAttributeTests.cs index 8139371..b2519db 100644 --- a/MicroLite.Extensions.WebApi.Tests/ValidateModelNotNullAttributeTests.cs +++ b/MicroLite.Extensions.WebApi.Tests/ValidateModelNotNullAttributeTests.cs @@ -3,7 +3,6 @@ using System.Web.Http; using System.Web.Http.Controllers; using System.Web.Http.Routing; -using MicroLite.Extensions.WebApi; using Moq; using Xunit; diff --git a/MicroLite.Extensions.WebApi.Tests/ValidateModelStateAttributeTests.cs b/MicroLite.Extensions.WebApi.Tests/ValidateModelStateAttributeTests.cs index 08a4078..3b86a02 100644 --- a/MicroLite.Extensions.WebApi.Tests/ValidateModelStateAttributeTests.cs +++ b/MicroLite.Extensions.WebApi.Tests/ValidateModelStateAttributeTests.cs @@ -3,7 +3,6 @@ using System.Web.Http; using System.Web.Http.Controllers; using System.Web.Http.Routing; -using MicroLite.Extensions.WebApi; using Moq; using Xunit; diff --git a/MicroLite.Extensions.WebApi.Tests/packages.config b/MicroLite.Extensions.WebApi.Tests/packages.config index 6570c8a..ffc0bd5 100644 --- a/MicroLite.Extensions.WebApi.Tests/packages.config +++ b/MicroLite.Extensions.WebApi.Tests/packages.config @@ -1,7 +1,7 @@  - + diff --git a/MicroLite.Extensions.WebApi/AutoManageTransactionAttribute.cs b/MicroLite.Extensions.WebApi/AutoManageTransactionAttribute.cs index ff36e5c..67d5bd6 100644 --- a/MicroLite.Extensions.WebApi/AutoManageTransactionAttribute.cs +++ b/MicroLite.Extensions.WebApi/AutoManageTransactionAttribute.cs @@ -92,13 +92,13 @@ public override void OnActionExecuted(HttpActionExecutedContext actionExecutedCo throw new ArgumentNullException(nameof(actionExecutedContext)); } - if (actionExecutedContext.ActionContext.ControllerContext.Controller is IHaveAsyncSession controller) + if (actionExecutedContext.ActionContext.ControllerContext.Controller is IHaveSession controller) { OnActionExecuted(controller.Session, actionExecutedContext.Exception); return; } - if (actionExecutedContext.ActionContext.ControllerContext.Controller is IHaveAsyncReadOnlySession readOnlyController) + if (actionExecutedContext.ActionContext.ControllerContext.Controller is IHaveReadOnlySession readOnlyController) { OnActionExecuted(readOnlyController.Session, actionExecutedContext.Exception); return; @@ -121,20 +121,20 @@ public override void OnActionExecuting(HttpActionContext actionContext) throw new ArgumentNullException(nameof(actionContext)); } - if (actionContext.ControllerContext.Controller is IHaveAsyncSession controller) + if (actionContext.ControllerContext.Controller is IHaveSession controller) { controller.Session.BeginTransaction(IsolationLevel); return; } - if (actionContext.ControllerContext.Controller is IHaveAsyncReadOnlySession readOnlyController) + if (actionContext.ControllerContext.Controller is IHaveReadOnlySession readOnlyController) { readOnlyController.Session.BeginTransaction(IsolationLevel); return; } } - private static void OnActionExecuted(IAsyncReadOnlySession session, Exception exception) + private static void OnActionExecuted(IReadOnlySession session, Exception exception) { if (session.CurrentTransaction is null) { diff --git a/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj b/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj index da6c636..f753a97 100644 --- a/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj +++ b/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj @@ -35,7 +35,7 @@ - + all diff --git a/MicroLite.Extensions.WebApi/MicroLiteApiController.cs b/MicroLite.Extensions.WebApi/MicroLiteApiController.cs index 823c977..cf05525 100644 --- a/MicroLite.Extensions.WebApi/MicroLiteApiController.cs +++ b/MicroLite.Extensions.WebApi/MicroLiteApiController.cs @@ -19,7 +19,7 @@ namespace MicroLite.Extensions.WebApi /// /// Provides access to a MicroLite ISession in addition to the base ASP.NET WebApi controller. /// - public abstract class MicroLiteApiController : ApiController, IHaveAsyncSession + public abstract class MicroLiteApiController : ApiController, IHaveSession { /// /// Initialises a new instance of the class with an ISession. @@ -28,12 +28,12 @@ public abstract class MicroLiteApiController : ApiController, IHaveAsyncSession /// /// This constructor allows for an inheriting class to easily inject an ISession via an IOC container. /// - protected MicroLiteApiController(IAsyncSession session) + protected MicroLiteApiController(ISession session) => Session = session ?? throw new ArgumentNullException(nameof(session)); /// /// Gets or sets the for the current HTTP request. /// - public IAsyncSession Session { get; set; } + public ISession Session { get; set; } } } diff --git a/MicroLite.Extensions.WebApi/MicroLiteApiController{TEntity,TId}.cs b/MicroLite.Extensions.WebApi/MicroLiteApiController{TEntity,TId}.cs index 7348232..d665dd2 100644 --- a/MicroLite.Extensions.WebApi/MicroLiteApiController{TEntity,TId}.cs +++ b/MicroLite.Extensions.WebApi/MicroLiteApiController{TEntity,TId}.cs @@ -35,7 +35,7 @@ public abstract class MicroLiteApiController : MicroLiteApiControl /// /// This constructor allows for an inheriting class to easily inject an ISession via an IOC container. /// - protected MicroLiteApiController(IAsyncSession session) + protected MicroLiteApiController(ISession session) : base(session) => GetEntityResourceUri = (TId id) => new Uri(Url.Link("DefaultApi", new { id })); /// diff --git a/MicroLite.Extensions.WebApi/MicroLiteReadOnlyApiController.cs b/MicroLite.Extensions.WebApi/MicroLiteReadOnlyApiController.cs index 98db234..c91f45d 100644 --- a/MicroLite.Extensions.WebApi/MicroLiteReadOnlyApiController.cs +++ b/MicroLite.Extensions.WebApi/MicroLiteReadOnlyApiController.cs @@ -19,7 +19,7 @@ namespace MicroLite.Extensions.WebApi /// /// Provides access to a MicroLite IReadOnlySession in addition to the base ASP.NET WebApi controller. /// - public abstract class MicroLiteReadOnlyApiController : ApiController, IHaveAsyncReadOnlySession + public abstract class MicroLiteReadOnlyApiController : ApiController, IHaveReadOnlySession { /// /// Initialises a new instance of the class with an IReadOnlySession. @@ -28,12 +28,12 @@ public abstract class MicroLiteReadOnlyApiController : ApiController, IHaveAsync /// /// This constructor allows for an inheriting class to easily inject an IReadOnlySession via an IOC container. /// - protected MicroLiteReadOnlyApiController(IAsyncReadOnlySession session) + protected MicroLiteReadOnlyApiController(IReadOnlySession session) => Session = session ?? throw new ArgumentNullException(nameof(session)); /// /// Gets or sets the for the current HTTP request. /// - public IAsyncReadOnlySession Session { get; set; } + public IReadOnlySession Session { get; set; } } } From 995cad048253e64db90c12feb1397b86df2e482c Mon Sep 17 00:00:00 2001 From: Trevor Pilley Date: Thu, 20 Feb 2020 17:00:01 +0000 Subject: [PATCH 07/20] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c21a557..7ead972 100644 --- a/README.md +++ b/README.md @@ -29,5 +29,5 @@ For OData support, check out the [MicroLite.Extensions.WebApi.OData](https://git The NuGet Package contains binaries compiled against (dependencies indented): * .NET Framework 4.5 - * MicroLite 6.3.1 + * MicroLite 7.0.0 * Microsoft.AspNet.WebApi.Core 5.2.7 From a33e18d9f8e5852155c0e32e3f138bd2e6c63ac1 Mon Sep 17 00:00:00 2001 From: Trevor Pilley Date: Wed, 26 Feb 2020 16:01:47 +0000 Subject: [PATCH 08/20] Updates now that infrastructure interfaces have get only sessions --- .../MicroLite.Extensions.WebApi.Tests.csproj | 2 +- MicroLite.Extensions.WebApi.Tests/packages.config | 2 +- .../MicroLite.Extensions.WebApi.csproj | 2 +- MicroLite.Extensions.WebApi/MicroLiteApiController.cs | 4 ++-- MicroLite.Extensions.WebApi/MicroLiteReadOnlyApiController.cs | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/MicroLite.Extensions.WebApi.Tests/MicroLite.Extensions.WebApi.Tests.csproj b/MicroLite.Extensions.WebApi.Tests/MicroLite.Extensions.WebApi.Tests.csproj index 137cb48..8650e66 100644 --- a/MicroLite.Extensions.WebApi.Tests/MicroLite.Extensions.WebApi.Tests.csproj +++ b/MicroLite.Extensions.WebApi.Tests/MicroLite.Extensions.WebApi.Tests.csproj @@ -47,7 +47,7 @@ ..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll - ..\packages\MicroLite.7.0.0-preview20200220.1\lib\net45\MicroLite.dll + ..\packages\MicroLite.7.0.0-preview20200226.1\lib\net45\MicroLite.dll diff --git a/MicroLite.Extensions.WebApi.Tests/packages.config b/MicroLite.Extensions.WebApi.Tests/packages.config index ffc0bd5..6d4aaee 100644 --- a/MicroLite.Extensions.WebApi.Tests/packages.config +++ b/MicroLite.Extensions.WebApi.Tests/packages.config @@ -1,7 +1,7 @@  - + diff --git a/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj b/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj index f753a97..6fda1b9 100644 --- a/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj +++ b/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj @@ -35,7 +35,7 @@ - + all diff --git a/MicroLite.Extensions.WebApi/MicroLiteApiController.cs b/MicroLite.Extensions.WebApi/MicroLiteApiController.cs index cf05525..0af6ca5 100644 --- a/MicroLite.Extensions.WebApi/MicroLiteApiController.cs +++ b/MicroLite.Extensions.WebApi/MicroLiteApiController.cs @@ -32,8 +32,8 @@ protected MicroLiteApiController(ISession session) => Session = session ?? throw new ArgumentNullException(nameof(session)); /// - /// Gets or sets the for the current HTTP request. + /// Gets the for the current HTTP request. /// - public ISession Session { get; set; } + public ISession Session { get; } } } diff --git a/MicroLite.Extensions.WebApi/MicroLiteReadOnlyApiController.cs b/MicroLite.Extensions.WebApi/MicroLiteReadOnlyApiController.cs index c91f45d..16f64ac 100644 --- a/MicroLite.Extensions.WebApi/MicroLiteReadOnlyApiController.cs +++ b/MicroLite.Extensions.WebApi/MicroLiteReadOnlyApiController.cs @@ -32,8 +32,8 @@ protected MicroLiteReadOnlyApiController(IReadOnlySession session) => Session = session ?? throw new ArgumentNullException(nameof(session)); /// - /// Gets or sets the for the current HTTP request. + /// Gets the for the current HTTP request. /// - public IReadOnlySession Session { get; set; } + public IReadOnlySession Session { get; } } } From 757c0e0919c3a94fe994f6ce3754173ed2d6e7fc Mon Sep 17 00:00:00 2001 From: Trevor Pilley Date: Fri, 13 Mar 2020 14:13:10 +0000 Subject: [PATCH 09/20] Update .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index cb43218..058a2d9 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,9 @@ bld/ [Ll]og/ [Ll]ogs/ +# Visual Studio Code cache/options directory +.vscode/ + # Visual Studio 2015/2017 cache/options directory .vs/ # Uncomment if you have tasks that create the project's static files in wwwroot From a7b5ede177027b3bafdbff4176abc261655c3559 Mon Sep 17 00:00:00 2001 From: Trevor Pilley Date: Fri, 13 Mar 2020 14:13:48 +0000 Subject: [PATCH 10/20] Update README.md --- README.md | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 7ead972..65a646e 100644 --- a/README.md +++ b/README.md @@ -1,29 +1,22 @@ -# MicroLite.Extensions.WebApi - -## Status +MicroLite.Extensions.WebApi +=========================== |Service|Status| |-------|------| -|nuget|[![NuGet version](https://badge.fury.io/nu/MicroLite.Extensions.WebApi.svg)](http://badge.fury.io/nu/MicroLite.Extensions.WebApi)| +||[![NuGet version](https://badge.fury.io/nu/MicroLite.Extensions.WebApi.svg)](http://badge.fury.io/nu/MicroLite.Extensions.WebApi)| |/develop|[![Build Status](https://dev.azure.com/trevorpilley/MicroLite-ORM/_apis/build/status/MicroLite-ORM.MicroLite.Extensions.WebApi?branchName=develop)](https://dev.azure.com/trevorpilley/MicroLite-ORM/_build/latest?definitionId=28&branchName=develop)| |/master|[![Build Status](https://dev.azure.com/trevorpilley/MicroLite-ORM/_apis/build/status/MicroLite-ORM.MicroLite.Extensions.WebApi?branchName=master)](https://dev.azure.com/trevorpilley/MicroLite-ORM/_build/latest?definitionId=28&branchName=master)| +MicroLite.Extensions.WebAp is a .NET 4.5 library which adds an extension for the MicroLite ORM Framework to integrate with ASP.NET WebApi. + ## Installation Install the nuget package `Install-Package MicroLite.Extensions.WebApi` -## Summary - -MicroLite.Extensions.WebAp is a .NET 4.5 library which adds an extension for the MicroLite ORM Framework to integrate with ASP.NET WebApi. +## Configuration It is easy to use MicroLite with ASP.NET WebApi, simply supply your controller with a Session `IAsyncSession` or `IAsyncReadOnlySession` and use it in your controller actions. However, using the WebApi extension for MicroLite makes it even easier and contains some useful extras. -To find out more, head over to the [Wiki](https://github.com/MicroLite-ORM/MicroLite.Extensions.WebApi/wiki). - -Also, check out the [WebApi](http://microliteorm.wordpress.com/tag/WebApi/) tag on the MicroLite Blog. - -For OData support, check out the [MicroLite.Extensions.WebApi.OData](https://github.com/MicroLite-ORM/MicroLite.Extensions.WebApi.OData) add-on. - ## Supported .NET Versions The NuGet Package contains binaries compiled against (dependencies indented): @@ -31,3 +24,8 @@ The NuGet Package contains binaries compiled against (dependencies indented): * .NET Framework 4.5 * MicroLite 7.0.0 * Microsoft.AspNet.WebApi.Core 5.2.7 + +To find out more, head over to the [Wiki](https://github.com/MicroLite-ORM/MicroLite.Extensions.WebApi/wiki), or check out the [WebApi](http://microliteorm.wordpress.com/tag/WebApi/) tag on the MicroLite Blog. + +For OData support, check out the [MicroLite.Extensions.WebApi.OData](https://github.com/MicroLite-ORM/MicroLite.Extensions.WebApi.OData) add-on. + From cc86590bf791b1f9fdab9290701946ea929584a9 Mon Sep 17 00:00:00 2001 From: Trevor Pilley Date: Fri, 13 Mar 2020 14:13:52 +0000 Subject: [PATCH 11/20] Update MicroLiteApiController.cs --- MicroLite.Extensions.WebApi/MicroLiteApiController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MicroLite.Extensions.WebApi/MicroLiteApiController.cs b/MicroLite.Extensions.WebApi/MicroLiteApiController.cs index 0af6ca5..7d0fd4f 100644 --- a/MicroLite.Extensions.WebApi/MicroLiteApiController.cs +++ b/MicroLite.Extensions.WebApi/MicroLiteApiController.cs @@ -24,9 +24,9 @@ public abstract class MicroLiteApiController : ApiController, IHaveSession /// /// Initialises a new instance of the class with an ISession. /// - /// The ISession for the current HTTP request. + /// The for the current HTTP request. /// - /// This constructor allows for an inheriting class to easily inject an ISession via an IOC container. + /// This constructor allows for an inheriting class to easily inject an via an IOC container. /// protected MicroLiteApiController(ISession session) => Session = session ?? throw new ArgumentNullException(nameof(session)); From f93a8385e9819afd64f56ef7a5e8d9ee13a81e69 Mon Sep 17 00:00:00 2001 From: Trevor Pilley Date: Fri, 13 Mar 2020 14:13:58 +0000 Subject: [PATCH 12/20] Update AssemblyInfo.cs --- .../Properties/AssemblyInfo.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/MicroLite.Extensions.WebApi.Tests/Properties/AssemblyInfo.cs b/MicroLite.Extensions.WebApi.Tests/Properties/AssemblyInfo.cs index 0c91c1c..9e06419 100644 --- a/MicroLite.Extensions.WebApi.Tests/Properties/AssemblyInfo.cs +++ b/MicroLite.Extensions.WebApi.Tests/Properties/AssemblyInfo.cs @@ -8,7 +8,7 @@ [assembly: AssemblyTitle("MicroLite.Extensions.WebApi.Tests")] [assembly: AssemblyDescription("Unit Tests for the MicroLite.Extensions.WebApi library")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] +[assembly: AssemblyCompany("Project Contributors")] [assembly: AssemblyProduct("MicroLite.Extensions.WebApi.Tests")] [assembly: AssemblyCopyright("Copyright Project Contributors all rights reserved.")] [assembly: AssemblyTrademark("")] @@ -28,6 +28,9 @@ // 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.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: CollectionBehavior(DisableTestParallelization = true)] +[assembly: CollectionBehavior(DisableTestParallelization = true)] \ No newline at end of file From dfaf9f73f47a3bfbd691196d8d542bff3bcd4130 Mon Sep 17 00:00:00 2001 From: Trevor Pilley Date: Fri, 13 Mar 2020 14:14:01 +0000 Subject: [PATCH 13/20] Update MicroLite.Extensions.WebApi.Tests.csproj --- .../MicroLite.Extensions.WebApi.Tests.csproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MicroLite.Extensions.WebApi.Tests/MicroLite.Extensions.WebApi.Tests.csproj b/MicroLite.Extensions.WebApi.Tests/MicroLite.Extensions.WebApi.Tests.csproj index 8650e66..9f448d2 100644 --- a/MicroLite.Extensions.WebApi.Tests/MicroLite.Extensions.WebApi.Tests.csproj +++ b/MicroLite.Extensions.WebApi.Tests/MicroLite.Extensions.WebApi.Tests.csproj @@ -76,7 +76,7 @@ ..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll - + ..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll @@ -109,15 +109,15 @@ - - - {48714fd3-e87a-4a49-b8fb-2644bd1c577b} MicroLite.Extensions.WebApi + + + From bfb7dc43647fe4297f9e06467474bc38157bbbdb Mon Sep 17 00:00:00 2001 From: Trevor Pilley Date: Fri, 13 Mar 2020 14:15:31 +0000 Subject: [PATCH 14/20] Updated SecurityCodeScan added SonarAnalyzer.CSharp --- .../AutoManageTransactionAttribute.cs | 2 -- .../MicroLite.Extensions.WebApi.csproj | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/MicroLite.Extensions.WebApi/AutoManageTransactionAttribute.cs b/MicroLite.Extensions.WebApi/AutoManageTransactionAttribute.cs index 67d5bd6..17f44a3 100644 --- a/MicroLite.Extensions.WebApi/AutoManageTransactionAttribute.cs +++ b/MicroLite.Extensions.WebApi/AutoManageTransactionAttribute.cs @@ -101,7 +101,6 @@ public override void OnActionExecuted(HttpActionExecutedContext actionExecutedCo if (actionExecutedContext.ActionContext.ControllerContext.Controller is IHaveReadOnlySession readOnlyController) { OnActionExecuted(readOnlyController.Session, actionExecutedContext.Exception); - return; } } @@ -130,7 +129,6 @@ public override void OnActionExecuting(HttpActionContext actionContext) if (actionContext.ControllerContext.Controller is IHaveReadOnlySession readOnlyController) { readOnlyController.Session.BeginTransaction(IsolationLevel); - return; } } diff --git a/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj b/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj index 6fda1b9..7528091 100644 --- a/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj +++ b/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj @@ -41,7 +41,11 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + all runtime; build; native; contentfiles; analyzers; buildtransitive From 8589caeb49c17c0fcfa1cbcfa3eaf34904affd59 Mon Sep 17 00:00:00 2001 From: Trevor Pilley Date: Fri, 13 Mar 2020 16:49:50 +0000 Subject: [PATCH 15/20] Updated MicroLite 7.0.0-preview --- .../MicroLite.Extensions.WebApi.Tests.csproj | 2 +- MicroLite.Extensions.WebApi.Tests/packages.config | 2 +- MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MicroLite.Extensions.WebApi.Tests/MicroLite.Extensions.WebApi.Tests.csproj b/MicroLite.Extensions.WebApi.Tests/MicroLite.Extensions.WebApi.Tests.csproj index 9f448d2..6a8b301 100644 --- a/MicroLite.Extensions.WebApi.Tests/MicroLite.Extensions.WebApi.Tests.csproj +++ b/MicroLite.Extensions.WebApi.Tests/MicroLite.Extensions.WebApi.Tests.csproj @@ -47,7 +47,7 @@ ..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll - ..\packages\MicroLite.7.0.0-preview20200226.1\lib\net45\MicroLite.dll + ..\packages\MicroLite.7.0.0-preview20200313.1\lib\net45\MicroLite.dll diff --git a/MicroLite.Extensions.WebApi.Tests/packages.config b/MicroLite.Extensions.WebApi.Tests/packages.config index 6d4aaee..c875f6b 100644 --- a/MicroLite.Extensions.WebApi.Tests/packages.config +++ b/MicroLite.Extensions.WebApi.Tests/packages.config @@ -1,7 +1,7 @@  - + diff --git a/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj b/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj index 7528091..aaf8ad6 100644 --- a/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj +++ b/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj @@ -35,7 +35,7 @@ - + all From 38269a5b968a6b7acd7ef87f2a8d4b27ed3f2b02 Mon Sep 17 00:00:00 2001 From: Trevor Pilley Date: Mon, 16 Mar 2020 20:56:30 +0000 Subject: [PATCH 16/20] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 65a646e..269e759 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Install the nuget package `Install-Package MicroLite.Extensions.WebApi` ## Configuration -It is easy to use MicroLite with ASP.NET WebApi, simply supply your controller with a Session `IAsyncSession` or `IAsyncReadOnlySession` and use it in your controller actions. However, using the WebApi extension for MicroLite makes it even easier and contains some useful extras. +It is easy to use MicroLite with ASP.NET WebApi, simply supply your controller with a Session `ISession` or `IReadOnlySession` and use it in your controller actions. However, using the WebApi extension for MicroLite makes it even easier and contains some useful extras. ## Supported .NET Versions From 96797781c5d046bc0876b33c698fedd1050ca452 Mon Sep 17 00:00:00 2001 From: Trevor Pilley Date: Thu, 26 Mar 2020 14:39:01 +0000 Subject: [PATCH 17/20] Update azure-pipelines.yml --- azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index cabcb8d..8e6b283 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,6 +3,7 @@ trigger: include: - master - develop + - hotfix* paths: exclude: - .editorconfig @@ -49,7 +50,7 @@ steps: - script: dotnet pack "$(projectPath)" -o:$(Build.ArtifactStagingDirectory) -p:PackageVersion="$(buildVersion)-preview$(Build.BuildNumber)" displayName: 'dotnet pack (pre)' - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) + condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/master')) - script: dotnet pack "$(projectPath)" -o:$(Build.ArtifactStagingDirectory) -p:PackageVersion=$(buildVersion) displayName: 'dotnet pack' From 175ab3f1fdaaa47576e47690ec576e4ead6bbde4 Mon Sep 17 00:00:00 2001 From: Trevor Pilley Date: Thu, 26 Mar 2020 14:39:12 +0000 Subject: [PATCH 18/20] Update README.md --- README.md | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 269e759..c54aebf 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ -MicroLite.Extensions.WebApi -=========================== - -|Service|Status| -|-------|------| -||[![NuGet version](https://badge.fury.io/nu/MicroLite.Extensions.WebApi.svg)](http://badge.fury.io/nu/MicroLite.Extensions.WebApi)| -|/develop|[![Build Status](https://dev.azure.com/trevorpilley/MicroLite-ORM/_apis/build/status/MicroLite-ORM.MicroLite.Extensions.WebApi?branchName=develop)](https://dev.azure.com/trevorpilley/MicroLite-ORM/_build/latest?definitionId=28&branchName=develop)| -|/master|[![Build Status](https://dev.azure.com/trevorpilley/MicroLite-ORM/_apis/build/status/MicroLite-ORM.MicroLite.Extensions.WebApi?branchName=master)](https://dev.azure.com/trevorpilley/MicroLite-ORM/_build/latest?definitionId=28&branchName=master)| +# MicroLite.Extensions.WebApi MicroLite.Extensions.WebAp is a .NET 4.5 library which adds an extension for the MicroLite ORM Framework to integrate with ASP.NET WebApi. +![Nuget](https://img.shields.io/nuget/dt/MicroLite.Extensions.WebApi) + +|Branch|Status| +|------|------| +|/develop|![GitHub last commit (branch)](https://img.shields.io/github/last-commit/MicroLite-ORM/MicroLite.Extensions.WebApi/develop) [![Build Status](https://dev.azure.com/trevorpilley/MicroLite-ORM/_apis/build/status/MicroLite-ORM.MicroLite.Extensions.WebApi?branchName=develop)](https://dev.azure.com/trevorpilley/MicroLite-ORM/_build/latest?definitionId=28&branchName=develop) ![Nuget (with prereleases)](https://img.shields.io/nuget/vpre/MicroLite)| +|/master|![GitHub last commit](https://img.shields.io/github/last-commit/MicroLite-ORM/MicroLite.Extensions.WebApi/master) [![Build Status](https://dev.azure.com/trevorpilley/MicroLite-ORM/_apis/build/status/MicroLite-ORM.MicroLite.Extensions.WebApi?branchName=master)](https://dev.azure.com/trevorpilley/MicroLite-ORM/_build/latest?definitionId=28&branchName=master) ![Nuget](https://img.shields.io/nuget/v/MicroLite.Extensions.WebApi) ![GitHub Release Date](https://img.shields.io/github/release-date/MicroLite-ORM/MicroLite.Extensions.WebApi)| + ## Installation Install the nuget package `Install-Package MicroLite.Extensions.WebApi` @@ -28,4 +28,3 @@ The NuGet Package contains binaries compiled against (dependencies indented): To find out more, head over to the [Wiki](https://github.com/MicroLite-ORM/MicroLite.Extensions.WebApi/wiki), or check out the [WebApi](http://microliteorm.wordpress.com/tag/WebApi/) tag on the MicroLite Blog. For OData support, check out the [MicroLite.Extensions.WebApi.OData](https://github.com/MicroLite-ORM/MicroLite.Extensions.WebApi.OData) add-on. - From a302eaab9f29e20d4a3e61626b8cc65b01516651 Mon Sep 17 00:00:00 2001 From: Trevor Pilley Date: Thu, 26 Mar 2020 14:46:21 +0000 Subject: [PATCH 19/20] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c54aebf..68766e6 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ MicroLite.Extensions.WebAp is a .NET 4.5 library which adds an extension for the |Branch|Status| |------|------| -|/develop|![GitHub last commit (branch)](https://img.shields.io/github/last-commit/MicroLite-ORM/MicroLite.Extensions.WebApi/develop) [![Build Status](https://dev.azure.com/trevorpilley/MicroLite-ORM/_apis/build/status/MicroLite-ORM.MicroLite.Extensions.WebApi?branchName=develop)](https://dev.azure.com/trevorpilley/MicroLite-ORM/_build/latest?definitionId=28&branchName=develop) ![Nuget (with prereleases)](https://img.shields.io/nuget/vpre/MicroLite)| +|/develop|![GitHub last commit (branch)](https://img.shields.io/github/last-commit/MicroLite-ORM/MicroLite.Extensions.WebApi/develop) [![Build Status](https://dev.azure.com/trevorpilley/MicroLite-ORM/_apis/build/status/MicroLite-ORM.MicroLite.Extensions.WebApi?branchName=develop)](https://dev.azure.com/trevorpilley/MicroLite-ORM/_build/latest?definitionId=28&branchName=develop) ![Nuget (with prereleases)](https://img.shields.io/nuget/vpre/MicroLite.Extensions.WebApi)| |/master|![GitHub last commit](https://img.shields.io/github/last-commit/MicroLite-ORM/MicroLite.Extensions.WebApi/master) [![Build Status](https://dev.azure.com/trevorpilley/MicroLite-ORM/_apis/build/status/MicroLite-ORM.MicroLite.Extensions.WebApi?branchName=master)](https://dev.azure.com/trevorpilley/MicroLite-ORM/_build/latest?definitionId=28&branchName=master) ![Nuget](https://img.shields.io/nuget/v/MicroLite.Extensions.WebApi) ![GitHub Release Date](https://img.shields.io/github/release-date/MicroLite-ORM/MicroLite.Extensions.WebApi)| ## Installation From 3c9beb482697685812b1e825b138389bbf7492fa Mon Sep 17 00:00:00 2001 From: Trevor Pilley Date: Fri, 27 Mar 2020 10:28:07 +0000 Subject: [PATCH 20/20] Updated to MicroLite 7.0.0 --- .../MicroLite.Extensions.WebApi.Tests.csproj | 2 +- MicroLite.Extensions.WebApi.Tests/packages.config | 2 +- MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MicroLite.Extensions.WebApi.Tests/MicroLite.Extensions.WebApi.Tests.csproj b/MicroLite.Extensions.WebApi.Tests/MicroLite.Extensions.WebApi.Tests.csproj index 6a8b301..077de07 100644 --- a/MicroLite.Extensions.WebApi.Tests/MicroLite.Extensions.WebApi.Tests.csproj +++ b/MicroLite.Extensions.WebApi.Tests/MicroLite.Extensions.WebApi.Tests.csproj @@ -47,7 +47,7 @@ ..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll - ..\packages\MicroLite.7.0.0-preview20200313.1\lib\net45\MicroLite.dll + ..\packages\MicroLite.7.0.0\lib\net45\MicroLite.dll diff --git a/MicroLite.Extensions.WebApi.Tests/packages.config b/MicroLite.Extensions.WebApi.Tests/packages.config index c875f6b..c97ad8e 100644 --- a/MicroLite.Extensions.WebApi.Tests/packages.config +++ b/MicroLite.Extensions.WebApi.Tests/packages.config @@ -1,7 +1,7 @@  - + diff --git a/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj b/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj index aaf8ad6..07ac6cc 100644 --- a/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj +++ b/MicroLite.Extensions.WebApi/MicroLite.Extensions.WebApi.csproj @@ -35,7 +35,7 @@ - + all