diff --git a/src/Spring/Spring.Core/Spring.Core.2005.csproj b/src/Spring/Spring.Core/Spring.Core.2005.csproj
index 68924416..54fccae8 100644
--- a/src/Spring/Spring.Core/Spring.Core.2005.csproj
+++ b/src/Spring/Spring.Core/Spring.Core.2005.csproj
@@ -568,6 +568,7 @@
+
@@ -579,6 +580,8 @@
+
+
@@ -987,10 +990,12 @@
+
+
diff --git a/src/Spring/Spring.Core/Spring.Core.build b/src/Spring/Spring.Core/Spring.Core.build
index c70aa85c..ded9a939 100644
--- a/src/Spring/Spring.Core/Spring.Core.build
+++ b/src/Spring/Spring.Core/Spring.Core.build
@@ -20,7 +20,7 @@
-
+
diff --git a/src/Spring/Spring.Data/Data/Common/DbMetadata.cs b/src/Spring/Spring.Data/Data/Common/DbMetadata.cs
index c9a215b1..71fe07de 100644
--- a/src/Spring/Spring.Data/Data/Common/DbMetadata.cs
+++ b/src/Spring/Spring.Data/Data/Common/DbMetadata.cs
@@ -134,7 +134,6 @@ namespace Spring.Data.Common
this.dataAdapterType = dataAdapterType;
this.commandBuilderType = commandBuilderType;
- //TODO consider support for derive parameters via a stored procedure.
if (commandBuilderDeriveParametersMethod.ToLower().Trim().Equals("not supported"))
{
supportsDeriveParametersMethod = false;
diff --git a/src/Spring/Spring.Data/Data/Common/DbParameters.cs b/src/Spring/Spring.Data/Data/Common/DbParameters.cs
index 42628cb0..4be458d8 100644
--- a/src/Spring/Spring.Data/Data/Common/DbParameters.cs
+++ b/src/Spring/Spring.Data/Data/Common/DbParameters.cs
@@ -171,7 +171,6 @@ namespace Spring.Data.Common
public int Add(object parameterValue)
{
IDbDataParameter parameter = dbCommand.CreateParameter();
- //TODO investigate default behavior of values.
parameter.Value = (parameterValue == null) ? DBNull.Value : parameterValue;
dataParameterCollection.Add(parameter);
return dataParameterCollection.Count - 1;
@@ -297,7 +296,6 @@ namespace Spring.Data.Common
{
propertyInfo.SetValue(parameter, isNullable, null);
}
- //TODO investigate default behavior.
if (parameter.Value == null)
{
parameter.Value = DBNull.Value;
diff --git a/src/Spring/Spring.Data/Data/Common/IDbMetadata.cs b/src/Spring/Spring.Data/Data/Common/IDbMetadata.cs
index 2191bb12..f8a9cd83 100644
--- a/src/Spring/Spring.Data/Data/Common/IDbMetadata.cs
+++ b/src/Spring/Spring.Data/Data/Common/IDbMetadata.cs
@@ -135,7 +135,8 @@ namespace Spring.Data.Common
/// For providers that allow you to choose between binding parameters
/// to a command by name (true) or by position (false).
///
- bool BindByName { get;
+ bool BindByName {
+ get;
//TODO will go away when make all of this fully configuration driven.
set;
}
diff --git a/src/Spring/Spring.Data/Data/Core/AdoAccessor.cs b/src/Spring/Spring.Data/Data/Core/AdoAccessor.cs
index d785f560..e96a13c2 100644
--- a/src/Spring/Spring.Data/Data/Core/AdoAccessor.cs
+++ b/src/Spring/Spring.Data/Data/Core/AdoAccessor.cs
@@ -109,7 +109,7 @@ namespace Spring.Data.Core
/// Prepare the command setting the transaction timeout.
///
///
- protected void ApplyCommandSettings(IDbCommand command)
+ protected virtual void ApplyCommandSettings(IDbCommand command)
{
ConnectionUtils.ApplyTransactionTimeout(command, DbProvider, CommandTimeout );
}
diff --git a/src/Spring/Spring.Services/AssemblyInfo.cs b/src/Spring/Spring.Services/AssemblyInfo.cs
index a085cc31..f11b8f14 100644
--- a/src/Spring/Spring.Services/AssemblyInfo.cs
+++ b/src/Spring/Spring.Services/AssemblyInfo.cs
@@ -1,5 +1,5 @@
using System;
using System.Reflection;
-[assembly: AssemblyTitle("Spring.Net Portable Service Abstractions support")]
+[assembly: AssemblyTitle("Spring.Services")]
[assembly: AssemblyDescription("Interfaces and classes that provide portable service abstractions in Spring.Net")]
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/EnterpriseServices/ExeConfigurationSystem.cs b/src/Spring/Spring.Services/EnterpriseServices/ExeConfigurationSystem.cs
index 225a6738..1699a4a9 100644
--- a/src/Spring/Spring.Services/EnterpriseServices/ExeConfigurationSystem.cs
+++ b/src/Spring/Spring.Services/EnterpriseServices/ExeConfigurationSystem.cs
@@ -20,7 +20,7 @@
namespace Spring.EnterpriseServices
{
-#if NET_2_0
+#if (NET_2_0 && !MONO)
using System;
using System.Configuration;
using System.Reflection;
diff --git a/src/Spring/Spring.Web/Spring.Web.build b/src/Spring/Spring.Web/Spring.Web.build
index 0623c795..d36b965e 100644
--- a/src/Spring/Spring.Web/Spring.Web.build
+++ b/src/Spring/Spring.Web/Spring.Web.build
@@ -17,6 +17,7 @@
+
diff --git a/test/Spring/Spring.Core.Tests/SecurityTemplate.cs b/test/Spring/Spring.Core.Tests/SecurityTemplate.cs
index 2c170eb8..399773a9 100644
--- a/test/Spring/Spring.Core.Tests/SecurityTemplate.cs
+++ b/test/Spring/Spring.Core.Tests/SecurityTemplate.cs
@@ -26,7 +26,6 @@ using System.Data.SqlClient;
using System.Drawing.Printing;
using System.IO;
using System.Net;
-//using System.Net.Mail;
using System.Runtime.InteropServices;
using System.Security;
using System.Security.Permissions;
@@ -260,6 +259,7 @@ namespace Spring
return null;
}
+#if !MONO
///
/// Loads the policy configuration from app.config configuration section
///
@@ -311,7 +311,7 @@ namespace Spring
PolicyLevel domainPolicy = LoadDomainPolicyFromUri(new Uri(policyFileExpanded), appDirectory, trustSection.OriginUrl);
return domainPolicy;
}
-
+#endif
///
/// Loads a policy from a file (),
/// replacing placeholders
@@ -398,7 +398,7 @@ namespace Spring
}
return SecurityManager.LoadPolicyLevelFromString(strXmlPolicy, PolicyLevelType.AppDomain);
}
-
+#if !MONO
private static string GetPolicyFilenameExpanded(TrustLevel trustLevel)
{
bool isRelative = true;
@@ -424,7 +424,7 @@ namespace Spring
}
return trustLevel.PolicyFile;
}
-
+#endif
[DllImport("mscorwks.dll", CharSet = CharSet.Unicode)]
private static extern int GetCachePath(int dwCacheFlags, StringBuilder pwzCachePath, ref int pcchPath);
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2005.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2005.csproj
index 4847fc73..e65ce8e6 100644
--- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2005.csproj
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2005.csproj
@@ -648,6 +648,7 @@
+
Code
@@ -655,6 +656,7 @@
Code
+
@@ -671,6 +673,7 @@
Code
+
@@ -710,9 +713,6 @@
-
- Code
-
Code
@@ -827,6 +827,7 @@
+
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build
index d4f997a0..5702573d 100644
--- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build
@@ -19,6 +19,7 @@
doc="${current.bin.dir}/${project::get-name()}.xml">
+
@@ -48,6 +49,7 @@
+