From fc3cb1642bbc1ff753561dd96f59c162b62fa178 Mon Sep 17 00:00:00 2001
From: jperrin <jperrin@alkamitech.com>
Date: Thu, 6 Oct 2011 11:14:21 -0500
Subject: [PATCH 01/14] System.Diagnostics.Trace.WriteLine on line 97 of
 SimpleDelegatingSessionFactory.cs opens a database connection but never
 closes it.

Replaced ((ISessionFactoryImplementor)factory).ConnectionProvider.GetConnection().ConnectionString
With local variable: connectionString

An example of the unclosed connection can be found at: http://forum.springframework.net/showthread.php?9478-DelegatingLocalSessionFactoryObject-database-connection-leak
---
 .../SimpleDelegatingSessionFactory.cs         | 210 +++++++++---------
 1 file changed, 105 insertions(+), 105 deletions(-)

diff --git a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/SimpleDelegatingSessionFactory.cs b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/SimpleDelegatingSessionFactory.cs
index 658d4fc0..0d62faab 100644
--- a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/SimpleDelegatingSessionFactory.cs
+++ b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/SimpleDelegatingSessionFactory.cs
@@ -1,105 +1,105 @@
-using System.Collections;
-
-using NHibernate;
-using NHibernate.Cfg;
-using NhCfg = NHibernate.Cfg;
-
-using Spring.Collections;
-using Spring.Threading;
-using Spring.Data.Common;
-using Spring.Context.Support;
-using NHibernate.Engine;
-using System;
-
-namespace Spring.Data.NHibernate
-{
-    /// <summary>
-    /// SimpleDelegatingSessionFactory class
-    /// </summary>
-    public class SimpleDelegatingSessionFactory : DelegatingSessionFactory
-    {
-        /// <summary>
-        /// Connection string config element name
-        /// </summary>
-        public const string CONNECTION_STRING = "SimpleDelegatingSessionFactory.ConnectionString";
-
-        private Configuration _configuration;
-
-        private string _defaultConnectionString;
-
-        private object _monitor = new object();
-
-        private IDictionary _targetSessionFactories = new SynchronizedHashtable();
-
-        /// <summary>
-        /// public Constructor
-        /// </summary>
-        /// <param name="defaultConfiguration"></param>
-        public SimpleDelegatingSessionFactory(Configuration defaultConfiguration)
-        {
-            if (defaultConfiguration == null)
-            {
-                throw new ArgumentException("Configuration cannot be null", "defaultConfiguration");
-            }
-
-            _configuration = defaultConfiguration;
-            if (!_configuration.Properties.ContainsKey(NhCfg.Environment.ConnectionString))
-            {
-                throw new ArgumentException("Must specify connection string");
-            }
-
-            _defaultConnectionString = _configuration.Properties[NhCfg.Environment.ConnectionString] as string;
-            if (_defaultConnectionString == null)
-            {
-                throw new ArgumentException("Connection string property must be of type string, not " +
-                        _configuration.Properties[NhCfg.Environment.ConnectionString].GetType().FullName);
-            }
-        }
-
-        /// <summary>
-        /// TargetSessionFactory
-        /// </summary>
-        public override ISessionFactory TargetSessionFactory
-        {
-            get
-            {
-                string connectionString = LogicalThreadContext.GetData(CONNECTION_STRING) as string;
-
-                System.Diagnostics.Trace.WriteLine(String.Format("{0} = {1}", System.Threading.Thread.CurrentThread.GetHashCode(), connectionString));
-                
-                if (connectionString == null)
-                {
-                    connectionString = _defaultConnectionString;
-                }
-
-                lock (_monitor)
-                {
-                    if (!_targetSessionFactories.Contains(connectionString))
-                    {
-                        System.Diagnostics.Trace.WriteLine(System.Threading.Thread.CurrentThread.GetHashCode().ToString() + " = (created) ");
-
-                        _configuration.Properties[NhCfg.Environment.ConnectionString] = connectionString;
-                        ISessionFactory sessionFactory = _configuration.BuildSessionFactory();
-
-                        LocalSessionFactoryObject.DbProviderWrapper dbProviderWrapper = ((ISessionFactoryImplementor)sessionFactory).ConnectionProvider as LocalSessionFactoryObject.DbProviderWrapper;
-                        if (dbProviderWrapper != null)
-                        {
-                            dbProviderWrapper.DbProvider = (IDbProvider)ContextRegistry.GetContext().GetObject("DbProvider");
-                        }
-
-                        _targetSessionFactories[connectionString] = sessionFactory;
-                    }
-                    else
-                        System.Diagnostics.Trace.WriteLine(System.Threading.Thread.CurrentThread.GetHashCode().ToString() + " =  (cached) ");
-
-                    ISessionFactory factory = _targetSessionFactories[connectionString] as ISessionFactory;
-
-                    System.Diagnostics.Trace.WriteLine(String.Format("{0} =  {1}", System.Threading.Thread.CurrentThread.GetHashCode(), ((ISessionFactoryImplementor)factory).ConnectionProvider.GetConnection().ConnectionString));
-                    
-                    return factory;
-                }
-            }
-        }
-
-    }
-}
+using System.Collections;
+
+using NHibernate;
+using NHibernate.Cfg;
+using NhCfg = NHibernate.Cfg;
+
+using Spring.Collections;
+using Spring.Threading;
+using Spring.Data.Common;
+using Spring.Context.Support;
+using NHibernate.Engine;
+using System;
+
+namespace Spring.Data.NHibernate
+{
+    /// <summary>
+    /// SimpleDelegatingSessionFactory class
+    /// </summary>
+    public class SimpleDelegatingSessionFactory : DelegatingSessionFactory
+    {
+        /// <summary>
+        /// Connection string config element name
+        /// </summary>
+        public const string CONNECTION_STRING = "SimpleDelegatingSessionFactory.ConnectionString";
+
+        private Configuration _configuration;
+
+        private string _defaultConnectionString;
+
+        private object _monitor = new object();
+
+        private IDictionary _targetSessionFactories = new SynchronizedHashtable();
+
+        /// <summary>
+        /// public Constructor
+        /// </summary>
+        /// <param name="defaultConfiguration"></param>
+        public SimpleDelegatingSessionFactory(Configuration defaultConfiguration)
+        {
+            if (defaultConfiguration == null)
+            {
+                throw new ArgumentException("Configuration cannot be null", "defaultConfiguration");
+            }
+
+            _configuration = defaultConfiguration;
+            if (!_configuration.Properties.ContainsKey(NhCfg.Environment.ConnectionString))
+            {
+                throw new ArgumentException("Must specify connection string");
+            }
+
+            _defaultConnectionString = _configuration.Properties[NhCfg.Environment.ConnectionString] as string;
+            if (_defaultConnectionString == null)
+            {
+                throw new ArgumentException("Connection string property must be of type string, not " +
+                        _configuration.Properties[NhCfg.Environment.ConnectionString].GetType().FullName);
+            }
+        }
+
+        /// <summary>
+        /// TargetSessionFactory
+        /// </summary>
+        public override ISessionFactory TargetSessionFactory
+        {
+            get
+            {
+                string connectionString = LogicalThreadContext.GetData(CONNECTION_STRING) as string;
+
+                System.Diagnostics.Trace.WriteLine(String.Format("{0} = {1}", System.Threading.Thread.CurrentThread.GetHashCode(), connectionString));
+                
+                if (connectionString == null)
+                {
+                    connectionString = _defaultConnectionString;
+                }
+
+                lock (_monitor)
+                {
+                    if (!_targetSessionFactories.Contains(connectionString))
+                    {
+                        System.Diagnostics.Trace.WriteLine(System.Threading.Thread.CurrentThread.GetHashCode().ToString() + " = (created) ");
+
+                        _configuration.Properties[NhCfg.Environment.ConnectionString] = connectionString;
+                        ISessionFactory sessionFactory = _configuration.BuildSessionFactory();
+
+                        LocalSessionFactoryObject.DbProviderWrapper dbProviderWrapper = ((ISessionFactoryImplementor)sessionFactory).ConnectionProvider as LocalSessionFactoryObject.DbProviderWrapper;
+                        if (dbProviderWrapper != null)
+                        {
+                            dbProviderWrapper.DbProvider = (IDbProvider)ContextRegistry.GetContext().GetObject("DbProvider");
+                        }
+
+                        _targetSessionFactories[connectionString] = sessionFactory;
+                    }
+                    else
+                        System.Diagnostics.Trace.WriteLine(System.Threading.Thread.CurrentThread.GetHashCode().ToString() + " =  (cached) ");
+
+                    ISessionFactory factory = _targetSessionFactories[connectionString] as ISessionFactory;
+
+                    System.Diagnostics.Trace.WriteLine(String.Format("{0} =  {1}", System.Threading.Thread.CurrentThread.GetHashCode(), connectionString));
+                    
+                    return factory;
+                }
+            }
+        }
+
+    }
+}

From cdd2564beb7c37fcfe813fdf2b3329236e7e8522 Mon Sep 17 00:00:00 2001
From: Marijn van der Zee <marijn@serraict.com>
Date: Thu, 13 Oct 2011 16:39:10 +0200
Subject: [PATCH 02/14] Remove the errant paragraph and code listing

The errant paragraph is removed, as well as the code listing. From the
text it appears that an example should have been inserted here; that's
commented out and replaced with a TODO note.
---
 doc/reference/src/ado.xml | 45 +++++++--------------------------------
 1 file changed, 8 insertions(+), 37 deletions(-)

diff --git a/doc/reference/src/ado.xml b/doc/reference/src/ado.xml
index dd1fa659..52753d46 100644
--- a/doc/reference/src/ado.xml
+++ b/doc/reference/src/ado.xml
@@ -2052,50 +2052,21 @@ public static void ApplyConnectionAndTx(object typedDataSetAdapter, IDbProvider
       <literal>MappingadoQueryWithParameters</literal> (See SDK docs for
       details).</para>
 
-      <para>The <literal>AdoNonQuery</literal> class encapsulates an
-      IDbCommand 's ExecuteNonQuery method functionality. Like the
-      <literal>AdoQuery</literal> object, an <literal>AdoNonQuery</literal>
-      object is reusable, and like all <literal>AdoOperation</literal>
-      classes, an <literal>AdoNonQuery</literal> can have parameters and is
-      defined in SQL. This class provides two execute methods</para>
-
-      <itemizedlist>
-        <listitem>
-          <para><literal>IDictionary ExecuteNonQuery(params object[]
-          inParameterValues)</literal></para>
-        </listitem>
-
-        <listitem>
-          <para><literal>IDictionary ExecuteNonQueryByNamedParam(IDictionary
-          inParams)</literal></para>
-        </listitem>
-      </itemizedlist>
-
-      <para>This class is concrete. Although it can be subclassed (for example
-      to add a custom update method) it can easily be parameterized by setting
-      SQL and declaring parameters.</para>
+<!--
 
+TODO: add example of subclassing AdoQuery here
+	  
       <para>An example of an AdoQuery subclass to encapsulate an insert
       statement for a 'TestObject' (consisting only name and age columns) is
       shown below</para>
 
-      <programlisting language="csharp">public class CreateTestObjectNonQuery : AdoNonQuery
+      <programlisting language="csharp">public class CreateTestObjectNonQuery : AdoQuery
 {
-  private static string sql = "insert into TestObjects(Age,Name) values (@Age,@Name)";
-   
-  public CreateTestObjectNonQuery(IDbProvider dbProvider) : base(dbProvider, sql)
-  {
-    DeclaredParameters.Add("Age", DbType.Int32);
-    DeclaredParameters.Add("Name", SqlDbType.NVarChar, 16);
-    Compile();
-  }
-
-  public void Create(string name, int age)
-  {
-     ExecuteNonQuery(name, age);
-  }
-
+  //...
 }</programlisting>
+
+-->
+
     </sect2>
 
     <sect2 xml:id="ado-mappingadoquery">

From d4f67530c45ff95d8a7ff755f379714c51c748e2 Mon Sep 17 00:00:00 2001
From: Marijn van der Zee <marijn@serraict.com>
Date: Tue, 18 Oct 2011 17:10:11 +0200
Subject: [PATCH 03/14] Fix typo.

---
 doc/reference/src/ado.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/reference/src/ado.xml b/doc/reference/src/ado.xml
index d08313ba..f9959399 100644
--- a/doc/reference/src/ado.xml
+++ b/doc/reference/src/ado.xml
@@ -2047,7 +2047,7 @@ public static void ApplyConnectionAndTx(object typedDataSetAdapter, IDbProvider
       <literal>AdoQuery</literal> class is rarely used directly since the
       <literal>MappingAdoQuery</literal> subclass provides a much more
       convenient implementation for mapping rows to .NET classes. Another
-      implementations that extends <literal>AdoQuery</literal> is
+      implementation that extends <literal>AdoQuery</literal> is
       <literal>MappingadoQueryWithParameters</literal> (See SDK docs for
       details).</para>
 

From c4b0bf255f8bc3da199fb1e0eb761d2ebf9f5f34 Mon Sep 17 00:00:00 2001
From: Bruno Baia <brbaia@gmail.com>
Date: Thu, 20 Oct 2011 18:20:48 +0200
Subject: [PATCH 04/14] Fixed WCF Quickstart [Related to SPRNET-1475]

---
 .../Spring.WcfQuickStart.2008.sln             |  4 +-
 ... Spring.WcfQuickStart.Aspects.2008.csproj} |  9 ++--
 .../Spring.WcfQuickStart.Aspects.2010.csproj  | 28 +++--------
 .../Spring.WcfQuickStart.ClientApp/App.config | 12 ++++-
 ...Spring.WcfQuickStart.ClientApp.2008.csproj | 36 ++++---------
 ...Spring.WcfQuickStart.ClientApp.2010.csproj | 50 ++++---------------
 ...pring.WcfQuickStart.Contracts.2008.csproj} |  5 +-
 ...Spring.WcfQuickStart.Contracts.2010.csproj | 20 +-------
 ...Spring.WcfQuickStart.ServerApp.2008.csproj | 34 ++++---------
 ...Spring.WcfQuickStart.ServerApp.2010.csproj | 48 ++++--------------
 ...Spring.WcfQuickStart.ServerWeb.2008.csproj | 29 ++++++++---
 ...Spring.WcfQuickStart.ServerWeb.2010.csproj | 25 ++++++----
 12 files changed, 110 insertions(+), 190 deletions(-)
 rename examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/{Spring.WcfQuickStart.Aspects.csproj => Spring.WcfQuickStart.Aspects.2008.csproj} (87%)
 rename examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/{Spring.WcfQuickStart.Contracts.csproj => Spring.WcfQuickStart.Contracts.2008.csproj} (90%)

diff --git a/examples/Spring/Spring.WcfQuickStart/Spring.WcfQuickStart.2008.sln b/examples/Spring/Spring.WcfQuickStart/Spring.WcfQuickStart.2008.sln
index 69acd826..a7962996 100644
--- a/examples/Spring/Spring.WcfQuickStart/Spring.WcfQuickStart.2008.sln
+++ b/examples/Spring/Spring.WcfQuickStart/Spring.WcfQuickStart.2008.sln
@@ -10,9 +10,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.Server
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.ServerWeb.2008", "src\Spring.WcfQuickStart.ServerWeb\Spring.WcfQuickStart.ServerWeb.2008.csproj", "{EEC5B531-104B-44E6-975B-44C0C8973405}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.Contracts", "src\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.csproj", "{53263837-0643-45FE-96A2-46D425E1A36F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.Contracts.2008", "src\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.2008.csproj", "{53263837-0643-45FE-96A2-46D425E1A36F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.Aspects", "src\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.csproj", "{B52BBAA3-1B30-4905-827C-1D81EBA56A15}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.Aspects.2008", "src\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.2008.csproj", "{B52BBAA3-1B30-4905-827C-1D81EBA56A15}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.2008.csproj
similarity index 87%
rename from examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.csproj
rename to examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.2008.csproj
index 997028e9..89546754 100644
--- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.csproj
+++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.2008.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring.WcfQuickStart</RootNamespace>
     <AssemblyName>Spring.WcfQuickStart.Aspects</AssemblyName>
-    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkSubset>
     </TargetFrameworkSubset>
@@ -33,15 +33,18 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Spring.Aop, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Aop, Version=0.0.0.20000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Core, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Core, Version=0.0.0.20000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.2010.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.2010.csproj
index ddfa05bd..3f46fc5b 100644
--- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.2010.csproj
+++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.2010.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring.WcfQuickStart</RootNamespace>
     <AssemblyName>Spring.WcfQuickStart.Aspects</AssemblyName>
-    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
@@ -31,6 +31,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -52,13 +53,13 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Spring.Aop, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Aop, Version=0.0.0.40000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Core, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Core, Version=0.0.0.40000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -68,23 +69,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SimplePerformanceInterceptor.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </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.
diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/App.config b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/App.config
index 1844ca7d..f188514b 100644
--- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/App.config
+++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/App.config
@@ -1,11 +1,14 @@
 <?xml version="1.0"?>
 <configuration>
+  
 	<configSections>
 		<sectionGroup name="spring">
 			<section name="context" type="Spring.Context.Support.ContextHandler, Spring.Core"/>
 			<section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core"/>
-		</sectionGroup>
+      <section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core" />
+    </sectionGroup>
 	</configSections>
+  
 	<spring>
 		<context>
 			<!-- Make sure 'http://localhost:2637/Spring.WcfQuickStart.ServerWeb/' web application is running -->
@@ -15,7 +18,11 @@
 			<!-- Aspects definition -->
 			<resource uri="assembly://Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.Config/Aspects.xml"/>
 		</context>
+    <parsers>
+      <parser type="Spring.ServiceModel.Config.WcfNamespaceParser, Spring.Services" />
+    </parsers>
 	</spring>
+  
 	<system.serviceModel>
 		<bindings>
 			<basicHttpBinding>
@@ -33,4 +40,5 @@
 			<endpoint name="serverAppCalculatorEndpoint" address="http://localhost:8000/Spring.WcfQuickStart/service" binding="basicHttpBinding" bindingConfiguration="basicHttpBinding1" contract="Spring.WcfQuickStart.ICalculator"/>
 		</client>
 	</system.serviceModel>
-	<startup/></configuration>
+  
+</configuration>
diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.2008.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.2008.csproj
index 7c35e6d6..402ed7d9 100644
--- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.2008.csproj
+++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.2008.csproj
@@ -14,7 +14,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <PublishUrl>http://localhost/Spring.WcfQuickStart.ClientApp/</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
@@ -52,19 +52,22 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Spring.Aop, Version=0.0.0.20468, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Aop, Version=0.0.0.20000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Core, Version=1.2.0.20311, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+    <Reference Include="Spring.Core, Version=0.0.0.20000, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Services, Version=1.2.0.30311, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+    <Reference Include="Spring.Services, Version=0.0.0.35000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.0\debug\Spring.Services.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Services.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
     <Reference Include="System.Xml" />
@@ -78,33 +81,14 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Config\ServerApp.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
     <EmbeddedResource Include="Config\ServerWeb.xml" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.csproj">
+    <ProjectReference Include="..\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.2008.csproj">
       <Project>{B52BBAA3-1B30-4905-827C-1D81EBA56A15}</Project>
       <Name>Spring.WcfQuickStart.Aspects</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.csproj">
+    <ProjectReference Include="..\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.2008.csproj">
       <Project>{53263837-0643-45FE-96A2-46D425E1A36F}</Project>
       <Name>Spring.WcfQuickStart.Contracts</Name>
     </ProjectReference>
diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.2010.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.2010.csproj
index 24b0841c..58907b19 100644
--- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.2010.csproj
+++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.2010.csproj
@@ -15,7 +15,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <IsWebBootstrapper>true</IsWebBootstrapper>
     <PublishUrl>http://localhost/Spring.WcfQuickStart.ClientApp/</PublishUrl>
     <Install>true</Install>
@@ -31,6 +31,7 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -53,21 +54,21 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Spring.Aop, Version=0.0.0.20468, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Aop, Version=0.0.0.40000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Core, Version=1.2.0.20311, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+    <Reference Include="Spring.Core, Version=0.0.0.40000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Services, Version=1.2.0.30311, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+    <Reference Include="Spring.Services, Version=0.0.0.40000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.0\debug\Spring.Services.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Services.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -79,43 +80,14 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Config\ServerApp.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
     <EmbeddedResource Include="Config\ServerWeb.xml" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.csproj">
+    <ProjectReference Include="..\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.2010.csproj">
       <Project>{B52BBAA3-1B30-4905-827C-1D81EBA56A15}</Project>
       <Name>Spring.WcfQuickStart.Aspects</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.csproj">
+    <ProjectReference Include="..\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.2010.csproj">
       <Project>{53263837-0643-45FE-96A2-46D425E1A36F}</Project>
       <Name>Spring.WcfQuickStart.Contracts</Name>
     </ProjectReference>
diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.2008.csproj
similarity index 90%
rename from examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.csproj
rename to examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.2008.csproj
index a5b00d22..1139972e 100644
--- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.csproj
+++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.2008.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring.WcfQuickStart</RootNamespace>
     <AssemblyName>Spring.WcfQuickStart.Contracts</AssemblyName>
-    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkSubset>
     </TargetFrameworkSubset>
@@ -34,6 +34,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.ServiceModel">
       <RequiredTargetFramework>3.0</RequiredTargetFramework>
     </Reference>
diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.2010.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.2010.csproj
index 8a7e21d9..e7fea581 100644
--- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.2010.csproj
+++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.2010.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring.WcfQuickStart</RootNamespace>
     <AssemblyName>Spring.WcfQuickStart.Contracts</AssemblyName>
-    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
@@ -31,6 +31,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -64,23 +65,6 @@
     <Compile Include="ICalculator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </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.
diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerApp/Spring.WcfQuickStart.ServerApp.2008.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerApp/Spring.WcfQuickStart.ServerApp.2008.csproj
index 1a88ca0c..965520eb 100644
--- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerApp/Spring.WcfQuickStart.ServerApp.2008.csproj
+++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerApp/Spring.WcfQuickStart.ServerApp.2008.csproj
@@ -14,7 +14,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <PublishUrl>http://localhost/Spring.WcfQuickStart.ServerApp/</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
@@ -50,19 +50,22 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Spring.Aop, Version=1.2.0.20311, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+    <Reference Include="Spring.Aop, Version=0.0.0.20000, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Core, Version=1.2.0.20311, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+    <Reference Include="Spring.Core, Version=0.0.0.20000, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Services, Version=1.2.0.30311, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+    <Reference Include="Spring.Services, Version=0.0.0.35000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.0\debug\Spring.Services.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Services.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
     <Reference Include="System.Xml" />
@@ -76,28 +79,11 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.csproj">
+    <ProjectReference Include="..\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.2008.csproj">
       <Project>{B52BBAA3-1B30-4905-827C-1D81EBA56A15}</Project>
       <Name>Spring.WcfQuickStart.Aspects</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.csproj">
+    <ProjectReference Include="..\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.2008.csproj">
       <Project>{53263837-0643-45FE-96A2-46D425E1A36F}</Project>
       <Name>Spring.WcfQuickStart.Contracts</Name>
     </ProjectReference>
diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerApp/Spring.WcfQuickStart.ServerApp.2010.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerApp/Spring.WcfQuickStart.ServerApp.2010.csproj
index d3ed2352..e28d43f2 100644
--- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerApp/Spring.WcfQuickStart.ServerApp.2010.csproj
+++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerApp/Spring.WcfQuickStart.ServerApp.2010.csproj
@@ -15,7 +15,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <IsWebBootstrapper>true</IsWebBootstrapper>
     <PublishUrl>http://localhost/Spring.WcfQuickStart.ServerApp/</PublishUrl>
     <Install>true</Install>
@@ -31,6 +31,7 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -53,21 +54,21 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Spring.Aop, Version=1.2.0.20311, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+    <Reference Include="Spring.Aop, Version=0.0.0.40000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Core, Version=1.2.0.20311, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+    <Reference Include="Spring.Core, Version=0.0.0.40000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Services, Version=1.2.0.30311, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+    <Reference Include="Spring.Services, Version=0.0.0.40000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.0\debug\Spring.Services.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Services.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -79,38 +80,11 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.csproj">
+    <ProjectReference Include="..\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.2010.csproj">
       <Project>{B52BBAA3-1B30-4905-827C-1D81EBA56A15}</Project>
       <Name>Spring.WcfQuickStart.Aspects</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.csproj">
+    <ProjectReference Include="..\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.2010.csproj">
       <Project>{53263837-0643-45FE-96A2-46D425E1A36F}</Project>
       <Name>Spring.WcfQuickStart.Contracts</Name>
     </ProjectReference>
diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerWeb/Spring.WcfQuickStart.ServerWeb.2008.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerWeb/Spring.WcfQuickStart.ServerWeb.2008.csproj
index f41b106e..08bb6a2e 100644
--- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerWeb/Spring.WcfQuickStart.ServerWeb.2008.csproj
+++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerWeb/Spring.WcfQuickStart.ServerWeb.2008.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring.WcfQuickStart</RootNamespace>
     <AssemblyName>Spring.WcfQuickStart.ServerWeb</AssemblyName>
-    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -30,26 +30,41 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Spring.Aop, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Aop, Version=0.0.0.20000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\bin\net\3.0\debug\Spring.Aop.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Core, Version=1.2.0.20313, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Core, Version=0.0.0.20000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Services, Version=1.2.0.30313, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Services, Version=0.0.0.35000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.0\debug\Spring.Services.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Services.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.ServiceModel">
       <RequiredTargetFramework>3.0</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Web" />
+    <Reference Include="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Web.Extensions.Design, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Web.Services" />
+    <Reference Include="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="Web.config" />
@@ -60,11 +75,11 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.csproj">
+    <ProjectReference Include="..\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.2008.csproj">
       <Project>{B52BBAA3-1B30-4905-827C-1D81EBA56A15}</Project>
       <Name>Spring.WcfQuickStart.Aspects</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.csproj">
+    <ProjectReference Include="..\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.2008.csproj">
       <Project>{53263837-0643-45FE-96A2-46D425E1A36F}</Project>
       <Name>Spring.WcfQuickStart.Contracts</Name>
     </ProjectReference>
diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerWeb/Spring.WcfQuickStart.ServerWeb.2010.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerWeb/Spring.WcfQuickStart.ServerWeb.2010.csproj
index 78e7dfd8..cf597249 100644
--- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerWeb/Spring.WcfQuickStart.ServerWeb.2010.csproj
+++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerWeb/Spring.WcfQuickStart.ServerWeb.2010.csproj
@@ -11,12 +11,13 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring.WcfQuickStart</RootNamespace>
     <AssemblyName>Spring.WcfQuickStart.ServerWeb</AssemblyName>
-    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
     <UseIISExpress>false</UseIISExpress>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -38,26 +39,32 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Spring.Aop, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Aop, Version=0.0.0.40000, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Core, Version=1.2.0.20313, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Core, Version=0.0.0.40000, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Services, Version=1.2.0.30313, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Services, Version=0.0.0.40000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.0\debug\Spring.Services.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Services.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.ServiceModel">
       <RequiredTargetFramework>3.0</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Web" />
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Web.Services" />
+    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Web.config" />
@@ -68,11 +75,11 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.csproj">
+    <ProjectReference Include="..\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.2010.csproj">
       <Project>{B52BBAA3-1B30-4905-827C-1D81EBA56A15}</Project>
       <Name>Spring.WcfQuickStart.Aspects</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.csproj">
+    <ProjectReference Include="..\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.2010.csproj">
       <Project>{53263837-0643-45FE-96A2-46D425E1A36F}</Project>
       <Name>Spring.WcfQuickStart.Contracts</Name>
     </ProjectReference>

From 521eb1c6ccf48e8aed638aa705c6dc42f08aa079 Mon Sep 17 00:00:00 2001
From: Marijn van der Zee <marijn@serraict.com>
Date: Fri, 28 Oct 2011 21:30:41 +0300
Subject: [PATCH 05/14] The default value for build-ems should be false for the
 `compile-net-4.0`c target

Reference: http://forum.springframework.net/showthread.php?9515-What-are-the-prerequisites-to-do-a-succesful-build-from-a-clean-check-out&p=25723#post25723
---
 Spring.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Spring.build b/Spring.build
index 2a1f6f4b..78161175 100644
--- a/Spring.build
+++ b/Spring.build
@@ -609,7 +609,7 @@ Commandline Examples:
     <call target="copykeys" if="${project.build.sign}"/>
 	<call target="copylibs" />
     <call target="common.generate-assemblyinfo"/>
-    <property name="build-ems" value="true" overwrite="true" />
+    <property name="build-ems" value="false" overwrite="true" />
     <property name="build-nms" value="true" overwrite="true" />
     <property name="build-quartz" value="true" overwrite="true" />
     <property name="build-msmq" value="true" overwrite="true" />

From 8ad4bfcc5e0dcd2692b90eb6001c6939d2c895af Mon Sep 17 00:00:00 2001
From: Steve Bohlen <sbohlen@gmail.com>
Date: Mon, 31 Oct 2011 11:57:59 -0400
Subject: [PATCH 06/14] fixing broken path to nonredist folder

---
 Spring.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Spring.build b/Spring.build
index 2a1f6f4b..08fd0eee 100644
--- a/Spring.build
+++ b/Spring.build
@@ -109,7 +109,7 @@ Commandline Examples:
   <property name="project.name" value="Spring.NET"/>
   <property name="project.name.full" value="Spring.NET Framework"/>
   <property name="spring.basedir" value="${project::get-base-directory()}"/>
-  <property name="spring.nonredistdir" value="${spring.basedir}\..\nonredist"/>
+  <property name="spring.nonredistdir" value="${spring.basedir}\..\..\nonredist"/>
   <property name="tool.dir" value="${project::get-base-directory()}\build-support\tools"/>
 
   <!-- build SDK docs with NDoc -->

From 88326436e240ebde9efdab1c3ee9781aa65e5293 Mon Sep 17 00:00:00 2001
From: Steve Bohlen <sbohlen@gmail.com>
Date: Tue, 1 Nov 2011 11:46:58 -0400
Subject: [PATCH 07/14] rename erroneous folder tools/ReporterGenerator

---
 build-support/solutions.build.nant                  |   2 +-
 .../LICENSE.txt                                     |   0
 .../Readme.txt                                      |   0
 .../bin/ICSharpCode.NRefactory.dll                  | Bin
 .../bin/LICENSE.txt                                 |   0
 .../bin/Readme.txt                                  |   0
 .../bin/ReportGenerator.exe                         | Bin
 .../bin/log4net.dll                                 | Bin
 common-project.include                              |   2 +-
 9 files changed, 2 insertions(+), 2 deletions(-)
 rename build-support/tools/{ReporterGenerator => ReportGenerator}/LICENSE.txt (100%)
 rename build-support/tools/{ReporterGenerator => ReportGenerator}/Readme.txt (100%)
 rename build-support/tools/{ReporterGenerator => ReportGenerator}/bin/ICSharpCode.NRefactory.dll (100%)
 rename build-support/tools/{ReporterGenerator => ReportGenerator}/bin/LICENSE.txt (100%)
 rename build-support/tools/{ReporterGenerator => ReportGenerator}/bin/Readme.txt (100%)
 rename build-support/tools/{ReporterGenerator => ReportGenerator}/bin/ReportGenerator.exe (100%)
 rename build-support/tools/{ReporterGenerator => ReportGenerator}/bin/log4net.dll (100%)

diff --git a/build-support/solutions.build.nant b/build-support/solutions.build.nant
index 18a41d8f..1759449b 100644
--- a/build-support/solutions.build.nant
+++ b/build-support/solutions.build.nant
@@ -52,7 +52,7 @@ Rebuilding Solutions using Nant and "solutions.build":
       </in>
       <do>
         <delete dir="${dirname}" failonerror="false"/>
-        <sleep seconds="1"/>
+        <sleep seconds="2"/>
         <delete dir="${dirname}" />
       </do>
     </foreach>
diff --git a/build-support/tools/ReporterGenerator/LICENSE.txt b/build-support/tools/ReportGenerator/LICENSE.txt
similarity index 100%
rename from build-support/tools/ReporterGenerator/LICENSE.txt
rename to build-support/tools/ReportGenerator/LICENSE.txt
diff --git a/build-support/tools/ReporterGenerator/Readme.txt b/build-support/tools/ReportGenerator/Readme.txt
similarity index 100%
rename from build-support/tools/ReporterGenerator/Readme.txt
rename to build-support/tools/ReportGenerator/Readme.txt
diff --git a/build-support/tools/ReporterGenerator/bin/ICSharpCode.NRefactory.dll b/build-support/tools/ReportGenerator/bin/ICSharpCode.NRefactory.dll
similarity index 100%
rename from build-support/tools/ReporterGenerator/bin/ICSharpCode.NRefactory.dll
rename to build-support/tools/ReportGenerator/bin/ICSharpCode.NRefactory.dll
diff --git a/build-support/tools/ReporterGenerator/bin/LICENSE.txt b/build-support/tools/ReportGenerator/bin/LICENSE.txt
similarity index 100%
rename from build-support/tools/ReporterGenerator/bin/LICENSE.txt
rename to build-support/tools/ReportGenerator/bin/LICENSE.txt
diff --git a/build-support/tools/ReporterGenerator/bin/Readme.txt b/build-support/tools/ReportGenerator/bin/Readme.txt
similarity index 100%
rename from build-support/tools/ReporterGenerator/bin/Readme.txt
rename to build-support/tools/ReportGenerator/bin/Readme.txt
diff --git a/build-support/tools/ReporterGenerator/bin/ReportGenerator.exe b/build-support/tools/ReportGenerator/bin/ReportGenerator.exe
similarity index 100%
rename from build-support/tools/ReporterGenerator/bin/ReportGenerator.exe
rename to build-support/tools/ReportGenerator/bin/ReportGenerator.exe
diff --git a/build-support/tools/ReporterGenerator/bin/log4net.dll b/build-support/tools/ReportGenerator/bin/log4net.dll
similarity index 100%
rename from build-support/tools/ReporterGenerator/bin/log4net.dll
rename to build-support/tools/ReportGenerator/bin/log4net.dll
diff --git a/common-project.include b/common-project.include
index 1d722bfe..01b454ca 100644
--- a/common-project.include
+++ b/common-project.include
@@ -319,7 +319,7 @@ ${tool.dir}       : dir for tools
 			<arg value="-output:${test.bin.dir}/${test.assemblyname}.dll-TestCoverage.xml" />
 		</exec>
 		
-  		<exec program="${tool.dir}\ReporterGenerator\bin\ReportGenerator.exe" workingdir="${test.bin.dir}" verbose="true">
+  		<exec program="${tool.dir}\ReportGenerator\bin\ReportGenerator.exe" workingdir="${test.bin.dir}" verbose="true">
 			<arg value="${test.assemblyname}.dll-TestCoverage.xml" />
 			<arg path="${test.bin.dir}\CoverageReport\${test.assemblyname}" />
 		</exec>

From 6084b5d119eb35763ea78c672a3b7f319e2a7028 Mon Sep 17 00:00:00 2001
From: Steve Bohlen <sbohlen@gmail.com>
Date: Thu, 3 Nov 2011 19:02:44 -0400
Subject: [PATCH 08/14] SPRNET-1472 wire up opencover to run coverage on all
 tests aggregated together at once

---
 Spring.build           |  15 ++++--
 common-project.include | 103 ++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 112 insertions(+), 6 deletions(-)

diff --git a/Spring.build b/Spring.build
index 30dd8597..8243f7b7 100644
--- a/Spring.build
+++ b/Spring.build
@@ -148,6 +148,7 @@ Commandline Examples:
 
   <!-- Include spring helpers -->
   <include buildfile="${spring.basedir}/Spring.include"/>
+  <include buildfile="${spring.basedir}/common-project.include" />
 
   <property name="package.version" value="0.0.0" overwrite="false"/>
   <!-- change this to sync the sdk doc version generated -->
@@ -509,7 +510,7 @@ Commandline Examples:
 
     <!-- Main solutions and examples are compiled via task build-solutions -->
 
-    <!-- build coverage summary -->
+    <!-- build coverage summary 
 		<exec program="${tool.dir}/ncoverexplorer/ncoverexplorer.console.exe" workingdir="${current.bin.dir}" failonerror="false">
 			<arg value="/xml:&quot;${current.bin.dir}/TestCoverageSummary.xml&quot;" />
 			<arg value="/report:ModuleClassFunctionSummary" />
@@ -518,13 +519,14 @@ Commandline Examples:
 			<arg value="/q" />
 			<arg path="${current.bin.dir}/*-TestCoverage.xml" />
 		</exec>
+	-->
 
   </target>
 
   <target name="compile-net-2.0" description="Builds .NET Framework 2.0 version"
           depends="set-net-2.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir">
 	
-	<property name="test.withcoverage" value="true" overwrite="true"/>
+	<property name="test.withcoverage" value="false" overwrite="true"/>
 	
 	<if test="${property::exists('mstest.exe')}">
 		<property name="mstest.exe.current" value="${string::replace(property::get-value('mstest.exe'), 'Microsoft Visual Studio 10.0', 'Microsoft Visual Studio 9.0')}" />
@@ -540,7 +542,7 @@ Commandline Examples:
   <target name="compile-net-3.0" description="Builds .NET Framework 3.0 version"
           depends="set-net-3.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir">
 
-	<property name="test.withcoverage" value="true" overwrite="true"/>		  
+	<property name="test.withcoverage" value="false" overwrite="true"/>		  
 
  <call target="copykeys" if="${project.build.sign}"/>
     <call target="common.generate-assemblyinfo"/>
@@ -562,7 +564,7 @@ Commandline Examples:
   <target name="compile-net-3.5" description="Builds .NET Framework 3.5 version"
         depends="set-net-3.5-runtime-configuration, check-spring-basedir, clean-current-bin-dir">
 		
-	<property name="test.withcoverage" value="true" overwrite="true"/>		  
+	<property name="test.withcoverage" value="false" overwrite="true"/>		  
 		
 	<property name="lib.dir" value="${spring.basedir}/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
 	<property name="nh30.lib.dir" value="${spring.basedir}/lib/NHibernate30/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
@@ -597,7 +599,7 @@ Commandline Examples:
   <target name="compile-net-4.0" description="Builds .NET Framework 4.0 version"
         depends="set-net-4.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir">
 	
-	<property name="test.withcoverage" value="false" overwrite="true"/>
+	<property name="test.withcoverage" value="true" overwrite="true"/>
 	
 	<if test="${property::exists('mstest.exe')}">
 		<property name="mstest.exe.current" value="${string::replace(property::get-value('mstest.exe'), 'Microsoft Visual Studio 9.0', 'Microsoft Visual Studio 10.0')}" />
@@ -616,6 +618,9 @@ Commandline Examples:
     <property name="build-msmq-tests" value="true" overwrite="true" />
     <property name="build-velocity" value="true" overwrite="true" />
     <call target="compile-test" />
+	
+	<call target="common.run-tests.aggregated.opencover" />
+	
   </target>
   
   <target name="compile-mono-2.0" description="Builds MONO Framework 2.0 version"
diff --git a/common-project.include b/common-project.include
index 01b454ca..45ec587b 100644
--- a/common-project.include
+++ b/common-project.include
@@ -190,9 +190,11 @@ ${test.withcoverage}: flag indicating whether to invoke tests with test-coverage
 			<call target="common.run-tests.nunit" />
 		</if>
 
-		<if test="${test.withcoverage}" >
+		<!-- if coverage, don't run ANY tests at all b/c all tests will be invoked AFTER all compilation is completed...
+				<if test="${test.withcoverage}" >
 			<call target="common.run-tests.ncover" />
 		</if>
+		-->
 		
 	</target>
 
@@ -347,6 +349,105 @@ ${tool.dir}       : dir for tools
         </exec>
 
     </target>
+	
+	
+	
+<!-- NOTE: Depends on XmlInsertNode custom task to function properly -->
+<target name="common.run-tests.aggregated.opencover" description="Run all NUnit Tests together with OpenCover coverage">
+
+	<property name="test.bin.dir" value="${current.bin.dir}" if="${not property::exists('test.bin.dir')}" />
+
+	<property name="spring.tests.nunit.filename" value="${test.bin.dir}/Spring.Tests.nunit" />
+
+	<!-- write the empty NUNIT project file contents to disk -->
+	<echo file="${spring.tests.nunit.filename}">
+	&lt;NUnitProject&gt;
+	  &lt;Settings activeconfig="Default" /&gt;
+	  &lt;Config name="Default" binpathtype="Auto"&gt;
+	  &lt;/Config&gt;
+	&lt;/NUnitProject&gt;
+	</echo>
+
+<!-- append the node for each test assembly to the NUNIT project file -->
+	<foreach item="File" property="filename">
+		<in>
+			<items basedir="${test.bin.dir}">
+				<include name="*.Tests.dll" />
+			</items>
+		</in>
+		<do>
+		<echo message="Adding file to NUNIT project file ${spring.tests.nunit.filename}: ${filename}" />  
+		<xmlinsertnode filename="${spring.tests.nunit.filename}" xpath="//NUnitProject/Config" fragment="&lt;assembly path=&quot;${filename}&quot; /&gt;" />
+		</do>
+	</foreach>
+		
+<!-- invoke OpenCover passing the NUNIT project file to the NUNIT test runner -->
+	<exec program="${tool.dir}/opencover/OpenCover.Console.exe" workingdir="${test.bin.dir}" verbose="true">
+		<arg value="-register:user" />
+		<arg value="-mergebyhash" />
+		<arg value="-target:${tool.dir}/nunit/net-2.0/nunit-console-x86.exe" />
+		<arg value="-targetargs:${spring.tests.nunit.filename} /xml:Spring.Tests-TestResults.xml /noshadow /nologo /framework:${nant.settings.currentframework}" />
+		<arg value="-filter:&quot;+[Spring*]* -[*Tests*]*&quot;" />
+		<arg value="-output:${test.bin.dir}/Spring.Tests-TestCoverage.xml" />
+	</exec>
+
+<!-- invoke the report generator to convert the aggregated test coverage results into a single HTML report -->
+	<exec program="${tool.dir}\ReportGenerator\bin\ReportGenerator.exe" workingdir="${test.bin.dir}" verbose="true">
+		<arg value="${test.bin.dir}/Spring.Tests-TestCoverage.xml" />
+		<arg path="${test.bin.dir}/CoverageReport" />
+	</exec>
+
+</target>
+
+<!-- script that appends new XML nodes to an existing xml file -->
+<script language="C#" prefix="test" >
+        <references>
+            <include name="System.Xml.dll" />
+        </references>
+        <code>
+            <![CDATA[
+              [TaskName("xmlinsertnode")]
+              public class TestTask : Task {
+                #region Private Instance Fields
+                private string _filename;
+                private string _xpath;
+                private string _fragment;
+                #endregion Private Instance Fields
+
+                #region Public Instance Properties
+                [TaskAttribute("filename", Required=true)]
+                public string FileName {
+                    get { return _filename; }
+                    set { _filename = value; }
+                }
+
+                [TaskAttribute("xpath", Required=true)]
+                public string XPath {
+                    get { return _xpath; }
+                    set { _xpath = value; }
+                }
+
+                [TaskAttribute("fragment", Required=true)]
+                public string Fragment {
+                    get { return _fragment; }
+                    set { _fragment = value; }
+                }
+
+                #endregion Public Instance Properties
+
+                #region Override implementation of Task
+                protected override void ExecuteTask() {
+                    System.Xml.XmlDocument document = new System.Xml.XmlDocument();
+                    document.Load(_filename);
+                    System.Xml.XPath.XPathNavigator navigator = document.CreateNavigator();
+                    navigator.SelectSingleNode(_xpath).AppendChild(_fragment);
+                    document.Save(_filename);
+                }
+                #endregion Override implementation of Task
+              }
+            ]]>
+        </code>
+</script>
 
 	<readregistry property="net35.install.dir" key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.5\InstallPath" hive="LocalMachine" failonerror="true"/>
   <property name="msbuild.exe" value="${net35.install.dir}\msbuild.exe"/>

From 6f4ffb9ade4436b4f42b53ad37c09190df80a79a Mon Sep 17 00:00:00 2001
From: Steve Bohlen <sbohlen@gmail.com>
Date: Fri, 4 Nov 2011 08:43:49 -0400
Subject: [PATCH 09/14] SPRNET-1472 fixing quotes missing from targetargs
 passed to opencover command-line

---
 common-project.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common-project.include b/common-project.include
index 45ec587b..64a21ca4 100644
--- a/common-project.include
+++ b/common-project.include
@@ -386,7 +386,7 @@ ${tool.dir}       : dir for tools
 		<arg value="-register:user" />
 		<arg value="-mergebyhash" />
 		<arg value="-target:${tool.dir}/nunit/net-2.0/nunit-console-x86.exe" />
-		<arg value="-targetargs:${spring.tests.nunit.filename} /xml:Spring.Tests-TestResults.xml /noshadow /nologo /framework:${nant.settings.currentframework}" />
+		<arg value="-targetargs:&quot;${spring.tests.nunit.filename} /xml:Spring.Tests-TestResults.xml /noshadow /nologo /framework:${nant.settings.currentframework}&quot;" />
 		<arg value="-filter:&quot;+[Spring*]* -[*Tests*]*&quot;" />
 		<arg value="-output:${test.bin.dir}/Spring.Tests-TestCoverage.xml" />
 	</exec>

From ca962bb6459fa308af798676ddbffbccd1a5701e Mon Sep 17 00:00:00 2001
From: Steve Bohlen <sbohlen@gmail.com>
Date: Fri, 4 Nov 2011 11:40:05 -0400
Subject: [PATCH 10/14] SPRNET-1472 passing list of all individual test
 assemblies instead of nunit project file

---
 common-project.include | 79 ++++++------------------------------------
 1 file changed, 11 insertions(+), 68 deletions(-)

diff --git a/common-project.include b/common-project.include
index 64a21ca4..15f33f4f 100644
--- a/common-project.include
+++ b/common-project.include
@@ -352,23 +352,13 @@ ${tool.dir}       : dir for tools
 	
 	
 	
-<!-- NOTE: Depends on XmlInsertNode custom task to function properly -->
 <target name="common.run-tests.aggregated.opencover" description="Run all NUnit Tests together with OpenCover coverage">
 
 	<property name="test.bin.dir" value="${current.bin.dir}" if="${not property::exists('test.bin.dir')}" />
 
-	<property name="spring.tests.nunit.filename" value="${test.bin.dir}/Spring.Tests.nunit" />
-
-	<!-- write the empty NUNIT project file contents to disk -->
-	<echo file="${spring.tests.nunit.filename}">
-	&lt;NUnitProject&gt;
-	  &lt;Settings activeconfig="Default" /&gt;
-	  &lt;Config name="Default" binpathtype="Auto"&gt;
-	  &lt;/Config&gt;
-	&lt;/NUnitProject&gt;
-	</echo>
-
-<!-- append the node for each test assembly to the NUNIT project file -->
+	<property name="spring.test.assemblies" value="" />
+	
+<!-- append the path for each test assembly to the running list of assemblies -->
 	<foreach item="File" property="filename">
 		<in>
 			<items basedir="${test.bin.dir}">
@@ -376,17 +366,19 @@ ${tool.dir}       : dir for tools
 			</items>
 		</in>
 		<do>
-		<echo message="Adding file to NUNIT project file ${spring.tests.nunit.filename}: ${filename}" />  
-		<xmlinsertnode filename="${spring.tests.nunit.filename}" xpath="//NUnitProject/Config" fragment="&lt;assembly path=&quot;${filename}&quot; /&gt;" />
+		<echo message="Adding file to NUNIT assemblies: ${filename}" />  
+		<property name="spring.test.assemblies" value="${spring.test.assemblies} ${filename}" />
 		</do>
 	</foreach>
-		
-<!-- invoke OpenCover passing the NUNIT project file to the NUNIT test runner -->
+
+    <echo message="Unit Testing assemblies in ${test.bin.dir}" />
+
+<!-- invoke OpenCover passing the NUNIT assemblies list to the NUNIT test runner -->
 	<exec program="${tool.dir}/opencover/OpenCover.Console.exe" workingdir="${test.bin.dir}" verbose="true">
 		<arg value="-register:user" />
 		<arg value="-mergebyhash" />
 		<arg value="-target:${tool.dir}/nunit/net-2.0/nunit-console-x86.exe" />
-		<arg value="-targetargs:&quot;${spring.tests.nunit.filename} /xml:Spring.Tests-TestResults.xml /noshadow /nologo /framework:${nant.settings.currentframework}&quot;" />
+		<arg value="-targetargs:&quot;${spring.test.assemblies} /xml:Spring.Tests-TestResults.xml /noshadow /nologo /framework:${nant.settings.currentframework}&quot;" />
 		<arg value="-filter:&quot;+[Spring*]* -[*Tests*]*&quot;" />
 		<arg value="-output:${test.bin.dir}/Spring.Tests-TestCoverage.xml" />
 	</exec>
@@ -399,58 +391,9 @@ ${tool.dir}       : dir for tools
 
 </target>
 
-<!-- script that appends new XML nodes to an existing xml file -->
-<script language="C#" prefix="test" >
-        <references>
-            <include name="System.Xml.dll" />
-        </references>
-        <code>
-            <![CDATA[
-              [TaskName("xmlinsertnode")]
-              public class TestTask : Task {
-                #region Private Instance Fields
-                private string _filename;
-                private string _xpath;
-                private string _fragment;
-                #endregion Private Instance Fields
-
-                #region Public Instance Properties
-                [TaskAttribute("filename", Required=true)]
-                public string FileName {
-                    get { return _filename; }
-                    set { _filename = value; }
-                }
-
-                [TaskAttribute("xpath", Required=true)]
-                public string XPath {
-                    get { return _xpath; }
-                    set { _xpath = value; }
-                }
-
-                [TaskAttribute("fragment", Required=true)]
-                public string Fragment {
-                    get { return _fragment; }
-                    set { _fragment = value; }
-                }
-
-                #endregion Public Instance Properties
-
-                #region Override implementation of Task
-                protected override void ExecuteTask() {
-                    System.Xml.XmlDocument document = new System.Xml.XmlDocument();
-                    document.Load(_filename);
-                    System.Xml.XPath.XPathNavigator navigator = document.CreateNavigator();
-                    navigator.SelectSingleNode(_xpath).AppendChild(_fragment);
-                    document.Save(_filename);
-                }
-                #endregion Override implementation of Task
-              }
-            ]]>
-        </code>
-</script>
 
 	<readregistry property="net35.install.dir" key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.5\InstallPath" hive="LocalMachine" failonerror="true"/>
-  <property name="msbuild.exe" value="${net35.install.dir}\msbuild.exe"/>
+	<property name="msbuild.exe" value="${net35.install.dir}\msbuild.exe"/>
 	
 	
 </project>

From 87aa1288294dee8e44c392f6f48e28edd3cea600 Mon Sep 17 00:00:00 2001
From: Steve Bohlen <sbohlen@gmail.com>
Date: Fri, 4 Nov 2011 14:32:02 -0400
Subject: [PATCH 11/14] Revert "SPRNET-1472 passing list of all individual test
 assemblies instead of nunit project file"

This reverts commit ca962bb6459fa308af798676ddbffbccd1a5701e.
---
 common-project.include | 79 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 68 insertions(+), 11 deletions(-)

diff --git a/common-project.include b/common-project.include
index 15f33f4f..64a21ca4 100644
--- a/common-project.include
+++ b/common-project.include
@@ -352,13 +352,23 @@ ${tool.dir}       : dir for tools
 	
 	
 	
+<!-- NOTE: Depends on XmlInsertNode custom task to function properly -->
 <target name="common.run-tests.aggregated.opencover" description="Run all NUnit Tests together with OpenCover coverage">
 
 	<property name="test.bin.dir" value="${current.bin.dir}" if="${not property::exists('test.bin.dir')}" />
 
-	<property name="spring.test.assemblies" value="" />
-	
-<!-- append the path for each test assembly to the running list of assemblies -->
+	<property name="spring.tests.nunit.filename" value="${test.bin.dir}/Spring.Tests.nunit" />
+
+	<!-- write the empty NUNIT project file contents to disk -->
+	<echo file="${spring.tests.nunit.filename}">
+	&lt;NUnitProject&gt;
+	  &lt;Settings activeconfig="Default" /&gt;
+	  &lt;Config name="Default" binpathtype="Auto"&gt;
+	  &lt;/Config&gt;
+	&lt;/NUnitProject&gt;
+	</echo>
+
+<!-- append the node for each test assembly to the NUNIT project file -->
 	<foreach item="File" property="filename">
 		<in>
 			<items basedir="${test.bin.dir}">
@@ -366,19 +376,17 @@ ${tool.dir}       : dir for tools
 			</items>
 		</in>
 		<do>
-		<echo message="Adding file to NUNIT assemblies: ${filename}" />  
-		<property name="spring.test.assemblies" value="${spring.test.assemblies} ${filename}" />
+		<echo message="Adding file to NUNIT project file ${spring.tests.nunit.filename}: ${filename}" />  
+		<xmlinsertnode filename="${spring.tests.nunit.filename}" xpath="//NUnitProject/Config" fragment="&lt;assembly path=&quot;${filename}&quot; /&gt;" />
 		</do>
 	</foreach>
-
-    <echo message="Unit Testing assemblies in ${test.bin.dir}" />
-
-<!-- invoke OpenCover passing the NUNIT assemblies list to the NUNIT test runner -->
+		
+<!-- invoke OpenCover passing the NUNIT project file to the NUNIT test runner -->
 	<exec program="${tool.dir}/opencover/OpenCover.Console.exe" workingdir="${test.bin.dir}" verbose="true">
 		<arg value="-register:user" />
 		<arg value="-mergebyhash" />
 		<arg value="-target:${tool.dir}/nunit/net-2.0/nunit-console-x86.exe" />
-		<arg value="-targetargs:&quot;${spring.test.assemblies} /xml:Spring.Tests-TestResults.xml /noshadow /nologo /framework:${nant.settings.currentframework}&quot;" />
+		<arg value="-targetargs:&quot;${spring.tests.nunit.filename} /xml:Spring.Tests-TestResults.xml /noshadow /nologo /framework:${nant.settings.currentframework}&quot;" />
 		<arg value="-filter:&quot;+[Spring*]* -[*Tests*]*&quot;" />
 		<arg value="-output:${test.bin.dir}/Spring.Tests-TestCoverage.xml" />
 	</exec>
@@ -391,9 +399,58 @@ ${tool.dir}       : dir for tools
 
 </target>
 
+<!-- script that appends new XML nodes to an existing xml file -->
+<script language="C#" prefix="test" >
+        <references>
+            <include name="System.Xml.dll" />
+        </references>
+        <code>
+            <![CDATA[
+              [TaskName("xmlinsertnode")]
+              public class TestTask : Task {
+                #region Private Instance Fields
+                private string _filename;
+                private string _xpath;
+                private string _fragment;
+                #endregion Private Instance Fields
+
+                #region Public Instance Properties
+                [TaskAttribute("filename", Required=true)]
+                public string FileName {
+                    get { return _filename; }
+                    set { _filename = value; }
+                }
+
+                [TaskAttribute("xpath", Required=true)]
+                public string XPath {
+                    get { return _xpath; }
+                    set { _xpath = value; }
+                }
+
+                [TaskAttribute("fragment", Required=true)]
+                public string Fragment {
+                    get { return _fragment; }
+                    set { _fragment = value; }
+                }
+
+                #endregion Public Instance Properties
+
+                #region Override implementation of Task
+                protected override void ExecuteTask() {
+                    System.Xml.XmlDocument document = new System.Xml.XmlDocument();
+                    document.Load(_filename);
+                    System.Xml.XPath.XPathNavigator navigator = document.CreateNavigator();
+                    navigator.SelectSingleNode(_xpath).AppendChild(_fragment);
+                    document.Save(_filename);
+                }
+                #endregion Override implementation of Task
+              }
+            ]]>
+        </code>
+</script>
 
 	<readregistry property="net35.install.dir" key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.5\InstallPath" hive="LocalMachine" failonerror="true"/>
-	<property name="msbuild.exe" value="${net35.install.dir}\msbuild.exe"/>
+  <property name="msbuild.exe" value="${net35.install.dir}\msbuild.exe"/>
 	
 	
 </project>

From 1d2c891b902c3a26633993146237545b8661de77 Mon Sep 17 00:00:00 2001
From: Steve Bohlen <sbohlen@gmail.com>
Date: Fri, 4 Nov 2011 14:32:24 -0400
Subject: [PATCH 12/14] Revert "SPRNET-1472 fixing quotes missing from
 targetargs passed to opencover command-line"

This reverts commit 6f4ffb9ade4436b4f42b53ad37c09190df80a79a.
---
 common-project.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common-project.include b/common-project.include
index 64a21ca4..45ec587b 100644
--- a/common-project.include
+++ b/common-project.include
@@ -386,7 +386,7 @@ ${tool.dir}       : dir for tools
 		<arg value="-register:user" />
 		<arg value="-mergebyhash" />
 		<arg value="-target:${tool.dir}/nunit/net-2.0/nunit-console-x86.exe" />
-		<arg value="-targetargs:&quot;${spring.tests.nunit.filename} /xml:Spring.Tests-TestResults.xml /noshadow /nologo /framework:${nant.settings.currentframework}&quot;" />
+		<arg value="-targetargs:${spring.tests.nunit.filename} /xml:Spring.Tests-TestResults.xml /noshadow /nologo /framework:${nant.settings.currentframework}" />
 		<arg value="-filter:&quot;+[Spring*]* -[*Tests*]*&quot;" />
 		<arg value="-output:${test.bin.dir}/Spring.Tests-TestCoverage.xml" />
 	</exec>

From aecb61fa548e1ec41eddcc91d006aea5c643b971 Mon Sep 17 00:00:00 2001
From: Steve Bohlen <sbohlen@gmail.com>
Date: Fri, 4 Nov 2011 14:32:31 -0400
Subject: [PATCH 13/14] Revert "SPRNET-1472 wire up opencover to run coverage
 on all tests aggregated together at once"

This reverts commit 6084b5d119eb35763ea78c672a3b7f319e2a7028.
---
 Spring.build           |  15 ++----
 common-project.include | 103 +----------------------------------------
 2 files changed, 6 insertions(+), 112 deletions(-)

diff --git a/Spring.build b/Spring.build
index 8243f7b7..30dd8597 100644
--- a/Spring.build
+++ b/Spring.build
@@ -148,7 +148,6 @@ Commandline Examples:
 
   <!-- Include spring helpers -->
   <include buildfile="${spring.basedir}/Spring.include"/>
-  <include buildfile="${spring.basedir}/common-project.include" />
 
   <property name="package.version" value="0.0.0" overwrite="false"/>
   <!-- change this to sync the sdk doc version generated -->
@@ -510,7 +509,7 @@ Commandline Examples:
 
     <!-- Main solutions and examples are compiled via task build-solutions -->
 
-    <!-- build coverage summary 
+    <!-- build coverage summary -->
 		<exec program="${tool.dir}/ncoverexplorer/ncoverexplorer.console.exe" workingdir="${current.bin.dir}" failonerror="false">
 			<arg value="/xml:&quot;${current.bin.dir}/TestCoverageSummary.xml&quot;" />
 			<arg value="/report:ModuleClassFunctionSummary" />
@@ -519,14 +518,13 @@ Commandline Examples:
 			<arg value="/q" />
 			<arg path="${current.bin.dir}/*-TestCoverage.xml" />
 		</exec>
-	-->
 
   </target>
 
   <target name="compile-net-2.0" description="Builds .NET Framework 2.0 version"
           depends="set-net-2.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir">
 	
-	<property name="test.withcoverage" value="false" overwrite="true"/>
+	<property name="test.withcoverage" value="true" overwrite="true"/>
 	
 	<if test="${property::exists('mstest.exe')}">
 		<property name="mstest.exe.current" value="${string::replace(property::get-value('mstest.exe'), 'Microsoft Visual Studio 10.0', 'Microsoft Visual Studio 9.0')}" />
@@ -542,7 +540,7 @@ Commandline Examples:
   <target name="compile-net-3.0" description="Builds .NET Framework 3.0 version"
           depends="set-net-3.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir">
 
-	<property name="test.withcoverage" value="false" overwrite="true"/>		  
+	<property name="test.withcoverage" value="true" overwrite="true"/>		  
 
  <call target="copykeys" if="${project.build.sign}"/>
     <call target="common.generate-assemblyinfo"/>
@@ -564,7 +562,7 @@ Commandline Examples:
   <target name="compile-net-3.5" description="Builds .NET Framework 3.5 version"
         depends="set-net-3.5-runtime-configuration, check-spring-basedir, clean-current-bin-dir">
 		
-	<property name="test.withcoverage" value="false" overwrite="true"/>		  
+	<property name="test.withcoverage" value="true" overwrite="true"/>		  
 		
 	<property name="lib.dir" value="${spring.basedir}/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
 	<property name="nh30.lib.dir" value="${spring.basedir}/lib/NHibernate30/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
@@ -599,7 +597,7 @@ Commandline Examples:
   <target name="compile-net-4.0" description="Builds .NET Framework 4.0 version"
         depends="set-net-4.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir">
 	
-	<property name="test.withcoverage" value="true" overwrite="true"/>
+	<property name="test.withcoverage" value="false" overwrite="true"/>
 	
 	<if test="${property::exists('mstest.exe')}">
 		<property name="mstest.exe.current" value="${string::replace(property::get-value('mstest.exe'), 'Microsoft Visual Studio 9.0', 'Microsoft Visual Studio 10.0')}" />
@@ -618,9 +616,6 @@ Commandline Examples:
     <property name="build-msmq-tests" value="true" overwrite="true" />
     <property name="build-velocity" value="true" overwrite="true" />
     <call target="compile-test" />
-	
-	<call target="common.run-tests.aggregated.opencover" />
-	
   </target>
   
   <target name="compile-mono-2.0" description="Builds MONO Framework 2.0 version"
diff --git a/common-project.include b/common-project.include
index 45ec587b..01b454ca 100644
--- a/common-project.include
+++ b/common-project.include
@@ -190,11 +190,9 @@ ${test.withcoverage}: flag indicating whether to invoke tests with test-coverage
 			<call target="common.run-tests.nunit" />
 		</if>
 
-		<!-- if coverage, don't run ANY tests at all b/c all tests will be invoked AFTER all compilation is completed...
-				<if test="${test.withcoverage}" >
+		<if test="${test.withcoverage}" >
 			<call target="common.run-tests.ncover" />
 		</if>
-		-->
 		
 	</target>
 
@@ -349,105 +347,6 @@ ${tool.dir}       : dir for tools
         </exec>
 
     </target>
-	
-	
-	
-<!-- NOTE: Depends on XmlInsertNode custom task to function properly -->
-<target name="common.run-tests.aggregated.opencover" description="Run all NUnit Tests together with OpenCover coverage">
-
-	<property name="test.bin.dir" value="${current.bin.dir}" if="${not property::exists('test.bin.dir')}" />
-
-	<property name="spring.tests.nunit.filename" value="${test.bin.dir}/Spring.Tests.nunit" />
-
-	<!-- write the empty NUNIT project file contents to disk -->
-	<echo file="${spring.tests.nunit.filename}">
-	&lt;NUnitProject&gt;
-	  &lt;Settings activeconfig="Default" /&gt;
-	  &lt;Config name="Default" binpathtype="Auto"&gt;
-	  &lt;/Config&gt;
-	&lt;/NUnitProject&gt;
-	</echo>
-
-<!-- append the node for each test assembly to the NUNIT project file -->
-	<foreach item="File" property="filename">
-		<in>
-			<items basedir="${test.bin.dir}">
-				<include name="*.Tests.dll" />
-			</items>
-		</in>
-		<do>
-		<echo message="Adding file to NUNIT project file ${spring.tests.nunit.filename}: ${filename}" />  
-		<xmlinsertnode filename="${spring.tests.nunit.filename}" xpath="//NUnitProject/Config" fragment="&lt;assembly path=&quot;${filename}&quot; /&gt;" />
-		</do>
-	</foreach>
-		
-<!-- invoke OpenCover passing the NUNIT project file to the NUNIT test runner -->
-	<exec program="${tool.dir}/opencover/OpenCover.Console.exe" workingdir="${test.bin.dir}" verbose="true">
-		<arg value="-register:user" />
-		<arg value="-mergebyhash" />
-		<arg value="-target:${tool.dir}/nunit/net-2.0/nunit-console-x86.exe" />
-		<arg value="-targetargs:${spring.tests.nunit.filename} /xml:Spring.Tests-TestResults.xml /noshadow /nologo /framework:${nant.settings.currentframework}" />
-		<arg value="-filter:&quot;+[Spring*]* -[*Tests*]*&quot;" />
-		<arg value="-output:${test.bin.dir}/Spring.Tests-TestCoverage.xml" />
-	</exec>
-
-<!-- invoke the report generator to convert the aggregated test coverage results into a single HTML report -->
-	<exec program="${tool.dir}\ReportGenerator\bin\ReportGenerator.exe" workingdir="${test.bin.dir}" verbose="true">
-		<arg value="${test.bin.dir}/Spring.Tests-TestCoverage.xml" />
-		<arg path="${test.bin.dir}/CoverageReport" />
-	</exec>
-
-</target>
-
-<!-- script that appends new XML nodes to an existing xml file -->
-<script language="C#" prefix="test" >
-        <references>
-            <include name="System.Xml.dll" />
-        </references>
-        <code>
-            <![CDATA[
-              [TaskName("xmlinsertnode")]
-              public class TestTask : Task {
-                #region Private Instance Fields
-                private string _filename;
-                private string _xpath;
-                private string _fragment;
-                #endregion Private Instance Fields
-
-                #region Public Instance Properties
-                [TaskAttribute("filename", Required=true)]
-                public string FileName {
-                    get { return _filename; }
-                    set { _filename = value; }
-                }
-
-                [TaskAttribute("xpath", Required=true)]
-                public string XPath {
-                    get { return _xpath; }
-                    set { _xpath = value; }
-                }
-
-                [TaskAttribute("fragment", Required=true)]
-                public string Fragment {
-                    get { return _fragment; }
-                    set { _fragment = value; }
-                }
-
-                #endregion Public Instance Properties
-
-                #region Override implementation of Task
-                protected override void ExecuteTask() {
-                    System.Xml.XmlDocument document = new System.Xml.XmlDocument();
-                    document.Load(_filename);
-                    System.Xml.XPath.XPathNavigator navigator = document.CreateNavigator();
-                    navigator.SelectSingleNode(_xpath).AppendChild(_fragment);
-                    document.Save(_filename);
-                }
-                #endregion Override implementation of Task
-              }
-            ]]>
-        </code>
-</script>
 
 	<readregistry property="net35.install.dir" key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.5\InstallPath" hive="LocalMachine" failonerror="true"/>
   <property name="msbuild.exe" value="${net35.install.dir}\msbuild.exe"/>

From 43516e6dbefc7049b26f35ec04b2c9a0bd65c051 Mon Sep 17 00:00:00 2001
From: Steve Bohlen <sbohlen@gmail.com>
Date: Tue, 15 Nov 2011 11:11:09 -0500
Subject: [PATCH 14/14] merge mods to pull 6 for SPRNET-1470, SPRNET-1471

---
 .../TypeConversion/TypeConversionUtils.cs     |  59 ++++++--
 .../Xml/collectionConversionGeneric.xml       |  33 +++++
 .../Xml/CollectionConversionGenericTests.cs   | 131 ++++++++++++++++++
 .../Spring.Core.Tests/Objects/TestObject.cs   |  21 +++
 .../Spring.Core.Tests.2008.csproj             |   2 +
 .../Spring.Core.Tests.2010.csproj             |   2 +
 6 files changed, 240 insertions(+), 8 deletions(-)
 create mode 100644 test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collectionConversionGeneric.xml
 create mode 100644 test/Spring/Spring.Core.Tests/Objects/Factory/Xml/CollectionConversionGenericTests.cs

diff --git a/src/Spring/Spring.Core/Core/TypeConversion/TypeConversionUtils.cs b/src/Spring/Spring.Core/Core/TypeConversion/TypeConversionUtils.cs
index fd38c7a8..bac5e3cc 100644
--- a/src/Spring/Spring.Core/Core/TypeConversion/TypeConversionUtils.cs
+++ b/src/Spring/Spring.Core/Core/TypeConversion/TypeConversionUtils.cs
@@ -28,6 +28,7 @@ using System.Collections.Generic;
 
 using System.ComponentModel;
 using Spring.Util;
+using System.Reflection;
 
 #endregion
 
@@ -116,6 +117,45 @@ namespace Spring.Core.TypeConversion
                         return ToTypedCollectionWithTypeConversion(typeof(List<>), componentType, elements, propertyName);
                     }
                 }
+
+                // if required type is some IDictionary<K,V>, convert all the elements
+                if (requiredType != null && requiredType.IsGenericType && TypeImplementsGenericInterface(requiredType, typeof(IDictionary<,>)))
+                {
+                    Type[] typeParameters = requiredType.GetGenericArguments();
+                    Type keyType = typeParameters[0];
+                    Type valueType = typeParameters[1];
+                    if (newValue is IDictionary)
+                    {
+                        IDictionary elements = (IDictionary)newValue;
+                        Type targetCollectionType = typeof(Dictionary<,>);
+                        Type collectionType = targetCollectionType.MakeGenericType(new Type[] { keyType, valueType });
+                        object typedCollection = Activator.CreateInstance(collectionType);
+
+                        MethodInfo addMethod = collectionType.GetMethod("Add", new Type[] { keyType, valueType });
+                        int i = 0;
+                        foreach (DictionaryEntry entry in elements)
+                        {
+                            string propertyExpr = BuildIndexedPropertyName(propertyName, i);
+                            object key = ConvertValueIfNecessary(keyType, entry.Key, propertyExpr + ".Key");
+                            object value = ConvertValueIfNecessary(valueType, entry.Value, propertyExpr + ".Value");
+                            addMethod.Invoke(typedCollection, new object[] { key, value });
+                            i++;
+                        }
+                        return typedCollection;
+                    }
+                }
+
+                // if required type is some IEnumerable<T>, convert all the elements
+                if (requiredType != null && requiredType.IsGenericType && TypeImplementsGenericInterface(requiredType, typeof(IEnumerable<>)))
+                {
+                    // convert individual elements to array elements
+                    Type componentType = requiredType.GetGenericArguments()[0];
+                    if (newValue is ICollection)
+                    {
+                        ICollection elements = (ICollection)newValue;
+                        return ToTypedCollectionWithTypeConversion(typeof(List<>), componentType, elements, propertyName);
+                    }
+                }
 #endif
 
                 // try to convert using type converter
@@ -289,18 +329,16 @@ namespace Spring.Core.TypeConversion
                 throw new ArgumentException("matchingInterface Type must be an Interface Type", "matchingInterface");
             }
 
-            bool match = false;
+            if (candidateType.IsInterface && IsMatchingGenericInterface(candidateType, matchingInterface))
+            {
+                return true;
+            }
 
+            bool match = false;
             Type[] implementedInterfaces = candidateType.GetInterfaces();
             foreach (Type interfaceType in implementedInterfaces)
             {
-                if (false == interfaceType.IsGenericType)
-                {
-                    continue;
-                }
-
-                Type genericType = interfaceType.GetGenericTypeDefinition();
-                if (genericType == matchingInterface)
+                if (IsMatchingGenericInterface(interfaceType, matchingInterface))
                 {
                     match = true;
                     break;
@@ -309,6 +347,11 @@ namespace Spring.Core.TypeConversion
 
             return match;
         }
+
+        private static bool IsMatchingGenericInterface(Type candidateInterfaceType, Type matchingGenericInterface)
+        {
+            return candidateInterfaceType.IsGenericType && candidateInterfaceType.GetGenericTypeDefinition() == matchingGenericInterface;
+        }
 #endif
     }
 }
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collectionConversionGeneric.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collectionConversionGeneric.xml
new file mode 100644
index 00000000..02fd9c04
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collectionConversionGeneric.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<objects xmlns="http://www.springframework.net">
+
+  <object id="HasGenericIListProperty" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="SomeGenericIListInt32">
+      <list>
+        <value>123</value>
+        <value>234</value>
+        <value>345</value>
+      </list>
+    </property>
+  </object>
+
+  <object id="HasGenericIDictionaryProperty" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="SomeGenericIDictionaryStringInt32">
+      <dictionary>
+        <entry key="aaa" value="111"/>
+        <entry key="bbb" value="222"/>
+        <entry key="ccc" value="333"/>
+      </dictionary>
+    </property>
+  </object>
+
+  <object id="HasGenericIEnumerableProperty" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="SomeGenericIEnumerableInt32">
+      <list>
+        <value>123</value>
+      </list>
+    </property>
+  </object>
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/CollectionConversionGenericTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/CollectionConversionGenericTests.cs
new file mode 100644
index 00000000..503e81ca
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/CollectionConversionGenericTests.cs
@@ -0,0 +1,131 @@
+#region License
+
+/*
+ * Copyright © 2002-2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#endregion
+
+#region Imports
+
+using NUnit.Framework;
+using Spring.Objects.Factory.Support;
+using System.Collections;
+using Spring.Core.TypeConversion;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{
+    /// <summary>
+    /// Unit and integration tests for collection conversion support
+    /// </summary>
+    /// <author>Choy Rim</author>
+    [TestFixture]
+    [Description("SPRNET-1470 Setting property of type IList<T> using <list/> without the @element-type specified fails.")]
+    public class CollectionConversionGenericTests
+    {
+        private DefaultListableObjectFactory objectFactory;
+
+        [SetUp]
+        public void SetUp()
+        {
+            this.objectFactory = new DefaultListableObjectFactory();
+            IObjectDefinitionReader reader = new XmlObjectDefinitionReader(this.objectFactory);
+            reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("collectionConversionGeneric.xml", GetType()));
+        }
+
+        [Test]
+        public void ShouldConvertListToGenericIList()
+        {
+            TestObject to = (TestObject)this.objectFactory.GetObject("HasGenericIListProperty");
+            IList<int> list = to.SomeGenericIListInt32;
+            Assert.That(list.Count, Is.EqualTo(3));
+            Assert.That(list[0], Is.EqualTo(123));
+            Assert.That(list[1], Is.EqualTo(234));
+            Assert.That(list[2], Is.EqualTo(345));
+        }
+
+        [Test]
+        public void ShouldConvertDictionaryToGenericIDictionary()
+        {
+            TestObject to = (TestObject)this.objectFactory.GetObject("HasGenericIDictionaryProperty");
+            IDictionary<string, int> dict = to.SomeGenericIDictionaryStringInt32;
+            Assert.That(dict.Count, Is.EqualTo(3));
+            Assert.That(dict["aaa"], Is.EqualTo(111));
+            Assert.That(dict["bbb"], Is.EqualTo(222));
+            Assert.That(dict["ccc"], Is.EqualTo(333));
+        }
+
+        [Test]
+        public void ShouldConvertListToGenericIEnumerable()
+        {
+            TestObject to = (TestObject)this.objectFactory.GetObject("HasGenericIEnumerableProperty");
+            IEnumerable<int> enumerable = to.SomeGenericIEnumerableInt32;
+            int enumerableLength = 0;
+            int first = 0;
+
+            foreach (int i in enumerable)
+            {
+                enumerableLength += 1;
+                if (enumerableLength == 1)
+                {
+                    first = i;
+                }
+            }
+
+            Assert.That(enumerableLength, Is.EqualTo(1));
+            Assert.That(first, Is.EqualTo(123));
+        }
+
+        [Test]
+        public void ConvertArrayListToGenericIList()
+        {
+            ArrayList xs = new ArrayList();
+            xs.Add("Mark Pollack");
+            object ys = TypeConversionUtils.ConvertValueIfNecessary(typeof(IList<string>), xs, "ignored");
+            Assert.That(ys as IList<string>, Is.Not.Null);
+            IList<string> zs = (IList<string>)ys;
+            Assert.That(zs[0], Is.EqualTo("Mark Pollack"));
+        }
+
+        [Test]
+        public void ConvertHybridDictionaryToGenericIDictionary()
+        {
+            HybridDictionary xs = new HybridDictionary();
+            xs.Add("first", 1);
+            object ys = TypeConversionUtils.ConvertValueIfNecessary(typeof(IDictionary<string, int>), xs, "ignored");
+            Assert.That(ys as IDictionary<string, int>, Is.Not.Null);
+            IDictionary<string, int> zs = (IDictionary<string, int>)ys;
+            Assert.That(zs["first"], Is.EqualTo(1));
+        }
+
+        [Test]
+        public void ConvertArrayListToGenericIEnumerable()
+        {
+            ArrayList xs = new ArrayList();
+            xs.Add("Mark Pollack");
+            object ys = TypeConversionUtils.ConvertValueIfNecessary(typeof(IEnumerable<string>), xs, "ignored");
+            Assert.That(ys as IEnumerable<string>, Is.Not.Null);
+            IEnumerable<string> zs = (IEnumerable<string>)ys;
+            IEnumerator<string> zse = zs.GetEnumerator();
+            Assert.That(zse.MoveNext(), Is.True);
+            Assert.That(zse.Current, Is.EqualTo("Mark Pollack"));
+        }
+
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/TestObject.cs b/test/Spring/Spring.Core.Tests/Objects/TestObject.cs
index 1f9ed460..b34b43c1 100644
--- a/test/Spring/Spring.Core.Tests/Objects/TestObject.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/TestObject.cs
@@ -273,6 +273,27 @@ namespace Spring.Objects
             set { this.someGenericStringList = value; }
 	    }
 
+	    private IList<int> someGenericIListInt32;
+	    public virtual IList<int> SomeGenericIListInt32
+	    {
+	        get { return someGenericIListInt32; }
+	        set { someGenericIListInt32 = value; }
+	    }
+
+	    private IDictionary<string, int> someGenericIDictionaryStringInt32;
+	    public virtual IDictionary<string, int> SomeGenericIDictionaryStringInt32
+	    {
+	        get { return someGenericIDictionaryStringInt32; }
+	        set { someGenericIDictionaryStringInt32 = value; }
+	    }
+
+	    private IEnumerable<int> someGenericIEnumerableInt32;
+	    public virtual IEnumerable<int> SomeGenericIEnumerableInt32
+	    {
+	        get { return someGenericIEnumerableInt32; }
+	        set { someGenericIEnumerableInt32 = value; }
+	    }
+
 	    public virtual NameValueCollection SomeNameValueCollection
 	    {
             get { return someNameValueCollection; }
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj
index 1a9aadd6..ad8eee70 100644
--- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj
@@ -343,6 +343,7 @@
     <Compile Include="Objects\Factory\Xml\ArrayCtorDependencyObject.cs" />
     <Compile Include="Objects\Factory\Xml\CollectionMergingTests.cs" />
     <Compile Include="Objects\Factory\Xml\CollectionMergingGenericTests.cs" />
+    <Compile Include="Objects\Factory\Xml\CollectionConversionGenericTests.cs" />
     <Compile Include="Objects\Factory\Xml\LocaleTests.cs" />
     <Compile Include="Objects\Factory\Xml\NamespaceParserRegistryTests.cs" />
     <Compile Include="Objects\Factory\Xml\ObjectFactorySectionHandlerTests.cs" />
@@ -818,6 +819,7 @@
     <Content Include="Data\Spring\Objects\Factory\Xml\array-autowire.xml" />
     <Content Include="Data\Spring\Objects\Factory\Xml\collectionMergingGeneric.xml" />
     <Content Include="Data\Spring\Objects\Factory\Xml\collectionMerging.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\collectionConversionGeneric.xml" />
     <Content Include="Data\Spring\Objects\Factory\Xml\ctor-args.xml" />
     <Content Include="Data\Spring\Objects\Factory\Xml\objectNameGeneration.xml" />
     <Content Include="Data\Spring\Objects\Factory\Xml\simple-constructor-arg.xml" />
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj
index c3e07eac..0529c137 100644
--- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj
@@ -352,6 +352,7 @@
     <Compile Include="Objects\Factory\Xml\ArrayCtorDependencyObject.cs" />
     <Compile Include="Objects\Factory\Xml\CollectionMergingTests.cs" />
     <Compile Include="Objects\Factory\Xml\CollectionMergingGenericTests.cs" />
+    <Compile Include="Objects\Factory\Xml\CollectionConversionGenericTests.cs" />
     <Compile Include="Objects\Factory\Xml\LocaleTests.cs" />
     <Compile Include="Objects\Factory\Xml\NamespaceParserRegistryTests.cs" />
     <Compile Include="Objects\Factory\Xml\ObjectFactorySectionHandlerTests.cs" />
@@ -827,6 +828,7 @@
     <Content Include="Data\Spring\Objects\Factory\Xml\array-autowire.xml" />
     <Content Include="Data\Spring\Objects\Factory\Xml\collectionMergingGeneric.xml" />
     <Content Include="Data\Spring\Objects\Factory\Xml\collectionMerging.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\collectionConversionGeneric.xml" />
     <Content Include="Data\Spring\Objects\Factory\Xml\ctor-args.xml" />
     <Content Include="Data\Spring\Objects\Factory\Xml\objectNameGeneration.xml" />
     <Content Include="Data\Spring\Objects\Factory\Xml\simple-constructor-arg.xml" />