Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Target .NET 3.5 and 4.0 only, upgrade to Spring.NET 2.0 nightly build…

… snapshot, code cleanup
  • Loading branch information...
commit 4225c15e175fa0698190eb727371fd1e6b0c04b7 1 parent 2e6ea89
@lahma lahma authored
Showing with 8,474 additions and 70,202 deletions.
  1. +15 −10 Spring.Config.2010.sln
  2. +375 −404 Spring.Config.build
  3. BIN  lib/net/2.0/Common.Logging.dll
  4. BIN  lib/net/2.0/Rhino.Mocks.dll
  5. +0 −5,226 lib/net/2.0/Rhino.Mocks.xml
  6. BIN  lib/net/2.0/Spring.Core.dll
  7. BIN  lib/net/2.0/Spring.Core.pdb
  8. +0 −49,291 lib/net/2.0/Spring.Core.xml
  9. BIN  lib/net/2.0/nunit.framework.dll
  10. +0 −10,228 lib/net/2.0/nunit.framework.xml
  11. BIN  lib/net/3.5/Common.Logging.dll
  12. BIN  lib/net/3.5/Rhino.Mocks.dll
  13. +2,706 −2,308 lib/net/3.5/Rhino.Mocks.xml
  14. BIN  lib/net/3.5/Spring.Core.dll
  15. BIN  lib/net/3.5/Spring.Core.pdb
  16. +1,306 −173 lib/net/3.5/Spring.Core.xml
  17. BIN  lib/net/3.5/Spring.Web.Mvc.dll
  18. BIN  lib/net/4.0/Common.Logging.dll
  19. BIN  lib/net/4.0/Rhino.Mocks.dll
  20. +2,706 −2,308 lib/net/4.0/Rhino.Mocks.xml
  21. BIN  lib/net/4.0/Spring.Core.dll
  22. BIN  lib/net/4.0/Spring.Core.pdb
  23. +1,306 −173 lib/net/4.0/Spring.Core.xml
  24. +4 −4 src/CommonAssemblyInfo.cs
  25. +0 −1  src/Spring.Core.Configuration/AssemblyInfo.cs
  26. +0 −3  src/Spring.Core.Configuration/Context/Attributes/AttributeConfigUtils.cs
  27. +1 −1  src/Spring.Core.Configuration/Context/Attributes/ConfigurationClassEnhancer.cs
  28. +2 −1  src/Spring.Core.Configuration/Context/Attributes/ConfigurationClassObjectDefinitionReader.cs
  29. +10 −7 src/Spring.Core.Configuration/Context/Attributes/ConfigurationClassPostProcessor.cs
  30. +1 −1  src/Spring.Core.Configuration/Context/Attributes/DefinitionAttribute.cs
  31. +0 −2  src/Spring.Core.Configuration/Context/Attributes/RequiredConstraintAssemblyTypeScanner.cs
  32. +4 −22 src/Spring.Core.Configuration/Context/Extension/ApplicationContextExtensions.cs
  33. +0 −4 src/Spring.Core.Configuration/Context/Support/CodeConfigApplicationContext.cs
  34. +5 −5 src/Spring.Core.Configuration/Spring.Core.Configuration.2008.csproj
  35. BIN  test/Spring.Core.Configuration.Invalid.Tests/AssemblyInfo.cs
  36. +1 −2  test/Spring.Core.Configuration.Invalid.Tests/Context/Attributes/FailAssemblyObjectDefinitionScannerTests.cs
  37. +10 −6 test/Spring.Core.Configuration.Invalid.Tests/Spring.Core.Configuration.Invalid.Tests.2008.csproj
  38. BIN  test/Spring.Core.Configuration.Tests/AssemblyInfo.cs
  39. +0 −4 test/Spring.Core.Configuration.Tests/Context/Attributes/AssemblyObjectDefinitionScannerTests.cs
  40. +0 −3  test/Spring.Core.Configuration.Tests/Context/Attributes/ScanningConfigurationClassPostProcessorTests.cs
  41. +4 −3 test/Spring.Core.Configuration.Tests/Context/Support/CodeConfigApplicationContextTests.cs
  42. +0 −1  test/Spring.Core.Configuration.Tests/Example/Scannable/FooService.cs
  43. +0 −1  test/Spring.Core.Configuration.Tests/Objects/Factory/Xml/ReadOnlyXmlTestResource.cs
  44. +18 −10 test/Spring.Core.Configuration.Tests/Spring.Core.Configuration.Tests.2008.csproj
View
25 Spring.Config.2010.sln
@@ -1,29 +1,34 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.Configuration.2010", "src\Spring.Core.Configuration\Spring.Core.Configuration.2010.csproj", "{7B65D538-E863-4F57-8DDC-2C38E4150045}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.Configuration.Tests.2010", "test\Spring.Core.Configuration.Tests\Spring.Core.Configuration.Tests.2010.csproj", "{4F1A206C-09A8-43FF-B791-FE956E99A120}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.Configuration.Invalid.Tests.2010", "test\Spring.Core.Configuration.Invalid.Tests\Spring.Core.Configuration.Invalid.Tests.2010.csproj", "{4BEF1570-0816-4C79-90CE-13B644668204}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A412584F-F190-4AD9-AF39-5636478D4491}"
+ ProjectSection(SolutionItems) = preProject
+ Spring.Config.build = Spring.Config.build
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {7B65D538-E863-4F57-8DDC-2C38E4150045}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7B65D538-E863-4F57-8DDC-2C38E4150045}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7B65D538-E863-4F57-8DDC-2C38E4150045}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7B65D538-E863-4F57-8DDC-2C38E4150045}.Release|Any CPU.Build.0 = Release|Any CPU
- {4F1A206C-09A8-43FF-B791-FE956E99A120}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4F1A206C-09A8-43FF-B791-FE956E99A120}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4F1A206C-09A8-43FF-B791-FE956E99A120}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4F1A206C-09A8-43FF-B791-FE956E99A120}.Release|Any CPU.Build.0 = Release|Any CPU
{4BEF1570-0816-4C79-90CE-13B644668204}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4BEF1570-0816-4C79-90CE-13B644668204}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4BEF1570-0816-4C79-90CE-13B644668204}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4BEF1570-0816-4C79-90CE-13B644668204}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4F1A206C-09A8-43FF-B791-FE956E99A120}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4F1A206C-09A8-43FF-B791-FE956E99A120}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4F1A206C-09A8-43FF-B791-FE956E99A120}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4F1A206C-09A8-43FF-B791-FE956E99A120}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7B65D538-E863-4F57-8DDC-2C38E4150045}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7B65D538-E863-4F57-8DDC-2C38E4150045}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7B65D538-E863-4F57-8DDC-2C38E4150045}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7B65D538-E863-4F57-8DDC-2C38E4150045}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
View
779 Spring.Config.build
@@ -1,214 +1,190 @@
<?xml version="1.0" encoding="UTF-8" ?>
<project name="Spring.Config" default="test">
- <property name="root.dir" value="${project::get-base-directory()}" overwrite="false" />
- <property name="deploy.dir" value="${root.dir}\deploy" />
- <property name="build.dir" value="${root.dir}\build" />
- <property name="tool.dir" value="${root.dir}\tools" />
- <property name="lib.dir" value="${root.dir}\lib" />
- <property name="package.dir" value="${root.dir}\package" />
- <property name="doc.dir" value="${root.dir}\doc" />
- <property name="setup.dir" value="${root.dir}\setup" />
- <property name="project.sign" value="false" overwrite="false" />
- <property name="compiling.examples" value="false" overwrite="true" />
-
- <if test="${project.sign and not(file::exists(root.dir + '/Spring.Net.snk'))}">
- <fail message="project.sign='true' but keyfile ${root.dir+'/Spring.Net.snk'} is missing" />
- </if>
-
- <property name="project.majorversion" value="1.0" />
- <property name="project.patchversion" value="4" overwrite="false" />
- <property name="project.buildnumber" value="${math::abs(math::floor(timespan::get-total-days(datetime::now() - datetime::parse('01/01/2000'))))}" />
- <property name="project.version" value="${project.majorversion}.${project.patchversion}.${project.buildnumber}" overwrite="false" />
- <!-- dev / alpha / beta# / rc# / release -->
- <property name="project.releasetype" value="dev" overwrite="false" />
-
- <readregistry property="net40.install.dir" key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\InstallPath" hive="LocalMachine" failonerror="true"/>
- <property name="msbuild.exe" value="${net40.install.dir}\msbuild.exe"/>
-
- <property name="buildconfiguration" value="Debug" overwrite="false" />
-
-
-
- <target name="build" depends="clean">
- <echo message="Current .NET Framework = ${nant.settings.currentframework}"/>
-
- <call target="build-net-2.0" />
- <call target="build-net-3.5" />
- <call target="build-net-4.0" />
-
- <!-- need to get the bins copied to the bin folder for reference by examples before they are compiled -->
- <call target="copy-to-bin-for-reference" />
-
- <call target="RebuildExampleSolutions" />
- </target>
-
- <target name="copy-to-bin-for-reference">
- <echo message="Processing ${build.dir}\net-2.0"/>
- <copy todir="${root.dir}/bin/net/2.0/" flatten="true" verbose="true">
- <fileset>
- <include name="${build.dir}\net-2.0\Spring.Core.Config*.???"/>
- <exclude name="**\*Test*.*"/>
- </fileset>
- </copy>
-
- <echo message="Processing ${build.dir}\net-3.5"/>
- <copy todir="${root.dir}/bin/net/3.5/" flatten="true" verbose="true">
- <fileset>
- <include name="${build.dir}\net-3.5\Spring.Core.Config*.???"/>
- <exclude name="**\*Test*.*"/>
- </fileset>
- </copy>
-
- <echo message="Processing ${build.dir}\net-4.0"/>
- <copy todir="${root.dir}/bin/net/4.0/" flatten="true" verbose="true">
- <fileset>
- <include name="${build.dir}\net-4.0\Spring.Core.Config*.???"/>
- <exclude name="**\*Test*.*"/>
- </fileset>
- </copy>
+ <property name="root.dir" value="${project::get-base-directory()}" overwrite="false" />
+ <property name="deploy.dir" value="${root.dir}\deploy" />
+ <property name="build.dir" value="${root.dir}\build" />
+ <property name="tool.dir" value="${root.dir}\tools" />
+ <property name="lib.dir" value="${root.dir}\lib" />
+ <property name="package.dir" value="${root.dir}\package" />
+ <property name="doc.dir" value="${root.dir}\doc" />
+ <property name="setup.dir" value="${root.dir}\setup" />
+ <property name="project.sign" value="false" overwrite="false" />
+ <property name="compiling.examples" value="false" overwrite="true" />
+
+ <if test="${project.sign and not(file::exists(root.dir + '/Spring.Net.snk'))}">
+ <fail message="project.sign='true' but keyfile ${root.dir+'/Spring.Net.snk'} is missing" />
+ </if>
+
+ <property name="project.majorversion" value="1.0" />
+ <property name="project.patchversion" value="4" overwrite="false" />
+ <property name="project.buildnumber" value="${math::abs(math::floor(timespan::get-total-days(datetime::now() - datetime::parse('01/01/2000'))))}" />
+ <property name="project.version" value="${project.majorversion}.${project.patchversion}.${project.buildnumber}" overwrite="false" />
+ <!-- dev / alpha / beta# / rc# / release -->
+ <property name="project.releasetype" value="dev" overwrite="false" />
+
+ <readregistry property="net40.install.dir" key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\InstallPath" hive="LocalMachine" failonerror="true"/>
+ <property name="msbuild.exe" value="${net40.install.dir}\msbuild.exe"/>
+
+ <property name="buildconfiguration" value="Debug" overwrite="false" />
+
+
+
+ <target name="build" depends="clean">
+ <echo message="Current .NET Framework = ${nant.settings.currentframework}"/>
+
+ <call target="build-net-3.5" />
+ <call target="build-net-4.0" />
+
+ <!-- need to get the bins copied to the bin folder for reference by examples before they are compiled -->
+ <call target="copy-to-bin-for-reference" />
+
+ <call target="RebuildExampleSolutions" />
+ </target>
+
+ <target name="copy-to-bin-for-reference">
+ <echo message="Processing ${build.dir}\net-3.5"/>
+ <copy todir="${root.dir}/bin/net/3.5/" flatten="true" verbose="true">
+ <fileset>
+ <include name="${build.dir}\net-3.5\Spring.Core.Config*.???"/>
+ <exclude name="**\*Test*.*"/>
+ </fileset>
+ </copy>
+
+ <echo message="Processing ${build.dir}\net-4.0"/>
+ <copy todir="${root.dir}/bin/net/4.0/" flatten="true" verbose="true">
+ <fileset>
+ <include name="${build.dir}\net-4.0\Spring.Core.Config*.???"/>
+ <exclude name="**\*Test*.*"/>
+ </fileset>
+ </copy>
+ </target>
+
+
+ <target name="update-common-assemblyinfo">
+
+ <!-- ensure src/CommonAssemblyInfo.cs is writable if it already exists -->
+ <attrib file="${root.dir}/src/CommonAssemblyInfo.cs" readonly="false" if="${file::exists('${root.dir}/src/CommonAssemblyInfo.cs')}" />
+ <!-- generate the source file holding the common assembly-level attributes -->
+ <asminfo output="${root.dir}/src/CommonAssemblyInfo.cs" language="CSharp">
+ <imports>
+ <import namespace="System" />
+ <import namespace="System.Reflection" />
+ <import namespace="System.Runtime.InteropServices" />
+ <import namespace="System.Security" />
+ <import namespace="System.Security.Permissions" />
+ </imports>
+ <attributes>
+ <attribute type="CLSCompliantAttribute" value="false" />
+ <attribute type="ComVisibleAttribute" value="false" />
+ <attribute type="AssemblyCompanyAttribute" value="http://www.springframework.net" />
+ <attribute type="AssemblyCopyrightAttribute" value="Copyright 2010-2011 Spring.NET Framework Team." />
+ <attribute type="AssemblyTrademarkAttribute" value="Apache License, Version 2.0" />
+ <attribute type="AssemblyCultureAttribute" value="" />
+ <attribute type="AssemblyVersionAttribute" value="${project.version}" />
+ <attribute type="AssemblyFileVersionAttribute" value="${project.version}" />
+ <attribute type="AssemblyConfigurationAttribute" value="${nant.settings.currentframework}.${platform::get-name()}; ${project.releasetype}" />
+ <attribute type="AssemblyInformationalVersionAttribute" value="${project.version}" />
+ <attribute type="AssemblyDelaySignAttribute" value="false" />
+ </attributes>
+ </asminfo>
+ </target>
+
+ <target name="set-project-file-to-target-framework">
+ <foreach item="File" property="filename">
+ <in>
+ <items basedir="${root.dir}/src">
+ <include name="**/*.2010.csproj" />
+ </items>
+ </in>
+ <do>
+
+ <echo message="Poking file ${filename} to set framework version to ${nant.settings.targetframeworkstring}" />
+
+ <xmlpoke file="${filename}" xpath="/n:Project/n:PropertyGroup/n:TargetFrameworkVersion" value="${nant.settings.targetframeworkstring}">
+ <namespaces>
+ <namespace prefix="n" uri="http://schemas.microsoft.com/developer/msbuild/2003" />
+ </namespaces>
+ </xmlpoke>
+ </do>
+ </foreach>
+ </target>
+
+
+ <target name="set-assembly-hint-paths-for-target-framework">
+ <foreach item="File" property="filename">
+ <in>
+ <items basedir="${root.dir}/src">
+ <include name="**/*.2010.csproj" />
+ </items>
+ </in>
+ <do>
+
+ <property name="reference-name" value="Common.Logging" />
+ <echo message="Poking file ${filename} to set hint paths for ${reference-name}" />
+ <call target="set-assembly-hint-path" />
+
+ <property name="reference-name" value="Spring.Core" />
+ <echo message="Poking file ${filename} to set hint paths for ${reference-name}" />
+ <call target="set-assembly-hint-path" />
+
+ </do>
+ </foreach>
+ </target>
+
+ <target name="set-assembly-hint-path">
+ <xmlpoke file="${filename}" xpath="/n:Project/n:ItemGroup/n:Reference[@Include = '${reference-name}']/n:HintPath" value="${framework-specific.lib.dir}\${reference-name}.dll">
+ <namespaces>
+ <namespace prefix="n" uri="http://schemas.microsoft.com/developer/msbuild/2003" />
+ </namespaces>
+ </xmlpoke>
+ </target>
+
+ <target name="build-net-3.5">
+ <property name="nant.settings.currentframework" value="net-3.5"/>
+ <property name="nant.settings.targetframeworkstring" value="v3.5" />
+ <property name="framework-specific.lib.dir" value="..\..\lib\net\3.5" />
+ <property name="test.bin.dir" value="${build.dir}\${nant.settings.currentframework}" />
+
+ <echo message="Compiling for .NET Framework Version: ${nant.settings.currentframework}" />
+ <call target="update-common-assemblyinfo" />
+ <call target="set-project-file-to-target-framework" />
+ <call target="set-assembly-hint-paths-for-target-framework" />
+ <call target="RebuildAllSolutions" />
+ </target>
+
+ <target name="build-net-4.0">
+ <property name="nant.settings.currentframework" value="net-4.0"/>
+ <property name="nant.settings.targetframeworkstring" value="v4.0" />
+ <property name="framework-specific.lib.dir" value="..\..\lib\net\4.0" />
+ <property name="test.bin.dir" value="${build.dir}\${nant.settings.currentframework}" />
+
+ <echo message="Compiling for .NET Framework Version: ${nant.settings.currentframework}" />
+ <call target="update-common-assemblyinfo" />
+ <call target="set-project-file-to-target-framework" />
+ <call target="set-assembly-hint-paths-for-target-framework" />
+ <call target="RebuildAllSolutions" />
+ </target>
+
+ <target name="test" depends="build">
+ <call target="TestAllAssemblies" />
+ </target>
+
+ <target name="test-integration" depends="test">
+ <delete>
+ <fileset basedir="${build.dir}">
+ <include name="*.dll-TestCoverage.xml" />
+ </fileset>
+ </delete>
+ <call target="IntegrationTestAllAssemblies" />
+ </target>
+
+ <target name="daily" depends="test,doc-reference">
+ </target>
+
+ <target name="clean">
+ <delete dir="${build.dir}" />
</target>
-
-
- <target name="update-common-assemblyinfo">
-
- <!-- ensure src/CommonAssemblyInfo.cs is writable if it already exists -->
- <attrib file="${root.dir}/src/CommonAssemblyInfo.cs" readonly="false" if="${file::exists('${root.dir}/src/CommonAssemblyInfo.cs')}" />
- <!-- generate the source file holding the common assembly-level attributes -->
- <asminfo output="${root.dir}/src/CommonAssemblyInfo.cs" language="CSharp">
- <imports>
- <import namespace="System" />
- <import namespace="System.Reflection" />
- <import namespace="System.Runtime.InteropServices" />
- <import namespace="System.Security" />
- <import namespace="System.Security.Permissions" />
- </imports>
- <attributes>
- <attribute type="CLSCompliantAttribute" value="false" />
- <attribute type="ComVisibleAttribute" value="false" />
- <attribute type="AssemblyCompanyAttribute" value="http://www.springframework.net" />
- <attribute type="AssemblyCopyrightAttribute" value="Copyright 2010-2011 Spring.NET Framework Team." />
- <attribute type="AssemblyTrademarkAttribute" value="Apache License, Version 2.0" />
- <attribute type="AssemblyCultureAttribute" value="" />
- <attribute type="AssemblyVersionAttribute" value="${project.version}" />
- <attribute type="AssemblyFileVersionAttribute" value="${project.version}" />
- <attribute type="AssemblyConfigurationAttribute" value="${nant.settings.currentframework}.${platform::get-name()}; ${project.releasetype}" />
- <attribute type="AssemblyInformationalVersionAttribute" value="${project.version}" />
- <attribute type="AssemblyDelaySignAttribute" value="false" />
- </attributes>
- </asminfo>
- </target>
-
- <target name="set-project-file-to-target-framework">
- <foreach item="File" property="filename">
- <in>
- <items basedir="${root.dir}/src">
- <include name="**/*.2010.csproj" />
- </items>
- </in>
- <do>
-
- <echo message="Poking file ${filename} to set framework version to ${nant.settings.targetframeworkstring}" />
-
- <xmlpoke file="${filename}" xpath="/n:Project/n:PropertyGroup/n:TargetFrameworkVersion" value="${nant.settings.targetframeworkstring}">
- <namespaces>
- <namespace prefix="n" uri="http://schemas.microsoft.com/developer/msbuild/2003" />
- </namespaces>
- </xmlpoke>
- </do>
- </foreach>
- </target>
-
-
- <target name="set-assembly-hint-paths-for-target-framework">
- <foreach item="File" property="filename">
- <in>
- <items basedir="${root.dir}/src">
- <include name="**/*.2010.csproj" />
- </items>
- </in>
- <do>
-
- <property name="reference-name" value="Common.Logging" />
- <echo message="Poking file ${filename} to set hint paths for ${reference-name}" />
- <call target="set-assembly-hint-path" />
-
- <property name="reference-name" value="Spring.Core" />
- <echo message="Poking file ${filename} to set hint paths for ${reference-name}" />
- <call target="set-assembly-hint-path" />
-
- </do>
- </foreach>
- </target>
-
- <target name="set-assembly-hint-path">
- <xmlpoke file="${filename}" xpath="/n:Project/n:ItemGroup/n:Reference[@Include = '${reference-name}']/n:HintPath" value="${framework-specific.lib.dir}\${reference-name}.dll">
- <namespaces>
- <namespace prefix="n" uri="http://schemas.microsoft.com/developer/msbuild/2003" />
- </namespaces>
- </xmlpoke>
- </target>
-
-
- <target name="build-net-2.0">
- <property name="nant.settings.currentframework" value="net-2.0"/>
- <property name="nant.settings.targetframeworkstring" value="v2.0" />
- <property name="framework-specific.lib.dir" value="..\..\lib\net\2.0" />
- <property name="test.bin.dir" value="${build.dir}\${nant.settings.currentframework}" />
-
- <echo message="Compiling for .NET Framework Version: ${nant.settings.currentframework}" />
- <call target="update-common-assemblyinfo" />
- <call target="set-project-file-to-target-framework" />
- <call target="set-assembly-hint-paths-for-target-framework" />
- <call target="RebuildAllSolutions" />
- </target>
-
- <target name="build-net-3.5">
- <property name="nant.settings.currentframework" value="net-3.5"/>
- <property name="nant.settings.targetframeworkstring" value="v3.5" />
- <property name="framework-specific.lib.dir" value="..\..\lib\net\3.5" />
- <property name="test.bin.dir" value="${build.dir}\${nant.settings.currentframework}" />
-
- <echo message="Compiling for .NET Framework Version: ${nant.settings.currentframework}" />
- <call target="update-common-assemblyinfo" />
- <call target="set-project-file-to-target-framework" />
- <call target="set-assembly-hint-paths-for-target-framework" />
- <call target="RebuildAllSolutions" />
- </target>
-
-
- <target name="build-net-4.0">
- <property name="nant.settings.currentframework" value="net-4.0"/>
- <property name="nant.settings.targetframeworkstring" value="v4.0" />
- <property name="framework-specific.lib.dir" value="..\..\lib\net\4.0" />
- <property name="test.bin.dir" value="${build.dir}\${nant.settings.currentframework}" />
-
- <echo message="Compiling for .NET Framework Version: ${nant.settings.currentframework}" />
- <call target="update-common-assemblyinfo" />
- <call target="set-project-file-to-target-framework" />
- <call target="set-assembly-hint-paths-for-target-framework" />
- <call target="RebuildAllSolutions" />
- </target>
-
- <target name="test" depends="build">
- <call target="TestAllAssemblies" />
- </target>
-
- <target name="test-integration" depends="test">
- <delete>
- <fileset basedir="${build.dir}">
- <include name="*.dll-TestCoverage.xml" />
- </fileset>
- </delete>
- <call target="IntegrationTestAllAssemblies" />
- </target>
-
- <target name="daily" depends="test,doc-reference">
- </target>
-
- <target name="clean">
- <delete dir="${build.dir}" />
- </target>
<target name="package-zip" depends="package" description="Build Package distribution as .zip file">
@@ -258,27 +234,20 @@
</target>
<target name="package.binaries" depends="build">
- <echo message="Processing ${build.dir}\net-2.0"/>
- <copy todir="${package.dir}/bin/net/2.0/" flatten="true" verbose="true">
- <fileset>
- <include name="${build.dir}\net-2.0\Spring.Core.Config*.???"/>
- <exclude name="**\*Test*.*" />
- </fileset>
- </copy>
- <echo message="Processing ${build.dir}\net-3.5"/>
- <copy todir="${package.dir}/bin/net/3.5/" flatten="true" verbose="true">
- <fileset>
- <include name="${build.dir}\net-3.5\Spring.Core.Config*.???"/>
- <exclude name="**\*Test*.*" />
- </fileset>
- </copy>
- <echo message="Processing ${build.dir}\net-4.0"/>
- <copy todir="${package.dir}/bin/net/4.0/" flatten="true" verbose="true">
- <fileset>
- <include name="${build.dir}\net-4.0\Spring.Core.Config*.???"/>
- <exclude name="**\*Test*.*" />
- </fileset>
- </copy>
+ <echo message="Processing ${build.dir}\net-3.5"/>
+ <copy todir="${package.dir}/bin/net/3.5/" flatten="true" verbose="true">
+ <fileset>
+ <include name="${build.dir}\net-3.5\Spring.Core.Config*.???"/>
+ <exclude name="**\*Test*.*" />
+ </fileset>
+ </copy>
+ <echo message="Processing ${build.dir}\net-4.0"/>
+ <copy todir="${package.dir}/bin/net/4.0/" flatten="true" verbose="true">
+ <fileset>
+ <include name="${build.dir}\net-4.0\Spring.Core.Config*.???"/>
+ <exclude name="**\*Test*.*" />
+ </fileset>
+ </copy>
</target>
<target name="package.sources">
@@ -290,7 +259,7 @@
<exclude name="*.suo"/>
<exclude name="*.user"/>
<exclude name="*.cache"/>
- <exclude name="Spring.Config.build" />
+ <exclude name="Spring.Config.build" />
</fileset>
</copy>
@@ -305,17 +274,17 @@
<include name="test/**/*.*"/>
<include name="examples/**/*.*"/>
<exclude name="**/*.user"/>
- <exclude name="**/*.suo"/>
- <exclude name="**/*.cache"/>
+ <exclude name="**/*.suo"/>
+ <exclude name="**/*.cache"/>
<exclude name="src/**/bin/**" />
- <exclude name="src/**/obj/**" />
+ <exclude name="src/**/obj/**" />
<exclude name="test/**/bin/**" />
- <exclude name="test/**/obj/**" />
+ <exclude name="test/**/obj/**" />
<exclude name="examples/**/bin/**" />
- <exclude name="examples/**/obj/**" />
- <exclude name="**/_ReSharper*/**" />
- <exclude name="**/CommonAssemblyInfo.cs.template" />
- <exclude name="Spring.Config.build" />
+ <exclude name="examples/**/obj/**" />
+ <exclude name="**/_ReSharper*/**" />
+ <exclude name="**/CommonAssemblyInfo.cs.template" />
+ <exclude name="Spring.Config.build" />
</fileset>
</copy>
</target>
@@ -353,16 +322,16 @@
<nant buildfile="${doc.dir}/reference/docbook.build" target="all" />
</target>
- <target name="common.run-tests">
+ <target name="common.run-tests">
<!--
<call target="common.run-tests.nunit" />
-->
-
- <call target="common.run-tests.ncover" />
-
- </target>
- <!--
+ <call target="common.run-tests.ncover" />
+
+ </target>
+
+ <!--
*******************************************************************************
Runs NUnit unit test configuration of the current ${project::get-name()}.dll
@@ -371,25 +340,25 @@ ${build.dir}: the binary directory to pick the assembly + app.config from
${test.assemblyname} : (optional), the name of the assembly, if not specified uses "project:get-name()"
${tool.dir} : dir for tools
-->
- <target name="common.run-tests.nunit">
+ <target name="common.run-tests.nunit">
- <property name="test.assemblyname" value="${project::get-name()}" overwrite="false" />
- <property name="test.assemblyfile" value="${test.assemblyname}.dll" overwrite="true" />
+ <property name="test.assemblyname" value="${project::get-name()}" overwrite="false" />
+ <property name="test.assemblyfile" value="${test.assemblyname}.dll" overwrite="true" />
- <property name="test.bin.dir" value="${build.dir}" if="${not property::exists('test.bin.dir')}" />
- <echo message="Unit Testing ${test.assemblyname} in ${test.bin.dir}" />
+ <property name="test.bin.dir" value="${build.dir}" if="${not property::exists('test.bin.dir')}" />
+ <echo message="Unit Testing ${test.assemblyname} in ${test.bin.dir}" />
- <exec program="${tool.dir}/nunit/net-2.0/nunit-console-x86.exe" workingdir="${test.bin.dir}" verbose="true">
- <arg line="${test.assemblyfile}" />
- <arg value="/xml:${test.assemblyname}.dll-TestResults.xml" />
- <arg value="/nologo" />
- <arg value="/noshadow" />
- <arg value="/framework:${nant.settings.currentframework}" />
- </exec>
+ <exec program="${tool.dir}/nunit/net-2.0/nunit-console-x86.exe" workingdir="${test.bin.dir}" verbose="true">
+ <arg line="${test.assemblyfile}" />
+ <arg value="/xml:${test.assemblyname}.dll-TestResults.xml" />
+ <arg value="/nologo" />
+ <arg value="/noshadow" />
+ <arg value="/framework:${nant.settings.currentframework}" />
+ </exec>
- </target>
+ </target>
- <!--
+ <!--
*******************************************************************************
Runs coverage unit test configuration of the current ${project::get-name()}.dll
@@ -398,69 +367,70 @@ ${current.bin.dir}: the binary directory to pick the assembly + app.config from
${project.name} : (optional), the name of the assembly
${tool.dir} : dir for tools
-->
- <target name="common.run-tests.ncover" description="Run NUnit tests">
-
- <property name="test.assemblyname" value="${project::get-name()}" overwrite="false" />
- <property name="test.assemblyfile" value="${test.assemblyname}.dll" overwrite="true" />
- <property name="test.bin.dir" value="${build.dir}" if="${not property::exists('test.bin.dir')}" />
-
- <echo message="Coverage Testing ${test.assemblyname} from ${test.bin.dir}/${test.assemblyfile}" />
-
- <property name="test.assemblyname.tocover" value="${string::substring(test.assemblyname,0,string::last-index-of(test.assemblyname, '.Tests') )}" overwrite="false" />
-
- <exec program="${tool.dir}/ncover/ncover.console.exe" workingdir="${test.bin.dir}" verbose="true">
- <arg value="//q" />
- <arg value="//reg" />
- <arg value="//w" />
- <arg path="${test.bin.dir}" />
- <arg value="//x" />
- <arg path="${test.bin.dir}/${test.assemblyname}.dll-TestCoverage.xml" />
- <arg value="//a" />
- <arg value="${test.assemblyname.tocover}" />
- <arg value="//ea" />
- <arg value="CoverageExcludeAttribute" />
- <arg value="//q" />
- <arg path="${tool.dir}/nunit/net-2.0/nunit-console-x86.exe" />
- <arg line="${test.assemblyfile}" />
- <arg value="/xml:${test.assemblyname}.dll-TestResults.xml" />
- <arg value="/nologo" />
- <arg value="/noshadow" />
-
- <arg value="/framework:${nant.settings.currentframework}" />
-
- <!-- <arg value="/framework:net-2.0" /> -->
- </exec>
+ <target name="common.run-tests.ncover" description="Run NUnit tests">
+
+ <property name="test.assemblyname" value="${project::get-name()}" overwrite="false" />
+ <property name="test.assemblyfile" value="${test.assemblyname}.dll" overwrite="true" />
+ <property name="test.bin.dir" value="${build.dir}" if="${not property::exists('test.bin.dir')}" />
+
+ <echo message="Coverage Testing ${test.assemblyname} from ${test.bin.dir}/${test.assemblyfile}" />
+
+ <property name="test.assemblyname.tocover" value="${string::substring(test.assemblyname,0,string::last-index-of(test.assemblyname, '.Tests') )}" overwrite="false" />
+
+ <exec program="${tool.dir}/ncover/ncover.console.exe" workingdir="${test.bin.dir}" verbose="true">
+ <arg value="//q" />
+ <arg value="//reg" />
+ <arg value="//w" />
+ <arg path="${test.bin.dir}" />
+ <arg value="//x" />
+ <arg path="${test.bin.dir}/${test.assemblyname}.dll-TestCoverage.xml" />
+ <arg value="//a" />
+ <arg value="${test.assemblyname.tocover}" />
+ <arg value="//ea" />
+ <arg value="CoverageExcludeAttribute" />
+ <arg value="//q" />
+ <arg path="${tool.dir}/nunit/net-2.0/nunit-console-x86.exe" />
+ <arg line="${test.assemblyfile}" />
+ <arg value="/xml:${test.assemblyname}.dll-TestResults.xml" />
+ <arg value="/nologo" />
+ <arg value="/noshadow" />
+
+ <arg value="/framework:${nant.settings.currentframework}" />
+
+ <!-- <arg value="/framework:net-2.0" /> -->
+ </exec>
- </target>
-
- <target name="TestAllAssemblies">
-
- <!-- have to delete the INVALID test ass'y otherwise the VALID tests will find the INVALID config types that support the INVALID tests -->
- <delete>
- <fileset basedir="${build.dir}">
- <include name="**\*Invalid*.*" />
- </fileset>
- </delete>
-
- <foreach item="File" property="filename">
- <in>
- <items basedir="${build.dir}">
- <include name="**\*.Tests.dll" />
- <exclude name="**\Spring.Core.Tests.dll" /> <!--have to exclude this b/c it contains all the CORE tests (that we don't want to run here! -->
- </items>
- </in>
- <do>
- <property name="test.assemblyname" value="${path::get-file-name-without-extension(filename)}" />
-
-
-
- <property name="test.bin.dir" value="${build.dir}\${nant.settings.currentframework}"/>
- <call target="common.run-tests" />
- </do>
- </foreach>
-
- <!-- build coverage summary -->
- <!--
+ </target>
+
+ <target name="TestAllAssemblies">
+
+ <!-- have to delete the INVALID test ass'y otherwise the VALID tests will find the INVALID config types that support the INVALID tests -->
+ <delete>
+ <fileset basedir="${build.dir}">
+ <include name="**\*Invalid*.*" />
+ </fileset>
+ </delete>
+
+ <foreach item="File" property="filename">
+ <in>
+ <items basedir="${build.dir}">
+ <include name="**\*.Tests.dll" />
+ <exclude name="**\Spring.Core.Tests.dll" />
+ <!--have to exclude this b/c it contains all the CORE tests (that we don't want to run here! -->
+ </items>
+ </in>
+ <do>
+ <property name="test.assemblyname" value="${path::get-file-name-without-extension(filename)}" />
+
+
+
+ <property name="test.bin.dir" value="${build.dir}\${nant.settings.currentframework}"/>
+ <call target="common.run-tests" />
+ </do>
+ </foreach>
+
+ <!-- build coverage summary -->
+ <!--
<exec program="${tool.dir}/ncoverexplorer/ncoverexplorer.console.exe" workingdir="${build.dir}" failonerror="false">
<arg value="/xml:&quot;${build.dir}/TestCoverageSummary.xml&quot;" />
<arg value="/report:ModuleClassFunctionSummary" />
@@ -470,100 +440,101 @@ ${tool.dir} : dir for tools
<arg path="${build.dir}/*-TestCoverage.xml" />
</exec>
-->
- </target>
-
- <target name="IntegrationTestAllAssemblies">
- <foreach item="File" property="filename">
- <in>
- <items basedir="${build.dir}">
- <include name="*.Tests.Integration.dll" />
- </items>
- </in>
- <do>
- <property name="test.assemblyname" value="${path::get-file-name-without-extension(filename)}" />
- <call target="common.run-tests" />
- </do>
- </foreach>
-
- <!-- build coverage summary -->
- <exec program="${tool.dir}/ncoverexplorer/ncoverexplorer.console.exe" workingdir="${build.dir}" failonerror="false">
- <arg value="/xml:&quot;${build.dir}/TestCoverageSummary.xml&quot;" />
- <arg value="/html:&quot;${build.dir}/TestCoverageSummary.html&quot;" />
- <arg value="/report:ModuleClassFunctionSummary" />
- <arg value="/sort:4" />
- <arg value="/minCoverage:80" />
- <arg value="/q" />
- <arg path="${build.dir}/*-TestCoverage.xml" />
- </exec>
- </target>
-
- <target name="RebuildAllSolutions" > <!-- depends="clean"> -->
- <foreach item="File" property="filename">
- <in>
- <items basedir="${root.dir}">
- <exclude name="**/tools/**" />
- <exclude name="**/examples/**" />
- <exclude name="**/package/**" />
- <include name="**/*2010.sln" />
- </items>
- </in>
- <do>
- <property name="solutionfile" value="${filename}" />
- <property name="solutionconfiguration" value="${buildconfiguration}" />
- <call target="RebuildSolution" />
- </do>
- </foreach>
- </target>
-
- <target name="RebuildExampleSolutions" > <!-- depends="buildRebuildAllSolutions"> -->
- <!-- never sign/stong-name the example solutions, even when the we're signing the main binaries -->
- <property name="compiling.examples" value="true" />
-
- <foreach item="File" property="filename">
- <in>
- <items basedir="${root.dir}/examples">
- <include name="**/*.sln" />
- </items>
- </in>z
- <do>
- <property name="solutionfile" value="${filename}" />
- <property name="solutionconfiguration" value="${buildconfiguration}" />
- <call target="RebuildSolution" />
- </do>
- </foreach>
- </target>
-
- <target name="RebuildSolution" description="rebuilds a given solution file">
- <echo message="Rebuilding Solution ${solutionfile}" />
-
- <exec program="${msbuild.exe}">
- <!--
+ </target>
+
+ <target name="IntegrationTestAllAssemblies">
+ <foreach item="File" property="filename">
+ <in>
+ <items basedir="${build.dir}">
+ <include name="*.Tests.Integration.dll" />
+ </items>
+ </in>
+ <do>
+ <property name="test.assemblyname" value="${path::get-file-name-without-extension(filename)}" />
+ <call target="common.run-tests" />
+ </do>
+ </foreach>
+
+ <!-- build coverage summary -->
+ <exec program="${tool.dir}/ncoverexplorer/ncoverexplorer.console.exe" workingdir="${build.dir}" failonerror="false">
+ <arg value="/xml:&quot;${build.dir}/TestCoverageSummary.xml&quot;" />
+ <arg value="/html:&quot;${build.dir}/TestCoverageSummary.html&quot;" />
+ <arg value="/report:ModuleClassFunctionSummary" />
+ <arg value="/sort:4" />
+ <arg value="/minCoverage:80" />
+ <arg value="/q" />
+ <arg path="${build.dir}/*-TestCoverage.xml" />
+ </exec>
+ </target>
+
+ <target name="RebuildAllSolutions" >
+ <!-- depends="clean"> -->
+ <foreach item="File" property="filename">
+ <in>
+ <items basedir="${root.dir}">
+ <exclude name="**/tools/**" />
+ <exclude name="**/examples/**" />
+ <exclude name="**/package/**" />
+ <include name="**/*2010.sln" />
+ </items>
+ </in>
+ <do>
+ <property name="solutionfile" value="${filename}" />
+ <property name="solutionconfiguration" value="${buildconfiguration}" />
+ <call target="RebuildSolution" />
+ </do>
+ </foreach>
+ </target>
+
+ <target name="RebuildExampleSolutions" >
+ <!-- depends="buildRebuildAllSolutions"> -->
+ <!-- never sign/stong-name the example solutions, even when the we're signing the main binaries -->
+ <property name="compiling.examples" value="true" />
+
+ <foreach item="File" property="filename">
+ <in>
+ <items basedir="${root.dir}/examples">
+ <include name="**/*.sln" />
+ </items>
+ </in>z
+ <do>
+ <property name="solutionfile" value="${filename}" />
+ <property name="solutionconfiguration" value="${buildconfiguration}" />
+ <call target="RebuildSolution" />
+ </do>
+ </foreach>
+ </target>
+
+ <target name="RebuildSolution" description="rebuilds a given solution file">
+ <echo message="Rebuilding Solution ${solutionfile}" />
+
+ <exec program="${msbuild.exe}">
+ <!--
<arg value="/property:OutDir=${output.dir}/"/>
-->
- <arg value="${solutionfile}"/>
- <arg line="/nologo" />
- <arg value="/property:OutputPath=${build.dir}\${nant.settings.currentframework}" if="${not compiling.examples}" />
- <arg line="/property:Configuration=${solutionconfiguration}"/>
- <arg value="/property:DefineExtraConstants=STRONG" if="${project.sign and not compiling.examples}" />
- <arg value="/property:SignAssembly=true" if="${project.sign and not compiling.examples}" />
- <arg value="/property:DefineExtraConstants=NET_3_5" if="${nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0'}" />
- <arg value="/property:AssemblyOriginatorKeyFile=..\..\Spring.Net.snk" if="${project.sign and not compiling.examples}" />
- </exec>
- </target>
+ <arg value="${solutionfile}"/>
+ <arg line="/nologo" />
+ <arg value="/property:OutputPath=${build.dir}\${nant.settings.currentframework}" if="${not compiling.examples}" />
+ <arg line="/property:Configuration=${solutionconfiguration}"/>
+ <arg value="/property:DefineExtraConstants=STRONG" if="${project.sign and not compiling.examples}" />
+ <arg value="/property:SignAssembly=true" if="${project.sign and not compiling.examples}" />
+ <arg value="/property:AssemblyOriginatorKeyFile=..\..\Spring.Net.snk" if="${project.sign and not compiling.examples}" />
+ </exec>
+ </target>
- <target name="nuget" depends="package-zip">
+ <target name="nuget" depends="package-zip">
<echo message="Generating NuGet package..." />
<mkdir dir="${deploy.dir}"/>
<exec program="${setup.dir}\NuGet\lib\NuGet.exe" workingdir="${build.dir}" verbose="true">
<arg value="pack" />
<arg value="${setup.dir}\NuGet\src\Spring.CodeConfig.nuspec" />
- <arg value="-Version" />
- <arg value="${project.majorversion}.${project.patchversion}" />
- <arg value="-OutputDirectory" />
- <arg value="${deploy.dir}" />
+ <arg value="-Version" />
+ <arg value="${project.majorversion}.${project.patchversion}" />
+ <arg value="-OutputDirectory" />
+ <arg value="${deploy.dir}" />
</exec>
</target>
-
-
+
+
</project>
View
BIN  lib/net/2.0/Common.Logging.dll
Binary file not shown
View
BIN  lib/net/2.0/Rhino.Mocks.dll
Binary file not shown
View
5,226 lib/net/2.0/Rhino.Mocks.xml
0 additions, 5,226 deletions not shown
View
BIN  lib/net/2.0/Spring.Core.dll
Binary file not shown
View
BIN  lib/net/2.0/Spring.Core.pdb
Binary file not shown
View
49,291 lib/net/2.0/Spring.Core.xml
0 additions, 49,291 deletions not shown
View
BIN  lib/net/2.0/nunit.framework.dll
Binary file not shown
View
10,228 lib/net/2.0/nunit.framework.xml
0 additions, 10,228 deletions not shown
View
BIN  lib/net/3.5/Common.Logging.dll
Binary file not shown
View
BIN  lib/net/3.5/Rhino.Mocks.dll
Binary file not shown
View
5,014 lib/net/3.5/Rhino.Mocks.xml
2,706 additions, 2,308 deletions not shown
View
BIN  lib/net/3.5/Spring.Core.dll
Binary file not shown
View
BIN  lib/net/3.5/Spring.Core.pdb
Binary file not shown
View
1,479 lib/net/3.5/Spring.Core.xml
1,306 additions, 173 deletions not shown
View
BIN  lib/net/3.5/Spring.Web.Mvc.dll
Binary file not shown
View
BIN  lib/net/4.0/Common.Logging.dll
Binary file not shown
View
BIN  lib/net/4.0/Rhino.Mocks.dll
Binary file not shown
View
5,014 lib/net/4.0/Rhino.Mocks.xml
2,706 additions, 2,308 deletions not shown
View
BIN  lib/net/4.0/Spring.Core.dll
Binary file not shown
View
BIN  lib/net/4.0/Spring.Core.pdb
Binary file not shown
View
1,479 lib/net/4.0/Spring.Core.xml
1,306 additions, 173 deletions not shown
View
8 src/CommonAssemblyInfo.cs
@@ -7,7 +7,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.431
+// Runtime Version:4.0.30319.17626
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -20,9 +20,9 @@
[assembly: AssemblyCopyrightAttribute("Copyright 2010-2011 Spring.NET Framework Team.")]
[assembly: AssemblyTrademarkAttribute("Apache License, Version 2.0")]
[assembly: AssemblyCultureAttribute("")]
-[assembly: AssemblyVersionAttribute("1.0.4.4248")]
-[assembly: AssemblyFileVersionAttribute("1.0.4.4248")]
+[assembly: AssemblyVersionAttribute("1.0.4.4553")]
+[assembly: AssemblyFileVersionAttribute("1.0.4.4553")]
[assembly: AssemblyConfigurationAttribute("net-4.0.win32; dev")]
-[assembly: AssemblyInformationalVersionAttribute("1.0.4.4248")]
+[assembly: AssemblyInformationalVersionAttribute("1.0.4.4553")]
[assembly: AssemblyDelaySignAttribute(false)]
View
1  src/Spring.Core.Configuration/AssemblyInfo.cs
@@ -1,5 +1,4 @@
using System.Reflection;
-using System.Security;
[assembly: AssemblyTitle("Spring.Core.Configuration")]
[assembly: AssemblyDescription("")]
View
3  src/Spring.Core.Configuration/Context/Attributes/AttributeConfigUtils.cs
@@ -18,9 +18,6 @@
#endregion
-using System;
-using System.Collections.ObjectModel;
-using System.Reflection;
using Spring.Objects.Factory.Attributes;
using Spring.Objects.Factory.Config;
using Spring.Objects.Factory.Support;
View
2  src/Spring.Core.Configuration/Context/Attributes/ConfigurationClassEnhancer.cs
@@ -191,7 +191,7 @@ public override Type BuildProxyType()
foreach (DictionaryEntry entry in targetMethods)
{
FieldInfo targetMethodFieldInfo = proxyType.GetField((string)entry.Key, BindingFlags.NonPublic | BindingFlags.Static);
- targetMethodFieldInfo.SetValue(proxyType, (MethodInfo)entry.Value);
+ targetMethodFieldInfo.SetValue(proxyType, entry.Value);
}
// set interceptor
View
3  src/Spring.Core.Configuration/Context/Attributes/ConfigurationClassObjectDefinitionReader.cs
@@ -23,8 +23,9 @@
using System;
using System.Collections.Generic;
using System.Reflection;
+
using Common.Logging;
-using Spring.Collections.Generic;
+
using Spring.Core.TypeResolution;
using Spring.Objects.Factory.Config;
using Spring.Objects.Factory.Parsing;
View
17 src/Spring.Core.Configuration/Context/Attributes/ConfigurationClassPostProcessor.cs
@@ -19,6 +19,9 @@
#endregion
using System;
+using System.Collections.Generic;
+
+using Common.Logging;
using Spring.Core;
using Spring.Objects.Factory;
@@ -36,13 +39,13 @@ public class ConfigurationClassPostProcessor : IObjectDefinitionRegistryPostProc
{
#region Logging
- private static readonly Common.Logging.ILog LOG = Common.Logging.LogManager.GetLogger(typeof(ConfigurationClassPostProcessor));
+ private static readonly ILog log = LogManager.GetLogger(typeof(ConfigurationClassPostProcessor));
#endregion
- private bool _postProcessObjectDefinitionRegistryCalled = false;
+ private bool _postProcessObjectDefinitionRegistryCalled;
- private bool _postProcessObjectFactoryCalled = false;
+ private bool _postProcessObjectFactoryCalled;
private IProblemReporter _problemReporter = new FailFastProblemReporter();
@@ -121,7 +124,7 @@ private void EnhanceConfigurationClasses(IConfigurableListableObjectFactory obje
{
ConfigurationClassEnhancer enhancer = new ConfigurationClassEnhancer(objectFactory);
- string[] objectNames = objectFactory.GetObjectDefinitionNames();
+ IList<string> objectNames = objectFactory.GetObjectDefinitionNames();
foreach (string name in objectNames)
{
@@ -138,9 +141,9 @@ private void EnhanceConfigurationClasses(IConfigurableListableObjectFactory obje
#region Logging
- if (LOG.IsDebugEnabled)
+ if (log.IsDebugEnabled)
{
- LOG.Debug(String.Format(
+ log.Debug(String.Format(
"Replacing object definition '{0}' existing class '{1}' with enhanced class",
name, configClass.FullName));
}
@@ -155,7 +158,7 @@ private void EnhanceConfigurationClasses(IConfigurableListableObjectFactory obje
private void ProcessConfigObjectDefinitions(IObjectDefinitionRegistry registry)
{
- ISet<ObjectDefinitionHolder> configCandidates = new HashedSet<ObjectDefinitionHolder>();
+ Collections.Generic.ISet<ObjectDefinitionHolder> configCandidates = new HashedSet<ObjectDefinitionHolder>();
foreach (string objectName in registry.GetObjectDefinitionNames())
{
IObjectDefinition objectDef = registry.GetObjectDefinition(objectName);
View
2  src/Spring.Core.Configuration/Context/Attributes/DefinitionAttribute.cs
@@ -19,7 +19,7 @@
#endregion
using System;
-using Spring.Objects.Factory.Config;
+
using Spring.Util;
namespace Spring.Context.Attributes
View
2  src/Spring.Core.Configuration/Context/Attributes/RequiredConstraintAssemblyTypeScanner.cs
@@ -19,8 +19,6 @@
#endregion
using System;
-using System.Collections.Generic;
-using System.Reflection;
namespace Spring.Context.Attributes
{
View
26 src/Spring.Core.Configuration/Context/Extension/ApplicationContextExtensions.cs
@@ -18,23 +18,9 @@
#endregion
-using Spring.Objects.Factory;
-
-#if !NET_3_5
-
-namespace System.Runtime.CompilerServices
-{
- /// <summary>
- /// Manufactured Extension Attribute to permit .NET 2.0 to support extension methods
- /// </summary>
- [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
- internal class ExtensionAttribute : Attribute
- {
- }
-}
-
-#endif
+using System.Collections.Generic;
+using Spring.Objects.Factory;
namespace Spring.Context
{
@@ -63,8 +49,8 @@ public static T GetObject<T>(this IApplicationContext context, string name)
/// <returns></returns>
public static T GetObject<T>(this IApplicationContext context)
{
- string[] objectNamesForType = context.GetObjectNamesForType(typeof(T));
- if ((objectNamesForType == null) || (objectNamesForType.Length == 0))
+ IList<string> objectNamesForType = context.GetObjectNamesForType(typeof(T));
+ if ((objectNamesForType == null) || (objectNamesForType.Count == 0))
{
throw new NoSuchObjectDefinitionException(typeof(T).FullName, "Requested Type not Defined in the Context.");
}
@@ -72,7 +58,3 @@ public static T GetObject<T>(this IApplicationContext context)
}
}
}
-
-namespace Spring.Context.Support
-{
-}
View
4 src/Spring.Core.Configuration/Context/Support/CodeConfigApplicationContext.cs
@@ -18,10 +18,6 @@
#endregion
-using System;
-using System.Reflection;
-using Spring.Context.Attributes;
-using Spring.Objects.Factory.Config;
using Spring.Objects.Factory.Support;
namespace Spring.Context.Support
View
10 src/Spring.Core.Configuration/Spring.Core.Configuration.2008.csproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Spring</RootNamespace>
<AssemblyName>Spring.Core.Configuration</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
@@ -36,10 +36,10 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Common.Logging">
- <HintPath>..\..\lib\net\2.0\Common.Logging.dll</HintPath>
+ <HintPath>..\..\lib\net\3.5\Common.Logging.dll</HintPath>
</Reference>
<Reference Include="Spring.Core">
- <HintPath>..\..\lib\net\2.0\Spring.Core.dll</HintPath>
+ <HintPath>..\..\lib\net\3.5\Spring.Core.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -84,10 +84,10 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
- <ItemGroup />
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
+ <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.
View
BIN  test/Spring.Core.Configuration.Invalid.Tests/AssemblyInfo.cs
Binary file not shown
View
3  test/Spring.Core.Configuration.Invalid.Tests/Context/Attributes/FailAssemblyObjectDefinitionScannerTests.cs
@@ -53,8 +53,7 @@ private void ScanForAndRegisterSingleType(Type type)
public void Can_Ignore_Abstract_Configuration_Types()
{
ScanForAndRegisterSingleType(typeof(ConfigurationClassThatIsAbstract));
- Assert.That(_context.GetObjectNamesForType(typeof(ConfigurationClassThatIsAbstract)).Length, Is.EqualTo(0),
- "Abstract Type erroneously registered with the Context.");
+ Assert.That(_context.GetObjectNamesForType(typeof(ConfigurationClassThatIsAbstract)).Count, Is.EqualTo(0), "Abstract Type erroneously registered with the Context.");
}
[Test]
View
16 test/Spring.Core.Configuration.Invalid.Tests/Spring.Core.Configuration.Invalid.Tests.2008.csproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -33,10 +33,14 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework, Version=2.5.7.10213, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <HintPath>..\..\lib\net\2.0\nunit.framework.dll</HintPath>
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\lib\net\3.5\nunit.framework.dll</HintPath>
+ </Reference>
+ <Reference Include="Rhino.Mocks">
+ <HintPath>..\..\lib\net\3.5\Rhino.Mocks.dll</HintPath>
</Reference>
<Reference Include="Spring.Core">
- <HintPath>..\..\lib\net\2.0\Spring.Core.dll</HintPath>
+ <HintPath>..\..\lib\net\3.5\Spring.Core.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -52,14 +56,14 @@
<Compile Include="Context\Attributes\FailAssemblyObjectDefinitionScannerTests.cs" />
</ItemGroup>
<ItemGroup>
+ <Folder Include="Properties\" />
+ </ItemGroup>
+ <ItemGroup>
<ProjectReference Include="..\..\src\Spring.Core.Configuration\Spring.Core.Configuration.2008.csproj">
<Project>{7B65D538-E863-4F57-8DDC-2C38E4150045}</Project>
<Name>Spring.Core.Configuration.2008</Name>
</ProjectReference>
</ItemGroup>
- <ItemGroup>
- <Folder Include="Properties\" />
- </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.
View
BIN  test/Spring.Core.Configuration.Tests/AssemblyInfo.cs
Binary file not shown
View
4 test/Spring.Core.Configuration.Tests/Context/Attributes/AssemblyObjectDefinitionScannerTests.cs
@@ -19,7 +19,6 @@
#endregion
using NUnit.Framework;
-using Spring.Context.Support;
namespace Spring.Context.Attributes
{
@@ -28,7 +27,4 @@ public class AssemblyObjectDefinitionScannerTests
{
}
-
-
}
-
View
3  test/Spring.Core.Configuration.Tests/Context/Attributes/ScanningConfigurationClassPostProcessorTests.cs
@@ -18,8 +18,6 @@
#endregion
-
-using System;
using NUnit.Framework;
using Spring.Context.Config;
using Spring.Context.Support;
@@ -43,5 +41,4 @@ public void ContextNotNull()
Assert.That(_ctx, Is.Not.Null);
}
}
-
}
View
7 test/Spring.Core.Configuration.Tests/Context/Support/CodeConfigApplicationContextTests.cs
@@ -20,9 +20,10 @@
using System;
using System.Collections.Generic;
-using System.Diagnostics;
using System.Linq;
+
using NUnit.Framework;
+
using Spring.Context.Support;
using Spring.Context.Attributes;
@@ -70,7 +71,7 @@ public void Can_Filter_For_Assembly_Containing_Specific_Type()
[Test]
public void Can_Filter_For_Specific_Type()
{
- _context.ScanWithTypeFilter(type => ((Type)type).FullName.Contains(typeof(TheImportedConfigurationClass).Name));
+ _context.ScanWithTypeFilter(type => type.FullName.Contains(typeof(TheImportedConfigurationClass).Name));
_context.Refresh();
Assert.That(_context.DefaultListableObjectFactory.ObjectDefinitionCount, Is.EqualTo(5));
@@ -79,7 +80,7 @@ public void Can_Filter_For_Specific_Type()
[Test]
public void Can_Filter_For_Specific_Types_With_Compound_Predicate()
{
- _context.ScanWithTypeFilter(type => ((Type)type).FullName.Contains(typeof(TheImportedConfigurationClass).Name) || ((Type)type).FullName.Contains(typeof(TheConfigurationClass).Name));
+ _context.ScanWithTypeFilter(type => type.FullName.Contains(typeof(TheImportedConfigurationClass).Name) || type.FullName.Contains(typeof(TheConfigurationClass).Name));
_context.Refresh();
AssertExpectedObjectsAreRegisteredWith(_context, 16);
View
1  test/Spring.Core.Configuration.Tests/Example/Scannable/FooService.cs
@@ -18,7 +18,6 @@
#endregion
-using System;
using Spring.Stereotype;
namespace Spring.Example.Scannable
View
1  test/Spring.Core.Configuration.Tests/Objects/Factory/Xml/ReadOnlyXmlTestResource.cs
@@ -22,7 +22,6 @@
using System;
using System.IO;
-using System.Security;
using System.Text;
using Spring.Core.IO;
View
28 test/Spring.Core.Configuration.Tests/Spring.Core.Configuration.Tests.2008.csproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -32,11 +32,20 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="Common.Logging, Version=2.0.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\lib\net\3.5\Common.Logging.dll</HintPath>
+ </Reference>
<Reference Include="nunit.framework, Version=2.5.7.10213, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <HintPath>..\..\lib\net\2.0\nunit.framework.dll</HintPath>
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\lib\net\3.5\nunit.framework.dll</HintPath>
+ </Reference>
+ <Reference Include="Rhino.Mocks">
+ <HintPath>..\..\lib\net\3.5\Rhino.Mocks.dll</HintPath>
</Reference>
- <Reference Include="Spring.Core">
- <HintPath>..\..\lib\net\2.0\Spring.Core.dll</HintPath>
+ <Reference Include="Spring.Core, Version=0.0.0.40069, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\lib\net\3.5\Spring.Core.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -70,12 +79,8 @@
<ItemGroup>
<EmbeddedResource Include="Context\Attributes\ObjectDefinitions.xml" />
</ItemGroup>
- <ItemGroup />
<ItemGroup>
- <ProjectReference Include="..\..\src\Spring.Core.Configuration\Spring.Core.Configuration.2010.csproj">
- <Project>{7B65D538-E863-4F57-8DDC-2C38E4150045}</Project>
- <Name>Spring.Core.Configuration.2008</Name>
- </ProjectReference>
+ <Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Context\Attributes\SimpleScanTest.xml" />
@@ -84,7 +89,10 @@
<EmbeddedResource Include="Context\Attributes\ObjectDefinitionsTwo.xml" />
</ItemGroup>
<ItemGroup>
- <Folder Include="Properties\" />
+ <ProjectReference Include="..\..\src\Spring.Core.Configuration\Spring.Core.Configuration.2008.csproj">
+ <Project>{7B65D538-E863-4F57-8DDC-2C38E4150045}</Project>
+ <Name>Spring.Core.Configuration.2008</Name>
+ </ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Please sign in to comment.
Something went wrong with that request. Please try again.