From 087153b5b7ca4461dff1a908b476bfcbbecd4646 Mon Sep 17 00:00:00 2001
From: David Lebee <david@poweredsoft.com>
Date: Fri, 23 Nov 2018 01:42:53 -0600
Subject: [PATCH] better

---
 ...PoweredSoft.DynamicQuery.AspNetCore.csproj |  2 +-
 .../ServiceCollectionExtensions.cs            | 23 ------------------
 .../PoweredSoft.DynamicQuery.csproj           |  8 ++++++-
 .../ServiceCollectionExtensions.cs            | 24 +++++++++++++++++++
 4 files changed, 32 insertions(+), 25 deletions(-)
 delete mode 100644 PoweredSoft.DynamicQuery.AspNetCore/ServiceCollectionExtensions.cs
 create mode 100644 PoweredSoft.DynamicQuery/ServiceCollectionExtensions.cs

diff --git a/PoweredSoft.DynamicQuery.AspNetCore/PoweredSoft.DynamicQuery.AspNetCore.csproj b/PoweredSoft.DynamicQuery.AspNetCore/PoweredSoft.DynamicQuery.AspNetCore.csproj
index d9d9592..c97bd8c 100644
--- a/PoweredSoft.DynamicQuery.AspNetCore/PoweredSoft.DynamicQuery.AspNetCore.csproj
+++ b/PoweredSoft.DynamicQuery.AspNetCore/PoweredSoft.DynamicQuery.AspNetCore.csproj
@@ -9,7 +9,7 @@
     <RepositoryUrl>https://github.com/PoweredSoft/DynamicQuery</RepositoryUrl>
     <RepositoryType>github</RepositoryType>
     <PackageTags>powered,soft,dynamic,criteria,query,builder,asp,net,core</PackageTags>
-    <Version>1.0.1</Version>
+    <Version>1.0.2</Version>
     <PackageIconUrl>https://secure.gravatar.com/avatar/4e32f73820c16718909a06c2927f1f8b?s=512&amp;amp;r=g&amp;amp;d=retro</PackageIconUrl>
   </PropertyGroup>
 
diff --git a/PoweredSoft.DynamicQuery.AspNetCore/ServiceCollectionExtensions.cs b/PoweredSoft.DynamicQuery.AspNetCore/ServiceCollectionExtensions.cs
deleted file mode 100644
index 3391a61..0000000
--- a/PoweredSoft.DynamicQuery.AspNetCore/ServiceCollectionExtensions.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using PoweredSoft.DynamicQuery.Core;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace PoweredSoft.DynamicQuery.AspNetCore
-{
-    public static class ServiceCollectionExtensions
-    {
-        public static IServiceCollection AddPoweredSoftDynamicQuery(this IServiceCollection services)
-        {
-            services.AddTransient<ISort, Sort>();
-            services.AddTransient<IAggregate, Aggregate>();
-            services.AddTransient<ISimpleFilter, SimpleFilter>();
-            services.AddTransient<ICompositeFilter, CompositeFilter>();
-            services.AddTransient<IGroup, Group>();
-            services.AddTransient<IQueryCriteria, QueryCriteria>();
-            services.AddTransient<IQueryHandler, QueryHandler>();
-            return services;
-        }
-    }
-}
diff --git a/PoweredSoft.DynamicQuery/PoweredSoft.DynamicQuery.csproj b/PoweredSoft.DynamicQuery/PoweredSoft.DynamicQuery.csproj
index d046c91..aad6feb 100644
--- a/PoweredSoft.DynamicQuery/PoweredSoft.DynamicQuery.csproj
+++ b/PoweredSoft.DynamicQuery/PoweredSoft.DynamicQuery.csproj
@@ -9,7 +9,7 @@
     <RepositoryUrl>https://github.com/PoweredSoft/DynamicQuery</RepositoryUrl>
     <RepositoryType>github</RepositoryType>
     <PackageTags>powered,soft,dynamic,criteria,query,builder</PackageTags>
-    <Version>1.0.5</Version>
+    <Version>1.0.6</Version>
     <PackageIconUrl>https://secure.gravatar.com/avatar/4e32f73820c16718909a06c2927f1f8b?s=512&amp;amp;r=g&amp;amp;d=retro</PackageIconUrl>
   </PropertyGroup>
 
@@ -18,4 +18,10 @@
     <ProjectReference Include="..\PoweredSoft.DynamicQuery.Core\PoweredSoft.DynamicQuery.Core.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions">
+      <HintPath>..\..\..\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.extensions.dependencyinjection.abstractions\2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
 </Project>
diff --git a/PoweredSoft.DynamicQuery/ServiceCollectionExtensions.cs b/PoweredSoft.DynamicQuery/ServiceCollectionExtensions.cs
new file mode 100644
index 0000000..a1e98da
--- /dev/null
+++ b/PoweredSoft.DynamicQuery/ServiceCollectionExtensions.cs
@@ -0,0 +1,24 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using PoweredSoft.DynamicQuery.Core;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace PoweredSoft.DynamicQuery
+{
+    public static class ServiceCollectionExtensions
+    {
+        public static IServiceCollection AddPoweredSoftDynamicQuery(this IServiceCollection services)
+        {
+            services.TryAddTransient<ISort, Sort>();
+            services.TryAddTransient<IAggregate, Aggregate>();
+            services.TryAddTransient<ISimpleFilter, SimpleFilter>();
+            services.TryAddTransient<ICompositeFilter, CompositeFilter>();
+            services.TryAddTransient<IGroup, Group>();
+            services.TryAddTransient<IQueryCriteria, QueryCriteria>();
+            services.TryAddTransient<IQueryHandler, QueryHandler>();
+            return services;
+        }
+    }
+}