Skip to content

D
Dapper
Commit 0475827c authored by Marc Gravell's avatar Marc Gravell
Browse files
Options

Normalize locations for DNX; just about everything moves and/or renames

parent 6a894429
Hide whitespace changes
Inline Side-by-side
Showing with 420 additions and 326 deletions
Dapper NET40 SNK/Dapper NET40 SNK.csproj
View file @ 0475827c
......@@ -51,129 +51,135 @@
<Reference Include="System.XML" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Dapper NET40\CommandDefinition.cs">
<Compile Include="..\Dapper\CommandDefinition.cs">
<Link>CommandDefinition.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\CommandFlags.cs">
<Compile Include="..\Dapper\CommandFlags.cs">
<Link>CommandFlags.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\CustomPropertyTypeMap.cs">
<Compile Include="..\Dapper\CustomPropertyTypeMap.cs">
<Link>CustomPropertyTypeMap.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\DataTableHandler.cs">
<Compile Include="..\Dapper\DataTableHandler.cs">
<Link>DataTableHandler.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\DbString.cs">
<Compile Include="..\Dapper\DbString.cs">
<Link>DbString.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\DefaultTypeMap.cs">
<Compile Include="..\Dapper\DefaultTypeMap.cs">
<Link>DefaultTypeMap.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\DynamicParameters.CachedOutputSetters.cs">
<Compile Include="..\Dapper\DynamicParameters.CachedOutputSetters.cs">
<Link>DynamicParameters.CachedOutputSetters.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\DynamicParameters.cs">
<Compile Include="..\Dapper\DynamicParameters.cs">
<Link>DynamicParameters.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\DynamicParameters.ParamInfo.cs">
<Compile Include="..\Dapper\DynamicParameters.ParamInfo.cs">
<Link>DynamicParameters.ParamInfo.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\ExplicitConstructorAttribute.cs">
<Compile Include="..\Dapper\ExplicitConstructorAttribute.cs">
<Link>ExplicitConstructorAttribute.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\FeatureSupport.cs">
<Compile Include="..\Dapper\FeatureSupport.cs">
<Link>FeatureSupport.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\Properties\AssemblyInfo.cs">
<Compile Include="..\Dapper\Properties\AssemblyInfo.cs">
<Link>AssemblyInfo.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SimpleMemberMap.cs">
<Compile Include="..\Dapper\SimpleMemberMap.cs">
<Link>SimpleMemberMap.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlDataRecordHandler.cs">
<Compile Include="..\Dapper\SqlDataRecordHandler.cs">
<Link>SqlDataRecordHandler.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlDataRecordListTVPParameter.cs">
<Compile Include="..\Dapper\SqlDataRecordListTVPParameter.cs">
<Link>SqlDataRecordListTVPParameter.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.CacheInfo.cs">
<Compile Include="..\Dapper\SqlMapper.CacheInfo.cs">
<Link>SqlMapper.CacheInfo.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.cs">
<Compile Include="..\Dapper\SqlMapper.cs">
<Link>SqlMapper.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.DapperRow.cs">
<Compile Include="..\Dapper\SqlMapper.DapperRow.cs">
<Link>SqlMapper.DapperRow.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.DapperRowMetaObject.cs">
<Compile Include="..\Dapper\SqlMapper.DapperRowMetaObject.cs">
<Link>SqlMapper.DapperRowMetaObject.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.DataTable.cs">
<Compile Include="..\Dapper\SqlMapper.DataTable.cs">
<Link>SqlMapper.DataTable.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.DeserializerState.cs">
<Compile Include="..\Dapper\SqlMapper.DeserializerState.cs">
<Link>SqlMapper.DeserializerState.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.DontMap.cs">
<Compile Include="..\Dapper\SqlMapper.DontMap.cs">
<Link>SqlMapper.DontMap.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.GridReader.cs">
<Compile Include="..\Dapper\SqlMapper.GridReader.cs">
<Link>SqlMapper.GridReader.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.ICustomQueryParameter.cs">
<Compile Include="..\Dapper\SqlMapper.ICustomQueryParameter.cs">
<Link>SqlMapper.ICustomQueryParameter.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.Identity.cs">
<Compile Include="..\Dapper\SqlMapper.Identity.cs">
<Link>SqlMapper.Identity.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.IDynamicParameters.cs">
<Compile Include="..\Dapper\SqlMapper.IDynamicParameters.cs">
<Link>SqlMapper.IDynamicParameters.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.IMemberMap.cs">
<Compile Include="..\Dapper\SqlMapper.IMemberMap.cs">
<Link>SqlMapper.IMemberMap.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.IParameterCallbacks.cs">
<Compile Include="..\Dapper\SqlMapper.IParameterCallbacks.cs">
<Link>SqlMapper.IParameterCallbacks.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.IParameterLookup.cs">
<Compile Include="..\Dapper\SqlMapper.IParameterLookup.cs">
<Link>SqlMapper.IParameterLookup.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.ITypeHandler.cs">
<Compile Include="..\Dapper\SqlMapper.ITypeHandler.cs">
<Link>SqlMapper.ITypeHandler.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.ITypeMap.cs">
<Compile Include="..\Dapper\SqlMapper.ITypeMap.cs">
<Link>SqlMapper.ITypeMap.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.Link.cs">
<Compile Include="..\Dapper\SqlMapper.Link.cs">
<Link>SqlMapper.Link.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.LiteralToken.cs">
<Compile Include="..\Dapper\SqlMapper.LiteralToken.cs">
<Link>SqlMapper.LiteralToken.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.Settings.cs">
<Compile Include="..\Dapper\SqlMapper.Settings.cs">
<Link>SqlMapper.Settings.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.TypeHandler.cs">
<Compile Include="..\Dapper\SqlMapper.TypeHandler.cs">
<Link>SqlMapper.TypeHandler.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.TypeHandlerCache.cs">
<Compile Include="..\Dapper\SqlMapper.TypeHandlerCache.cs">
<Link>SqlMapper.TypeHandlerCache.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\TableValuedParameter.cs">
<Compile Include="..\Dapper\TableValuedParameter.cs">
<Link>TableValuedParameter.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\TypeExtensions.cs">
<Compile Include="..\Dapper\TypeExtensions.cs">
<Link>TypeExtensions.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\UdtTypeHandler.cs">
<Compile Include="..\Dapper\UdtTypeHandler.cs">
<Link>UdtTypeHandler.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\WrappedDataReader.cs">
<Compile Include="..\Dapper\WrappedDataReader.cs">
<Link>WrappedDataReader.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\WrappedReader.cs">
<Compile Include="..\Dapper\WrappedReader.cs">
<Link>WrappedReader.cs</Link>
</Compile>
<Compile Include="..\Dapper\SqlMapper.Async.cs">
<Link>SqlMapper.Async.cs</Link>
</Compile>
<Compile Include="..\Dapper\SqlMapper.GridReader.Async.cs">
<Link>SqlMapper.GridReader.Async.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
......
Dapper NET40/Dapper NET40.csproj
View file @ 0475827c
......@@ -45,90 +45,134 @@
<Reference Include="System.XML" />
</ItemGroup>
<ItemGroup>
<Compile Include="CommandDefinition.cs" />
<Compile Include="CommandFlags.cs" />
<Compile Include="CustomPropertyTypeMap.cs" />
<Compile Include="DataTableHandler.cs" />
<Compile Include="DbString.cs" />
<Compile Include="DefaultTypeMap.cs" />
<Compile Include="DynamicParameters.cs" />
<Compile Include="ExplicitConstructorAttribute.cs" />
<Compile Include="FeatureSupport.cs" />
<Compile Include="SimpleMemberMap.cs" />
<Compile Include="SqlDataRecordHandler.cs" />
<Compile Include="SqlDataRecordListTVPParameter.cs" />
<Compile Include="SqlMapper.CacheInfo.cs">
<DependentUpon>SqlMapper.cs</DependentUpon>
<Compile Include="..\Dapper\CommandDefinition.cs">
<Link>CommandDefinition.cs</Link>
</Compile>
<Compile Include="SqlMapper.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SqlMapper.DapperRow.cs">
<DependentUpon>SqlMapper.cs</DependentUpon>
<Compile Include="..\Dapper\CommandFlags.cs">
<Link>CommandFlags.cs</Link>
</Compile>
<Compile Include="SqlMapper.DataTable.cs">
<DependentUpon>SqlMapper.cs</DependentUpon>
<Compile Include="..\Dapper\CustomPropertyTypeMap.cs">
<Link>CustomPropertyTypeMap.cs</Link>
</Compile>
<Compile Include="SqlMapper.DeserializerState.cs">
<DependentUpon>SqlMapper.cs</DependentUpon>
<Compile Include="..\Dapper\DataTableHandler.cs">
<Link>DataTableHandler.cs</Link>
</Compile>
<Compile Include="SqlMapper.DontMap.cs">
<DependentUpon>SqlMapper.cs</DependentUpon>
<Compile Include="..\Dapper\DbString.cs">
<Link>DbString.cs</Link>
</Compile>
<Compile Include="SqlMapper.GridReader.cs">
<DependentUpon>SqlMapper.cs</DependentUpon>
<Compile Include="..\Dapper\DefaultTypeMap.cs">
<Link>DefaultTypeMap.cs</Link>
</Compile>
<Compile Include="SqlMapper.IDynamicParameters.cs">
<DependentUpon>SqlMapper.cs</DependentUpon>
<Compile Include="..\Dapper\DynamicParameters.CachedOutputSetters.cs">
<Link>DynamicParameters.CachedOutputSetters.cs</Link>
</Compile>
<Compile Include="SqlMapper.IMemberMap.cs">
<DependentUpon>SqlMapper.cs</DependentUpon>
<Compile Include="..\Dapper\DynamicParameters.cs">
<Link>DynamicParameters.cs</Link>
</Compile>
<Compile Include="SqlMapper.IParameterLookup.cs">
<DependentUpon>SqlMapper.cs</DependentUpon>
<Compile Include="..\Dapper\DynamicParameters.ParamInfo.cs">
<Link>DynamicParameters.ParamInfo.cs</Link>
</Compile>
<Compile Include="SqlMapper.ITypeHandler.cs">
<DependentUpon>SqlMapper.cs</DependentUpon>
<Compile Include="..\Dapper\ExplicitConstructorAttribute.cs">
<Link>ExplicitConstructorAttribute.cs</Link>
</Compile>
<Compile Include="SqlMapper.ITypeMap.cs">
<DependentUpon>SqlMapper.cs</DependentUpon>
<Compile Include="..\Dapper\FeatureSupport.cs">
<Link>FeatureSupport.cs</Link>
</Compile>
<Compile Include="SqlMapper.Link.cs">
<DependentUpon>SqlMapper.cs</DependentUpon>
<Compile Include="..\Dapper\Properties\AssemblyInfo.cs">
<Link>AssemblyInfo.cs</Link>
</Compile>
<Compile Include="SqlMapper.LiteralToken.cs">
<DependentUpon>SqlMapper.cs</DependentUpon>
<Compile Include="..\Dapper\SimpleMemberMap.cs">
<Link>SimpleMemberMap.cs</Link>
</Compile>
<Compile Include="SqlMapper.Settings.cs">
<DependentUpon>SqlMapper.cs</DependentUpon>
<Compile Include="..\Dapper\SqlDataRecordHandler.cs">
<Link>SqlDataRecordHandler.cs</Link>
</Compile>
<Compile Include="TableValuedParameter.cs" />
<Compile Include="TypeExtensions.cs" />
<Compile Include="SqlMapper.TypeHandler.cs">
<DependentUpon>SqlMapper.cs</DependentUpon>
<Compile Include="..\Dapper\SqlDataRecordListTVPParameter.cs">
<Link>SqlDataRecordListTVPParameter.cs</Link>
</Compile>
<Compile Include="UdtTypeHandler.cs" />
<Compile Include="WrappedDataReader.cs" />
<Compile Include="WrappedReader.cs" />
<Compile Include="SqlMapper.ICustomQueryParameter.cs">
<DependentUpon>SqlMapper.cs</DependentUpon>
<Compile Include="..\Dapper\SqlMapper.CacheInfo.cs">
<Link>SqlMapper.CacheInfo.cs</Link>
</Compile>
<Compile Include="SqlMapper.IParameterCallbacks.cs">
<DependentUpon>SqlMapper.cs</DependentUpon>
<Compile Include="..\Dapper\SqlMapper.cs">
<Link>SqlMapper.cs</Link>
</Compile>
<Compile Include="DynamicParameters.ParamInfo.cs">
<DependentUpon>DynamicParameters.cs</DependentUpon>
<Compile Include="..\Dapper\SqlMapper.DapperRow.cs">
<Link>SqlMapper.DapperRow.cs</Link>
</Compile>
<Compile Include="DynamicParameters.CachedOutputSetters.cs">
<DependentUpon>DynamicParameters.cs</DependentUpon>
<Compile Include="..\Dapper\SqlMapper.DapperRowMetaObject.cs">
<Link>SqlMapper.DapperRowMetaObject.cs</Link>
</Compile>
<Compile Include="SqlMapper.DapperRowMetaObject.cs">
<DependentUpon>SqlMapper.cs</DependentUpon>
<Compile Include="..\Dapper\SqlMapper.DataTable.cs">
<Link>SqlMapper.DataTable.cs</Link>
</Compile>
<Compile Include="SqlMapper.Identity.cs">
<DependentUpon>SqlMapper.cs</DependentUpon>
<Compile Include="..\Dapper\SqlMapper.DeserializerState.cs">
<Link>SqlMapper.DeserializerState.cs</Link>
</Compile>
<Compile Include="SqlMapper.TypeHandlerCache.cs">
<DependentUpon>SqlMapper.cs</DependentUpon>
<Compile Include="..\Dapper\SqlMapper.DontMap.cs">
<Link>SqlMapper.DontMap.cs</Link>
</Compile>
<Compile Include="..\Dapper\SqlMapper.GridReader.cs">
<Link>SqlMapper.GridReader.cs</Link>
</Compile>
<Compile Include="..\Dapper\SqlMapper.ICustomQueryParameter.cs">
<Link>SqlMapper.ICustomQueryParameter.cs</Link>
</Compile>
<Compile Include="..\Dapper\SqlMapper.Identity.cs">
<Link>SqlMapper.Identity.cs</Link>
</Compile>
<Compile Include="..\Dapper\SqlMapper.IDynamicParameters.cs">
<Link>SqlMapper.IDynamicParameters.cs</Link>
</Compile>
<Compile Include="..\Dapper\SqlMapper.IMemberMap.cs">
<Link>SqlMapper.IMemberMap.cs</Link>
</Compile>
<Compile Include="..\Dapper\SqlMapper.IParameterCallbacks.cs">
<Link>SqlMapper.IParameterCallbacks.cs</Link>
</Compile>
<Compile Include="..\Dapper\SqlMapper.IParameterLookup.cs">
<Link>SqlMapper.IParameterLookup.cs</Link>
</Compile>
<Compile Include="..\Dapper\SqlMapper.ITypeHandler.cs">
<Link>SqlMapper.ITypeHandler.cs</Link>
</Compile>
<Compile Include="..\Dapper\SqlMapper.ITypeMap.cs">
<Link>SqlMapper.ITypeMap.cs</Link>
</Compile>
<Compile Include="..\Dapper\SqlMapper.Link.cs">
<Link>SqlMapper.Link.cs</Link>
</Compile>
<Compile Include="..\Dapper\SqlMapper.LiteralToken.cs">
<Link>SqlMapper.LiteralToken.cs</Link>
</Compile>
<Compile Include="..\Dapper\SqlMapper.Settings.cs">
<Link>SqlMapper.Settings.cs</Link>
</Compile>
<Compile Include="..\Dapper\SqlMapper.TypeHandler.cs">
<Link>SqlMapper.TypeHandler.cs</Link>
</Compile>
<Compile Include="..\Dapper\SqlMapper.TypeHandlerCache.cs">
<Link>SqlMapper.TypeHandlerCache.cs</Link>
</Compile>
<Compile Include="..\Dapper\TableValuedParameter.cs">
<Link>TableValuedParameter.cs</Link>
</Compile>
<Compile Include="..\Dapper\TypeExtensions.cs">
<Link>TypeExtensions.cs</Link>
</Compile>
<Compile Include="..\Dapper\UdtTypeHandler.cs">
<Link>UdtTypeHandler.cs</Link>
</Compile>
<Compile Include="..\Dapper\WrappedDataReader.cs">
<Link>WrappedDataReader.cs</Link>
</Compile>
<Compile Include="..\Dapper\WrappedReader.cs">
<Link>WrappedReader.cs</Link>
</Compile>
<Compile Include="..\Dapper\SqlMapper.Async.cs">
<Link>SqlMapper.Async.cs</Link>
</Compile>
<Compile Include="..\Dapper\SqlMapper.GridReader.Async.cs">
<Link>SqlMapper.GridReader.Async.cs</Link>
</Compile>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
......
Dapper NET45 SNK/Dapper NET45 SNK.csproj
View file @ 0475827c
......@@ -49,131 +49,134 @@
<Reference Include="System.XML" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Dapper NET40\CommandDefinition.cs">
<Compile Include="..\Dapper\CommandDefinition.cs">
<Link>CommandDefinition.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\CommandFlags.cs">
<Compile Include="..\Dapper\CommandFlags.cs">
<Link>CommandFlags.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\CustomPropertyTypeMap.cs">
<Compile Include="..\Dapper\CustomPropertyTypeMap.cs">
<Link>CustomPropertyTypeMap.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\DataTableHandler.cs">
<Compile Include="..\Dapper\DataTableHandler.cs">
<Link>DataTableHandler.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\DbString.cs">
<Compile Include="..\Dapper\DbString.cs">
<Link>DbString.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\DefaultTypeMap.cs">
<Compile Include="..\Dapper\DefaultTypeMap.cs">
<Link>DefaultTypeMap.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\DynamicParameters.CachedOutputSetters.cs">
<Compile Include="..\Dapper\DynamicParameters.CachedOutputSetters.cs">
<Link>DynamicParameters.CachedOutputSetters.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\DynamicParameters.cs">
<Compile Include="..\Dapper\DynamicParameters.cs">
<Link>DynamicParameters.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\DynamicParameters.ParamInfo.cs">
<Compile Include="..\Dapper\DynamicParameters.ParamInfo.cs">
<Link>DynamicParameters.ParamInfo.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\ExplicitConstructorAttribute.cs">
<Compile Include="..\Dapper\ExplicitConstructorAttribute.cs">
<Link>ExplicitConstructorAttribute.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\FeatureSupport.cs">
<Compile Include="..\Dapper\FeatureSupport.cs">
<Link>FeatureSupport.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\Properties\AssemblyInfo.cs">
<Compile Include="..\Dapper\Properties\AssemblyInfo.cs">
<Link>AssemblyInfo.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SimpleMemberMap.cs">
<Compile Include="..\Dapper\SimpleMemberMap.cs">
<Link>SimpleMemberMap.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlDataRecordHandler.cs">
<Compile Include="..\Dapper\SqlDataRecordHandler.cs">
<Link>SqlDataRecordHandler.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlDataRecordListTVPParameter.cs">
<Compile Include="..\Dapper\SqlDataRecordListTVPParameter.cs">
<Link>SqlDataRecordListTVPParameter.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.CacheInfo.cs">
<Compile Include="..\Dapper\SqlMapper.CacheInfo.cs">
<Link>SqlMapper.CacheInfo.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.cs">
<Compile Include="..\Dapper\SqlMapper.cs">
<Link>SqlMapper.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.DapperRow.cs">
<Compile Include="..\Dapper\SqlMapper.DapperRow.cs">
<Link>SqlMapper.DapperRow.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.DapperRowMetaObject.cs">
<Compile Include="..\Dapper\SqlMapper.DapperRowMetaObject.cs">
<Link>SqlMapper.DapperRowMetaObject.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.DataTable.cs">
<Compile Include="..\Dapper\SqlMapper.DataTable.cs">
<Link>SqlMapper.DataTable.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.DeserializerState.cs">
<Compile Include="..\Dapper\SqlMapper.DeserializerState.cs">
<Link>SqlMapper.DeserializerState.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.DontMap.cs">
<Compile Include="..\Dapper\SqlMapper.DontMap.cs">
<Link>SqlMapper.DontMap.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.GridReader.cs">
<Compile Include="..\Dapper\SqlMapper.GridReader.cs">
<Link>SqlMapper.GridReader.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.ICustomQueryParameter.cs">
<Compile Include="..\Dapper\SqlMapper.ICustomQueryParameter.cs">
<Link>SqlMapper.ICustomQueryParameter.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.Identity.cs">
<Compile Include="..\Dapper\SqlMapper.Identity.cs">
<Link>SqlMapper.Identity.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.IDynamicParameters.cs">
<Compile Include="..\Dapper\SqlMapper.IDynamicParameters.cs">
<Link>SqlMapper.IDynamicParameters.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.IMemberMap.cs">
<Compile Include="..\Dapper\SqlMapper.IMemberMap.cs">
<Link>SqlMapper.IMemberMap.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.IParameterCallbacks.cs">
<Compile Include="..\Dapper\SqlMapper.IParameterCallbacks.cs">
<Link>SqlMapper.IParameterCallbacks.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.IParameterLookup.cs">
<Compile Include="..\Dapper\SqlMapper.IParameterLookup.cs">
<Link>SqlMapper.IParameterLookup.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.ITypeHandler.cs">
<Compile Include="..\Dapper\SqlMapper.ITypeHandler.cs">
<Link>SqlMapper.ITypeHandler.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.ITypeMap.cs">
<Compile Include="..\Dapper\SqlMapper.ITypeMap.cs">
<Link>SqlMapper.ITypeMap.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.Link.cs">
<Compile Include="..\Dapper\SqlMapper.Link.cs">
<Link>SqlMapper.Link.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.LiteralToken.cs">
<Compile Include="..\Dapper\SqlMapper.LiteralToken.cs">
<Link>SqlMapper.LiteralToken.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.Settings.cs">
<Compile Include="..\Dapper\SqlMapper.Settings.cs">
<Link>SqlMapper.Settings.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.TypeHandler.cs">
<Compile Include="..\Dapper\SqlMapper.TypeHandler.cs">
<Link>SqlMapper.TypeHandler.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.TypeHandlerCache.cs">
<Compile Include="..\Dapper\SqlMapper.TypeHandlerCache.cs">
<Link>SqlMapper.TypeHandlerCache.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\TableValuedParameter.cs">
<Compile Include="..\Dapper\TableValuedParameter.cs">
<Link>TableValuedParameter.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\TypeExtensions.cs">
<Compile Include="..\Dapper\TypeExtensions.cs">
<Link>TypeExtensions.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\UdtTypeHandler.cs">
<Compile Include="..\Dapper\UdtTypeHandler.cs">
<Link>UdtTypeHandler.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\WrappedDataReader.cs">
<Compile Include="..\Dapper\WrappedDataReader.cs">
<Link>WrappedDataReader.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\WrappedReader.cs">
<Compile Include="..\Dapper\WrappedReader.cs">
<Link>WrappedReader.cs</Link>
</Compile>
<Compile Include="..\Dapper NET45\SqlMapperAsync.cs">
<Link>SqlMapperAsync.cs</Link>
<Compile Include="..\Dapper\SqlMapper.Async.cs">
<Link>SqlMapper.Async.cs</Link>
</Compile>
<Compile Include="..\Dapper\SqlMapper.GridReader.Async.cs">
<Link>SqlMapper.GridReader.Async.cs</Link>
</Compile>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
......
Dapper NET45/Dapper NET45.csproj
View file @ 0475827c
......@@ -43,130 +43,135 @@
<Reference Include="System.XML" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Dapper NET40\CommandDefinition.cs">
<Compile Include="..\Dapper\CommandDefinition.cs">
<Link>CommandDefinition.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\CommandFlags.cs">
<Compile Include="..\Dapper\CommandFlags.cs">
<Link>CommandFlags.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\CustomPropertyTypeMap.cs">
<Compile Include="..\Dapper\CustomPropertyTypeMap.cs">
<Link>CustomPropertyTypeMap.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\DataTableHandler.cs">
<Compile Include="..\Dapper\DataTableHandler.cs">
<Link>DataTableHandler.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\DbString.cs">
<Compile Include="..\Dapper\DbString.cs">
<Link>DbString.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\DefaultTypeMap.cs">
<Compile Include="..\Dapper\DefaultTypeMap.cs">
<Link>DefaultTypeMap.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\DynamicParameters.CachedOutputSetters.cs">
<Compile Include="..\Dapper\DynamicParameters.CachedOutputSetters.cs">
<Link>DynamicParameters.CachedOutputSetters.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\DynamicParameters.cs">
<Compile Include="..\Dapper\DynamicParameters.cs">
<Link>DynamicParameters.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\DynamicParameters.ParamInfo.cs">
<Compile Include="..\Dapper\DynamicParameters.ParamInfo.cs">
<Link>DynamicParameters.ParamInfo.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\ExplicitConstructorAttribute.cs">
<Compile Include="..\Dapper\ExplicitConstructorAttribute.cs">
<Link>ExplicitConstructorAttribute.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\FeatureSupport.cs">
<Compile Include="..\Dapper\FeatureSupport.cs">
<Link>FeatureSupport.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\Properties\AssemblyInfo.cs">
<Compile Include="..\Dapper\Properties\AssemblyInfo.cs">
<Link>AssemblyInfo.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SimpleMemberMap.cs">
<Compile Include="..\Dapper\SimpleMemberMap.cs">
<Link>SimpleMemberMap.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlDataRecordHandler.cs">
<Compile Include="..\Dapper\SqlDataRecordHandler.cs">
<Link>SqlDataRecordHandler.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlDataRecordListTVPParameter.cs">
<Compile Include="..\Dapper\SqlDataRecordListTVPParameter.cs">
<Link>SqlDataRecordListTVPParameter.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.CacheInfo.cs">
<Compile Include="..\Dapper\SqlMapper.CacheInfo.cs">
<Link>SqlMapper.CacheInfo.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.cs">
<Compile Include="..\Dapper\SqlMapper.cs">
<Link>SqlMapper.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.DapperRow.cs">
<Compile Include="..\Dapper\SqlMapper.DapperRow.cs">
<Link>SqlMapper.DapperRow.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.DapperRowMetaObject.cs">
<Compile Include="..\Dapper\SqlMapper.DapperRowMetaObject.cs">
<Link>SqlMapper.DapperRowMetaObject.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.DataTable.cs">
<Compile Include="..\Dapper\SqlMapper.DataTable.cs">
<Link>SqlMapper.DataTable.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.DeserializerState.cs">
<Compile Include="..\Dapper\SqlMapper.DeserializerState.cs">
<Link>SqlMapper.DeserializerState.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.DontMap.cs">
<Compile Include="..\Dapper\SqlMapper.DontMap.cs">
<Link>SqlMapper.DontMap.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.GridReader.cs">
<Compile Include="..\Dapper\SqlMapper.GridReader.cs">
<Link>SqlMapper.GridReader.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.ICustomQueryParameter.cs">
<Compile Include="..\Dapper\SqlMapper.ICustomQueryParameter.cs">
<Link>SqlMapper.ICustomQueryParameter.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.Identity.cs">
<Compile Include="..\Dapper\SqlMapper.Identity.cs">
<Link>SqlMapper.Identity.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.IDynamicParameters.cs">
<Compile Include="..\Dapper\SqlMapper.IDynamicParameters.cs">
<Link>SqlMapper.IDynamicParameters.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.IMemberMap.cs">
<Compile Include="..\Dapper\SqlMapper.IMemberMap.cs">
<Link>SqlMapper.IMemberMap.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.IParameterCallbacks.cs">
<Compile Include="..\Dapper\SqlMapper.IParameterCallbacks.cs">
<Link>SqlMapper.IParameterCallbacks.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.IParameterLookup.cs">
<Compile Include="..\Dapper\SqlMapper.IParameterLookup.cs">
<Link>SqlMapper.IParameterLookup.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.ITypeHandler.cs">
<Compile Include="..\Dapper\SqlMapper.ITypeHandler.cs">
<Link>SqlMapper.ITypeHandler.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.ITypeMap.cs">
<Compile Include="..\Dapper\SqlMapper.ITypeMap.cs">
<Link>SqlMapper.ITypeMap.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.Link.cs">
<Compile Include="..\Dapper\SqlMapper.Link.cs">
<Link>SqlMapper.Link.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.LiteralToken.cs">
<Compile Include="..\Dapper\SqlMapper.LiteralToken.cs">
<Link>SqlMapper.LiteralToken.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.Settings.cs">
<Compile Include="..\Dapper\SqlMapper.Settings.cs">
<Link>SqlMapper.Settings.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.TypeHandler.cs">
<Compile Include="..\Dapper\SqlMapper.TypeHandler.cs">
<Link>SqlMapper.TypeHandler.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\SqlMapper.TypeHandlerCache.cs">
<Compile Include="..\Dapper\SqlMapper.TypeHandlerCache.cs">
<Link>SqlMapper.TypeHandlerCache.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\TableValuedParameter.cs">
<Compile Include="..\Dapper\TableValuedParameter.cs">
<Link>TableValuedParameter.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\TypeExtensions.cs">
<Compile Include="..\Dapper\TypeExtensions.cs">
<Link>TypeExtensions.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\UdtTypeHandler.cs">
<Compile Include="..\Dapper\UdtTypeHandler.cs">
<Link>UdtTypeHandler.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\WrappedDataReader.cs">
<Compile Include="..\Dapper\WrappedDataReader.cs">
<Link>WrappedDataReader.cs</Link>
</Compile>
<Compile Include="..\Dapper NET40\WrappedReader.cs">
<Compile Include="..\Dapper\WrappedReader.cs">
<Link>WrappedReader.cs</Link>
</Compile>
<Compile Include="SqlMapperAsync.cs" />
<Compile Include="..\Dapper\SqlMapper.Async.cs">
<Link>SqlMapper.Async.cs</Link>
</Compile>
<Compile Include="..\Dapper\SqlMapper.GridReader.Async.cs">
<Link>SqlMapper.GridReader.Async.cs</Link>
</Compile>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
......
Tests/PerformanceTests.cs → Dapper.DNX.Tests/PerformanceTests.cs
View file @ 0475827c
#if EXTERNALS
using System;
using System.Collections.Generic;
using System.Data;
......@@ -324,4 +325,5 @@ public static string GetNullableString(this SqlDataReader reader, int index)
return null;
}
}
}
\ No newline at end of file
}
#endif
\ No newline at end of file
DapperTests NET45/Program.cs → Dapper.DNX.Tests/Program.Async.cs
View file @ 0475827c
using System;
#if ASYNC
using System;
using System.Data.SqlClient;
using System.Linq;
using System.Reflection;
......@@ -55,4 +56,5 @@ private static void RunTests()
}
}
}
}
\ No newline at end of file
}
#endif
\ No newline at end of file
Dapper.DNX.Tests/project.json
View file @ 0475827c
......@@ -5,12 +5,6 @@
"tags": [ "" ],
"projectUrl": "",
"licenseUrl": "",
"compile": [
"../Tests/Tests.cs",
"../Tests/Program.cs",
"../Tests/Assert.cs",
"../DapperTests NET45/Tests.cs"
],
"dependencies": {
"Dapper": "1.43-*"
},
......@@ -20,8 +14,11 @@
},
"frameworks": {
"net45": {
"compilationOptions": { "define": [ "ASYNC" ], "warningsAsErrors": true },
"net45": {
"compilationOptions": {
"define": [ ],
"warningsAsErrors": true
},
"frameworkAssemblies": {
"System.Data": "4.0.0.0",
"System.Xml": "4.0.0.0"
......@@ -34,14 +31,21 @@
}
},
"dnx451": {
"compilationOptions": { "define": [ "ASYNC" ], "warningsAsErrors": true },
"compilationOptions": {
"define": [ "ASYNC" ],
"shouldDefine": [ ],
"warningsAsErrors": true
},
"frameworkAssemblies": {
"System.Data": "4.0.0.0",
"System.Xml": "4.0.0.0"
}
},
"dnxcore50": {
"compilationOptions": { "define": [ "ASYNC" ] },
"compilationOptions": {
"define": [ ],
"shouldDefine": [ "ASYNC" ]
},
"dependencies": {
"Microsoft.CSharp": "4.0.1-beta-23225",
"System.Collections": "4.0.11-beta-23225",
......
Dapper.DNX.sln
View file @ 0475827c
......@@ -5,16 +5,6 @@ VisualStudioVersion = 14.0.24606.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Dapper", "Dapper\Dapper.xproj", "{088D8CC4-E71E-44B6-9B87-4060B043983D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{03340C6E-4176-4C42-9C76-D5DFC79D1A22}"
ProjectSection(SolutionItems) = preProject
Tests\Assert.cs = Tests\Assert.cs
Tests\Program.cs = Tests\Program.cs
Tests\Tests.cs = Tests\Tests.cs
DapperTests NET45\Tests.cs = DapperTests NET45\Tests.cs
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{48B0D0A6-D527-457F-AFDB-9D7DBF277E04}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Dapper.DNX.Tests", "Dapper.DNX.Tests\Dapper.DNX.Tests.xproj", "{2AD7E470-9AC1-4F0A-A8C6-F19EEA00593F}"
EndProject
Global
......
Dapper NET45/SqlMapperAsync.cs → Dapper/SqlMapper.Async.cs
View file @ 0475827c
......@@ -562,112 +562,6 @@ private static IEnumerable<T> ExecuteReaderSync<T>(IDataReader reader, Func<IDat
return QueryMultipleAsync(cnn, command);
}
partial class GridReader
{
CancellationToken cancel;
internal GridReader(IDbCommand command, IDataReader reader, Identity identity, DynamicParameters dynamicParams, bool addToCache, CancellationToken cancel)
: this(command, reader, identity, dynamicParams, addToCache)
{
this.cancel = cancel;
}
/// <summary>
/// Read the next grid of results, returned as a dynamic object
/// </summary>
/// <remarks>Note: each row can be accessed via "dynamic", or by casting to an IDictionary&lt;string,object&gt;</remarks>
public Task<IEnumerable<dynamic>> ReadAsync(bool buffered = true)
{
return ReadAsyncImpl<dynamic>(typeof(DapperRow), buffered);
}
/// <summary>
/// Read the next grid of results
/// </summary>
public Task<IEnumerable<object>> ReadAsync(Type type, bool buffered = true)
{
if (type == null) throw new ArgumentNullException("type");
return ReadAsyncImpl<object>(type, buffered);
}
/// <summary>
/// Read the next grid of results
/// </summary>
public Task<IEnumerable<T>> ReadAsync<T>(bool buffered = true)
{
return ReadAsyncImpl<T>(typeof(T), buffered);
}
private async Task NextResultAsync()
{
if (await ((DbDataReader)reader).NextResultAsync(cancel).ConfigureAwait(false))
{
readCount++;
gridIndex++;
consumed = false;
}
else
{
// happy path; close the reader cleanly - no
// need for "Cancel" etc
reader.Dispose();
reader = null;
if (callbacks != null) callbacks.OnCompleted();
Dispose();
}
}
private Task<IEnumerable<T>> ReadAsyncImpl<T>(Type type, bool buffered)
{
if (reader == null) throw new ObjectDisposedException(GetType().FullName, "The reader has been disposed; this can happen after all data has been consumed");
if (consumed) throw new InvalidOperationException("Query results must be consumed in the correct order, and each result can only be consumed once");
var typedIdentity = identity.ForGrid(type, gridIndex);
CacheInfo cache = GetCacheInfo(typedIdentity, null, addToCache);
var deserializer = cache.Deserializer;
int hash = GetColumnHash(reader);
if (deserializer.Func == null || deserializer.Hash != hash)
{
deserializer = new DeserializerState(hash, GetDeserializer(type, reader, 0, -1, false));
cache.Deserializer = deserializer;
}
consumed = true;
if (buffered && this.reader is DbDataReader)
{
return ReadBufferedAsync<T>(gridIndex, deserializer.Func, typedIdentity);
}
else
{
var result = ReadDeferred<T>(gridIndex, deserializer.Func, typedIdentity);
if (buffered) result = result.ToList(); // for the "not a DbDataReader" scenario
return Task.FromResult(result);
}
}
private async Task<IEnumerable<T>> ReadBufferedAsync<T>(int index, Func<IDataReader, object> deserializer, Identity typedIdentity)
{
//try
//{
var reader = (DbDataReader)this.reader;
List<T> buffer = new List<T>();
while (index == gridIndex && await reader.ReadAsync(cancel).ConfigureAwait(false))
{
buffer.Add((T)deserializer(reader));
}
if (index == gridIndex) // need to do this outside of the finally pre-C#6
{
await NextResultAsync().ConfigureAwait(false);
}
return buffer;
//}
//finally // finally so that First etc progresses things even when multiple rows
//{
// if (index == gridIndex)
// {
// await NextResultAsync().ConfigureAwait(false);
// }
//}
}
}
/// <summary>
/// Execute a command that returns multiple result sets, and access each in turn
/// </summary>
......
Dapper/SqlMapper.GridReader.Async.cs 0 → 100644
View file @ 0475827c
#if ASYNC
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.Common;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
#if DNXCORE50
using IDbDataParameter = global::System.Data.Common.DbParameter;
using IDataParameter = global::System.Data.Common.DbParameter;
using IDbTransaction = global::System.Data.Common.DbTransaction;
using IDbConnection = global::System.Data.Common.DbConnection;
using IDbCommand = global::System.Data.Common.DbCommand;
using IDataReader = global::System.Data.Common.DbDataReader;
using IDataRecord = global::System.Data.Common.DbDataReader;
using IDataParameterCollection = global::System.Data.Common.DbParameterCollection;
using DataException = global::System.InvalidOperationException;
using ApplicationException = global::System.InvalidOperationException;
#endif
namespace Dapper
{
partial class SqlMapper
{
partial class GridReader
{
CancellationToken cancel;
internal GridReader(IDbCommand command, IDataReader reader, Identity identity, DynamicParameters dynamicParams, bool addToCache, CancellationToken cancel)
: this(command, reader, identity, dynamicParams, addToCache)
{
this.cancel = cancel;
}
/// <summary>
/// Read the next grid of results, returned as a dynamic object
/// </summary>
/// <remarks>Note: each row can be accessed via "dynamic", or by casting to an IDictionary&lt;string,object&gt;</remarks>
public Task<IEnumerable<dynamic>> ReadAsync(bool buffered = true)
{
return ReadAsyncImpl<dynamic>(typeof(DapperRow), buffered);
}
/// <summary>
/// Read the next grid of results
/// </summary>
public Task<IEnumerable<object>> ReadAsync(Type type, bool buffered = true)
{
if (type == null) throw new ArgumentNullException("type");
return ReadAsyncImpl<object>(type, buffered);
}
/// <summary>
/// Read the next grid of results
/// </summary>
public Task<IEnumerable<T>> ReadAsync<T>(bool buffered = true)
{
return ReadAsyncImpl<T>(typeof(T), buffered);
}
private async Task NextResultAsync()
{
if (await ((DbDataReader)reader).NextResultAsync(cancel).ConfigureAwait(false))
{
readCount++;
gridIndex++;
consumed = false;
}
else
{
// happy path; close the reader cleanly - no
// need for "Cancel" etc
reader.Dispose();
reader = null;
if (callbacks != null) callbacks.OnCompleted();
Dispose();
}
}
private Task<IEnumerable<T>> ReadAsyncImpl<T>(Type type, bool buffered)
{
if (reader == null) throw new ObjectDisposedException(GetType().FullName, "The reader has been disposed; this can happen after all data has been consumed");
if (consumed) throw new InvalidOperationException("Query results must be consumed in the correct order, and each result can only be consumed once");
var typedIdentity = identity.ForGrid(type, gridIndex);
CacheInfo cache = GetCacheInfo(typedIdentity, null, addToCache);
var deserializer = cache.Deserializer;
int hash = GetColumnHash(reader);
if (deserializer.Func == null || deserializer.Hash != hash)
{
deserializer = new DeserializerState(hash, GetDeserializer(type, reader, 0, -1, false));
cache.Deserializer = deserializer;
}
consumed = true;
if (buffered && this.reader is DbDataReader)
{
return ReadBufferedAsync<T>(gridIndex, deserializer.Func, typedIdentity);
}
else
{
var result = ReadDeferred<T>(gridIndex, deserializer.Func, typedIdentity);
if (buffered) result = result.ToList(); // for the "not a DbDataReader" scenario
return Task.FromResult(result);
}
}
private async Task<IEnumerable<T>> ReadBufferedAsync<T>(int index, Func<IDataReader, object> deserializer, Identity typedIdentity)
{
//try
//{
var reader = (DbDataReader)this.reader;
List<T> buffer = new List<T>();
while (index == gridIndex && await reader.ReadAsync(cancel).ConfigureAwait(false))
{
buffer.Add((T)deserializer(reader));
}
if (index == gridIndex) // need to do this outside of the finally pre-C#6
{
await NextResultAsync().ConfigureAwait(false);
}
return buffer;
//}
//finally // finally so that First etc progresses things even when multiple rows
//{
// if (index == gridIndex)
// {
// await NextResultAsync().ConfigureAwait(false);
// }
//}
}
}
}
}
#endif
\ No newline at end of file
Dapper/project.json
View file @ 0475827c
......@@ -6,7 +6,6 @@
"summary": "A high performance Micro-ORM",
"description": "A high performance Micro-ORM supporting Sql Server, MySQL, Sqlite, SqlCE, Firebird etc..",
"version": "1.43-beta1",
"compile": [ "../Dapper NET40/*.cs", "../Dapper NET45/*.cs" ],
"title": "Dapper dot net",
"tags": [ "orm", "sql", "micro-orm" ],
"dependencies": { },
......
DapperTests NET45/DapperTests NET45.csproj
View file @ 0475827c
......@@ -43,12 +43,16 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Tests\Assert.cs">
<Compile Include="..\Dapper.DNX.Tests\Assert.cs">
<Link>Assert.cs</Link>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="..\Dapper.DNX.Tests\Program.Async.cs">
<Link>Program.Async.cs</Link>
</Compile>
<Compile Include="..\Dapper.DNX.Tests\Tests.Async.cs">
<Link>Tests.Async.cs</Link>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Tests.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
......
Tests/DapperTests NET40.csproj
View file @ 0475827c
......@@ -164,7 +164,18 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Assert.cs" />
<Compile Include="..\Dapper.DNX.Tests\Assert.cs">
<Link>Assert.cs</Link>
</Compile>
<Compile Include="..\Dapper.DNX.Tests\PerformanceTests.cs">
<Link>PerformanceTests.cs</Link>
</Compile>
<Compile Include="..\Dapper.DNX.Tests\Program.cs">
<Link>Program.cs</Link>
</Compile>
<Compile Include="..\Dapper.DNX.Tests\Tests.cs">
<Link>Tests.cs</Link>
</Compile>
<Compile Include="EntityFramework\EFContext.cs" />
<Compile Include="Linq2Sql\DataClasses.designer.cs">
<AutoGen>True</AutoGen>
......@@ -174,9 +185,7 @@
<Compile Include="Linq2Sql\Post.cs" />
<Compile Include="Massive\Massive.cs" />
<Compile Include="NHibernate\NHibernateHelper.cs" />
<Compile Include="PerformanceTests.cs" />
<Compile Include="PetaPoco\PetaPoco.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
......@@ -204,7 +213,6 @@
<DesignTime>True</DesignTime>
<DependentUpon>Structs.tt</DependentUpon>
</Compile>
<Compile Include="Tests.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment