v4.2.0

ZeeLyn · Dec 10, 2022 · 3a99aee · 3a99aee
1 parent cd6f1fb
commit 3a99aee
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 28 deletions.
diff --git a/build.cake b/build.cake
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 var output=Argument<string>("output", "./Output");
-var version=Argument<string>("version", "4.1.0");
+var version=Argument<string>("version", "4.2.0");
 var target = Argument<string>("target", "Default");
 var release = Argument<bool>("release", true);
 var nugetApiKey = Argument<string>("nugetApiKey", null);
@@ -39,7 +39,7 @@ Task("UpdateVersion").DoesForEach(GetFiles("**/Dapper.Extensions*.csproj"),(file
    XmlPoke(file,"/Project/PropertyGroup/Description","A dapper extension library. Support MySQL,SQL Server,PostgreSQL,SQLite and ODBC, Support cache.");
    XmlPoke(file,"/Project/PropertyGroup/PackageProjectUrl","https://github.com/ZeeLyn/Dapper.Extensions");
    XmlPoke(file,"/Project/PropertyGroup/PackageTags","Dapper,Dapper Extensions,DapperExtensions,Dapper.Extensions.NetCore,Extensions,DataBase,Sql Server,MSSQL,MySQL,PostgreSQL,SQLite,ODBC,Cahce,Caching,Redis,Memory,RedisCaching,MemoryCaching");
-   XmlPoke(file,"/Project/PropertyGroup/PackageIconUrl","https://raw.githubusercontent.com/ZeeLyn/Dapper.Extensions/master/icon.jpg");
+   XmlPoke(file,"/Project/PropertyGroup/icon","https://raw.githubusercontent.com/ZeeLyn/Dapper.Extensions/master/icon.jpg");
    XmlPoke(file,"/Project/PropertyGroup/Authors","Owen");
    XmlPoke(file,"/Project/PropertyGroup/PackageLicenseExpression","MIT");
 });

diff --git a/src/Dapper.Extensions.Caching.Memory/Dapper.Extensions.Caching.Memory.csproj b/src/Dapper.Extensions.Caching.Memory/Dapper.Extensions.Caching.Memory.csproj
@@ -6,8 +6,8 @@
     <PackageProjectUrl>https://github.com/ZeeLyn/Dapper.Extensions</PackageProjectUrl>
     <PackageId>Dapper.Extensions.Caching.Memory</PackageId>
     <Description>A dapper extension library. Support MySQL,SQL Server,PostgreSQL,SQLite and ODBC, Support cache.</Description>
-    <PackageIconUrl>https://raw.githubusercontent.com/ZeeLyn/Dapper.Extensions/master/icon.jpg</PackageIconUrl>
-    <Version>4.1.0</Version>
+    <icon>https://raw.githubusercontent.com/ZeeLyn/Dapper.Extensions/master/icon.jpg</icon>
+    <Version>4.2.0</Version>
     <Authors>Owen</Authors>
     <PackageTags>Dapper,Dapper Extensions,DapperExtensions,Dapper.Extensions.NetCore,Extensions,DataBase,Sql Server,MSSQL,MySQL,PostgreSQL,SQLite,ODBC,Cahce,Caching,Redis,Memory,RedisCaching,MemoryCaching</PackageTags>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/src/Dapper.Extensions.Caching.Redis/Dapper.Extensions.Caching.Redis.csproj b/src/Dapper.Extensions.Caching.Redis/Dapper.Extensions.Caching.Redis.csproj
@@ -6,8 +6,8 @@
     <PackageProjectUrl>https://github.com/ZeeLyn/Dapper.Extensions</PackageProjectUrl>
     <PackageId>Dapper.Extensions.Caching.Redis</PackageId>
     <Description>A dapper extension library. Support MySQL,SQL Server,PostgreSQL,SQLite and ODBC, Support cache.</Description>
-    <PackageIconUrl>https://raw.githubusercontent.com/ZeeLyn/Dapper.Extensions/master/icon.jpg</PackageIconUrl>
-    <Version>4.1.0</Version>
+    <icon>https://raw.githubusercontent.com/ZeeLyn/Dapper.Extensions/master/icon.jpg</icon>
+    <Version>4.2.0</Version>
     <Authors>Owen</Authors>
     <PackageTags>Dapper,Dapper Extensions,DapperExtensions,Dapper.Extensions.NetCore,Extensions,DataBase,Sql Server,MSSQL,MySQL,PostgreSQL,SQLite,ODBC,Cahce,Caching,Redis,Memory,RedisCaching,MemoryCaching</PackageTags>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/src/Dapper.Extensions.MSSQL/Dapper.Extensions.MSSQL.csproj b/src/Dapper.Extensions.MSSQL/Dapper.Extensions.MSSQL.csproj
@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net5.0;net6.0;net7.0</TargetFrameworks>
-    <Version>4.1.0</Version>
+    <Version>4.2.0</Version>
     <Description>A dapper extension library. Support MySQL,SQL Server,PostgreSQL,SQLite and ODBC, Support cache.</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/ZeeLyn/Dapper.Extensions</PackageProjectUrl>
-    <PackageIconUrl>https://raw.githubusercontent.com/ZeeLyn/Dapper.Extensions/master/icon.jpg</PackageIconUrl>
+    <icon>https://raw.githubusercontent.com/ZeeLyn/Dapper.Extensions/master/icon.jpg</icon>
     <PackageReleaseNotes></PackageReleaseNotes>
     <PackageTags>Dapper,Dapper Extensions,DapperExtensions,Dapper.Extensions.NetCore,Extensions,DataBase,Sql Server,MSSQL,MySQL,PostgreSQL,SQLite,ODBC,Cahce,Caching,Redis,Memory,RedisCaching,MemoryCaching</PackageTags>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>

diff --git a/src/Dapper.Extensions.MiniProfiler/Dapper.Extensions.MiniProfiler.csproj b/src/Dapper.Extensions.MiniProfiler/Dapper.Extensions.MiniProfiler.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net5.0;net6.0;net7.0</TargetFrameworks>
-    <Version>4.1.0</Version>
+    <Version>4.2.0</Version>
     <Authors>Owen</Authors>
     <Description>A dapper extension library. Support MySQL,SQL Server,PostgreSQL,SQLite and ODBC, Support cache.</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/ZeeLyn/Dapper.Extensions</PackageProjectUrl>
-    <PackageIconUrl>https://raw.githubusercontent.com/ZeeLyn/Dapper.Extensions/master/icon.jpg</PackageIconUrl>
+    <icon>https://raw.githubusercontent.com/ZeeLyn/Dapper.Extensions/master/icon.jpg</icon>
     <PackageTags>Dapper,Dapper Extensions,DapperExtensions,Dapper.Extensions.NetCore,Extensions,DataBase,Sql Server,MSSQL,MySQL,PostgreSQL,SQLite,ODBC,Cahce,Caching,Redis,Memory,RedisCaching,MemoryCaching</PackageTags>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <LangVersion>latest</LangVersion>

diff --git a/src/Dapper.Extensions.MySql/Dapper.Extensions.MySql.csproj b/src/Dapper.Extensions.MySql/Dapper.Extensions.MySql.csproj
@@ -5,10 +5,10 @@
     <PackageProjectUrl>https://github.com/ZeeLyn/Dapper.Extensions</PackageProjectUrl>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Description>A dapper extension library. Support MySQL,SQL Server,PostgreSQL,SQLite and ODBC, Support cache.</Description>
-    <PackageIconUrl>https://raw.githubusercontent.com/ZeeLyn/Dapper.Extensions/master/icon.jpg</PackageIconUrl>
+    <icon>https://raw.githubusercontent.com/ZeeLyn/Dapper.Extensions/master/icon.jpg</icon>
     <Authors>Owen</Authors>
     <Company>Owen</Company>
-    <Version>4.1.0</Version>
+    <Version>4.2.0</Version>
     <PackageTags>Dapper,Dapper Extensions,DapperExtensions,Dapper.Extensions.NetCore,Extensions,DataBase,Sql Server,MSSQL,MySQL,PostgreSQL,SQLite,ODBC,Cahce,Caching,Redis,Memory,RedisCaching,MemoryCaching</PackageTags>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageId>Dapper.Extensions.MySQL</PackageId>

diff --git a/src/Dapper.Extensions.Odbc/Dapper.Extensions.Odbc.csproj b/src/Dapper.Extensions.Odbc/Dapper.Extensions.Odbc.csproj
@@ -6,9 +6,9 @@
     <PackageProjectUrl>https://github.com/ZeeLyn/Dapper.Extensions</PackageProjectUrl>
     <Description>A dapper extension library. Support MySQL,SQL Server,PostgreSQL,SQLite and ODBC, Support cache.</Description>
     <PackageTags>Dapper,Dapper Extensions,DapperExtensions,Dapper.Extensions.NetCore,Extensions,DataBase,Sql Server,MSSQL,MySQL,PostgreSQL,SQLite,ODBC,Cahce,Caching,Redis,Memory,RedisCaching,MemoryCaching</PackageTags>
-    <PackageIconUrl>https://raw.githubusercontent.com/ZeeLyn/Dapper.Extensions/master/icon.jpg</PackageIconUrl>
+    <icon>https://raw.githubusercontent.com/ZeeLyn/Dapper.Extensions/master/icon.jpg</icon>
     <Authors>Owen</Authors>
-    <Version>4.1.0</Version>
+    <Version>4.2.0</Version>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageId>Dapper.Extensions.ODBC</PackageId>
     <Product>Dapper.Extensions.ODBC</Product>

diff --git a/src/Dapper.Extensions.PostgreSql/Dapper.Extensions.PostgreSql.csproj b/src/Dapper.Extensions.PostgreSql/Dapper.Extensions.PostgreSql.csproj
@@ -6,9 +6,9 @@
     <PackageProjectUrl>https://github.com/ZeeLyn/Dapper.Extensions</PackageProjectUrl>
     <Description>A dapper extension library. Support MySQL,SQL Server,PostgreSQL,SQLite and ODBC, Support cache.</Description>
     <RepositoryUrl />
-    <PackageIconUrl>https://raw.githubusercontent.com/ZeeLyn/Dapper.Extensions/master/icon.jpg</PackageIconUrl>
+    <icon>https://raw.githubusercontent.com/ZeeLyn/Dapper.Extensions/master/icon.jpg</icon>
     <PackageTags>Dapper,Dapper Extensions,DapperExtensions,Dapper.Extensions.NetCore,Extensions,DataBase,Sql Server,MSSQL,MySQL,PostgreSQL,SQLite,ODBC,Cahce,Caching,Redis,Memory,RedisCaching,MemoryCaching</PackageTags>
-    <Version>4.1.0</Version>
+    <Version>4.2.0</Version>
     <Authors>Owen</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageId>Dapper.Extensions.PostgreSQL</PackageId>

diff --git a/src/Dapper.Extensions.SQLite/Dapper.Extensions.SQLite.csproj b/src/Dapper.Extensions.SQLite/Dapper.Extensions.SQLite.csproj
@@ -4,11 +4,11 @@
     <TargetFrameworks>netstandard2.0;net5.0;net6.0;net7.0</TargetFrameworks>
     <PackageProjectUrl>https://github.com/ZeeLyn/Dapper.Extensions</PackageProjectUrl>
     <PackageTags>Dapper,Dapper Extensions,DapperExtensions,Dapper.Extensions.NetCore,Extensions,DataBase,Sql Server,MSSQL,MySQL,PostgreSQL,SQLite,ODBC,Cahce,Caching,Redis,Memory,RedisCaching,MemoryCaching</PackageTags>
-    <PackageIconUrl>https://raw.githubusercontent.com/ZeeLyn/Dapper.Extensions/master/icon.jpg</PackageIconUrl>
+    <icon>https://raw.githubusercontent.com/ZeeLyn/Dapper.Extensions/master/icon.jpg</icon>
     <RepositoryUrl></RepositoryUrl>
     <Description>A dapper extension library. Support MySQL,SQL Server,PostgreSQL,SQLite and ODBC, Support cache.</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Version>4.1.0</Version>
+    <Version>4.2.0</Version>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Authors>Owen</Authors>
     <LangVersion>latest</LangVersion>

diff --git a/src/Dapper.Extensions/AutofacExtensions.cs b/src/Dapper.Extensions/AutofacExtensions.cs
@@ -16,7 +16,7 @@ public static class AutofacExtensions
         public static ContainerBuilder AddDapper<TDbProvider>(this ContainerBuilder container, string connectionName = "DefaultConnection", string serviceKey = null, bool enableMasterSlave = false, Action<MonitorBuilder> monitorBuilder = null) where TDbProvider : IDapper
         {
             container.RegisterType<ResolveContext>().As<IResolveContext>().IfNotRegistered(typeof(IResolveContext)).InstancePerLifetimeScope();
-            container.RegisterType<ResolveKeyed>().As<IResolveKeyed>().IfNotRegistered(typeof(IResolveKeyed)).InstancePerLifetimeScope();
+            //container.RegisterType<ResolveKeyed>().As<IResolveKeyed>().IfNotRegistered(typeof(IResolveKeyed)).InstancePerLifetimeScope();
             container.RegisterType<DefaultConnectionStringProvider>().As<IConnectionStringProvider>().SingleInstance();
             container.RegisterType<WeightedPolling>().As<ILoadBalancing>().SingleInstance();
 

diff --git a/src/Dapper.Extensions/Dapper.Extensions.csproj b/src/Dapper.Extensions/Dapper.Extensions.csproj
@@ -6,8 +6,8 @@
     <PackageProjectUrl>https://github.com/ZeeLyn/Dapper.Extensions</PackageProjectUrl>
     <PackageId>Dapper.Extensions.NetCore</PackageId>
     <Description>A dapper extension library. Support MySQL,SQL Server,PostgreSQL,SQLite and ODBC, Support cache.</Description>
-    <PackageIconUrl>https://raw.githubusercontent.com/ZeeLyn/Dapper.Extensions/master/icon.jpg</PackageIconUrl>
-    <Version>4.1.0</Version>
+    <icon>https://raw.githubusercontent.com/ZeeLyn/Dapper.Extensions/master/icon.jpg</icon>
+    <Version>4.2.0</Version>
     <Authors>Owen</Authors>
     <PackageTags>Dapper,Dapper Extensions,DapperExtensions,Dapper.Extensions.NetCore,Extensions,DataBase,Sql Server,MSSQL,MySQL,PostgreSQL,SQLite,ODBC,Cahce,Caching,Redis,Memory,RedisCaching,MemoryCaching</PackageTags>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/src/Dapper.Extensions/IResolveKeyed.cs b/src/Dapper.Extensions/IResolveKeyed.cs
@@ -5,8 +5,25 @@
 namespace Dapper.Extensions
 {
 
-    [Obsolete("Please use IResolveContext")]
-    public interface IResolveKeyed
+    //[Obsolete("Please use IResolveContext")]
+    //public interface IResolveKeyed
+    //{
+    //    IComponentContext ComponentContext { get; }
+
+    //    T Resolve<T>();
+
+    //    T Resolve<T>(params Parameter[] parameters);
+
+    //    T Resolve<T>(string serviceKey);
+
+    //    T Resolve<T>(string serviceKey, params Parameter[] parameters);
+
+    //    IDapper ResolveDapper(bool readOnly = false);
+
+    //    IDapper ResolveDapper(string serviceKey, bool readOnly = false);
+    //}
+
+    public interface IResolveContext //: IResolveKeyed
     {
         IComponentContext ComponentContext { get; }
 
@@ -23,11 +40,6 @@ public interface IResolveKeyed
         IDapper ResolveDapper(string serviceKey, bool readOnly = false);
     }
 
-    public interface IResolveContext : IResolveKeyed
-    {
-
-    }
-
     [Obsolete("Please use ResolveContext")]
     public class ResolveKeyed : IResolveContext
     {