Skip to content

Commit

Permalink
Fixed FW 3.
Browse files Browse the repository at this point in the history
  • Loading branch information
@igor-tkachev
igor-tkachev committed Jan 30, 2013
1 parent 1139f1f commit 6c2bad0
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 22 deletions.
15 changes: 0 additions & 15 deletions BLToolkit.2008.sln
View file
Expand Up @@ -19,8 +19,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BLTgen.2008", "Tools\BLTgen
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Templates.2008", "Tools\Templates\Templates.2008.csproj", "{6E0C5565-F9A3-441C-9CB2-8B1878A800EF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NUnitAddin", "Tools\NUnitAddin\NUnitAddin.csproj", "{B951C0DA-943C-4B04-BCAF-8180DD5829C2}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Linq", "Linq", "{4ABA64DA-8981-42F5-9144-DFD5350BEC2D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataProviders", "DataProviders", "{9F229425-A623-4066-9A92-84F31DD54FD2}"
Expand Down Expand Up @@ -105,18 +103,6 @@ Global
{6E0C5565-F9A3-441C-9CB2-8B1878A800EF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{6E0C5565-F9A3-441C-9CB2-8B1878A800EF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{6E0C5565-F9A3-441C-9CB2-8B1878A800EF}.Release|Win32.ActiveCfg = Release|Any CPU
{B951C0DA-943C-4B04-BCAF-8180DD5829C2}.Debug|.NET.ActiveCfg = Debug|Any CPU
{B951C0DA-943C-4B04-BCAF-8180DD5829C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B951C0DA-943C-4B04-BCAF-8180DD5829C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B951C0DA-943C-4B04-BCAF-8180DD5829C2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{B951C0DA-943C-4B04-BCAF-8180DD5829C2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{B951C0DA-943C-4B04-BCAF-8180DD5829C2}.Debug|Win32.ActiveCfg = Debug|Any CPU
{B951C0DA-943C-4B04-BCAF-8180DD5829C2}.Release|.NET.ActiveCfg = Release|Any CPU
{B951C0DA-943C-4B04-BCAF-8180DD5829C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B951C0DA-943C-4B04-BCAF-8180DD5829C2}.Release|Any CPU.Build.0 = Release|Any CPU
{B951C0DA-943C-4B04-BCAF-8180DD5829C2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{B951C0DA-943C-4B04-BCAF-8180DD5829C2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{B951C0DA-943C-4B04-BCAF-8180DD5829C2}.Release|Win32.ActiveCfg = Release|Any CPU
{86BF4F10-3606-4016-9919-84C3335813B6}.Debug|.NET.ActiveCfg = Debug|Any CPU
{86BF4F10-3606-4016-9919-84C3335813B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{86BF4F10-3606-4016-9919-84C3335813B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
Expand Down Expand Up @@ -245,7 +231,6 @@ Global
{DE735B24-E20B-4440-BBBB-35AECC3F1124} = {92307E70-A839-4A76-9701-B5603B05BC08}
{65FC918C-FF12-4C75-96F5-180B552989E5} = {92307E70-A839-4A76-9701-B5603B05BC08}
{6E0C5565-F9A3-441C-9CB2-8B1878A800EF} = {92307E70-A839-4A76-9701-B5603B05BC08}
{B951C0DA-943C-4B04-BCAF-8180DD5829C2} = {92307E70-A839-4A76-9701-B5603B05BC08}
{4ABA64DA-8981-42F5-9144-DFD5350BEC2D} = {F45E2E57-2D88-49DF-8C97-9D8EE7A0A4B1}
{57CE5505-44CB-42E4-A346-3471F68A5B60} = {4ABA64DA-8981-42F5-9144-DFD5350BEC2D}
{86BF4F10-3606-4016-9919-84C3335813B6} = {9F229425-A623-4066-9A92-84F31DD54FD2}
Expand Down
9 changes: 6 additions & 3 deletions DataProviders/PostgreSQL/BLToolkit.Data.DataProvider.PostgreSQL.3.csproj
View file
Expand Up @@ -33,11 +33,11 @@
<ItemGroup>
<Reference Include="Mono.Security, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Npgsql.2.0.11\lib\Net35\Mono.Security.dll</HintPath>
<HintPath>..\..\packages\Npgsql.2.0.12.1\lib\net20\Mono.Security.dll</HintPath>
</Reference>
<Reference Include="Npgsql, Version=2.0.11.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
<Reference Include="Npgsql, Version=2.0.12.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Npgsql.2.0.11\lib\Net35\Npgsql.dll</HintPath>
<HintPath>..\..\packages\Npgsql.2.0.12.1\lib\net20\Npgsql.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
Expand Down Expand Up @@ -65,6 +65,9 @@
<Name>BLToolkit.3</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Service References\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
8 changes: 7 additions & 1 deletion Source/DataAccess/DataAccessorBuilder.cs
View file
Expand Up @@ -333,7 +333,11 @@ private void AddParameter(ParameterInfo pi)
if (pType.IsByRef)
pType = pType.GetElementType();

if (TypeHelper.IsScalar(pType) || pi.IsRefCursor())
if (TypeHelper.IsScalar(pType)
#if FW4
|| pi.IsRefCursor()
#endif
)
_paramList.Add(pi);
else if (pType == typeof(DbManager) || pType.IsSubclassOf(typeof(DbManager)))
_createManager = false;
Expand Down Expand Up @@ -1924,6 +1928,7 @@ private void StoreParameterValue(LocalBuilder param, ParameterInfo pi, Type type
.CastFromObject(type)
;
}
#if FW4
else if (pi.IsRefCursor())
{
// Make sure the parameter is a List
Expand Down Expand Up @@ -1965,6 +1970,7 @@ private void StoreParameterValue(LocalBuilder param, ParameterInfo pi, Type type
.callvirt(mapDataReaderToListMethodInfo)
;
}
#endif
else
{
emit
Expand Down
7 changes: 6 additions & 1 deletion Source/Reflection/TypeHelper.cs
View file
Expand Up @@ -1552,7 +1552,12 @@ public static bool IsNullableValueMember(MemberInfo member)
member.DeclaringType.GetGenericTypeDefinition() == typeof(Nullable<>);
}

public static bool Equals(MemberInfo member1, MemberInfo member2, Type declaringType = null)
public static bool Equals(MemberInfo member1, MemberInfo member2)
{
return Equals(member1, member2, null);
}

public static bool Equals(MemberInfo member1, MemberInfo member2, Type declaringType)
{
if (ReferenceEquals(member1, member2))
return true;
Expand Down
2 changes: 0 additions & 2 deletions UnitTests/Linq/DataServiceTest.cs
View file
Expand Up @@ -17,8 +17,6 @@ public void Test1()
{
var ds = new DataService<NorthwindDB>();
var mp = ds.GetService(typeof(IDataServiceMetadataProvider));


}
}
}

0 comments on commit 6c2bad0

Please sign in to comment.