Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SPRNET-1539 upgrade Quartz dependency to 2.2.1, use Spring.Scheduling.Quartz2 as package name

Browse Source 
* replace lib dir NHibernate and Quartz dlls with NuGet references
* update examples to prefer NuGet packages
This commit is contained in:
Marko Lahma
2013-12-22 14:04:12 +02:00
parent 62e61ae9e0
commit 0dfc0bc57b
298 changed files with 69737 additions and 151972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Spring/Spring.Data.NHibernate32/Spring.Data.NHibernate32.2010.csproj
View File

@@ -31,6 +31,8 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -60,8 +62,13 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
</Reference>
<Reference Include="NHibernate">
<HintPath>..\..\..\lib\NHibernate32\net\3.5\NHibernate.dll</HintPath>
<Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Iesi.Collections.3.2.0.4000\lib\Net35\Iesi.Collections.dll</HintPath>
</Reference>
<Reference Include="NHibernate, Version=3.2.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\NHibernate.3.2.0.4000\lib\Net35\NHibernate.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -234,7 +241,11 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.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.
<Target Name="BeforeBuild">

7
src/Spring/Spring.Data.NHibernate32/Spring.Data.NHibernate32.build
View File

@@ -14,6 +14,13 @@
<include name="**/*.dll" />
</fileset>
</copy>
<echo message="${iesi32.lib.dir}" />
<copy todir="${current.bin.dir}" overwrite="true">
<fileset basedir="${iesi32.lib.dir}">
<include name="**/*.dll" />
</fileset>
</copy>
<!-- build Spring.Data.NHibernate32 -->
<csc target="library" define="${current.build.defines.csc}"

5
src/Spring/Spring.Data.NHibernate32/packages.config Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net40" />
<package id="NHibernate" version="3.2.0.4000" targetFramework="net40" />
</packages>

15
src/Spring/Spring.Data.NHibernate33/Spring.Data.NHibernate33.2010.csproj
View File

@@ -31,6 +31,8 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -60,8 +62,13 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
</Reference>
<Reference Include="NHibernate">
<HintPath>..\..\..\lib\NHibernate33\net\3.5\NHibernate.dll</HintPath>
<Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Iesi.Collections.3.3.3.4001\lib\Net35\Iesi.Collections.dll</HintPath>
</Reference>
<Reference Include="NHibernate, Version=3.3.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\NHibernate.3.3.3.4001\lib\Net35\NHibernate.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -234,7 +241,11 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.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.
<Target Name="BeforeBuild">

6
src/Spring/Spring.Data.NHibernate33/Spring.Data.NHibernate33.build
View File

@@ -14,6 +14,12 @@
<include name="**/*.dll" />
</fileset>
</copy>
<echo message="${iesi33.lib.dir}" />
<copy todir="${current.bin.dir}" overwrite="true">
<fileset basedir="${iesi33.lib.dir}">
<include name="**/*.dll" />
</fileset>
</copy>
<!-- build Spring.Data.NHibernate33 -->
<csc target="library" define="${current.build.defines.csc}"

5
src/Spring/Spring.Data.NHibernate33/packages.config Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Iesi.Collections" version="3.3.3.4001" targetFramework="net40" />
<package id="NHibernate" version="3.3.3.4001" targetFramework="net40" />
</packages>

0
src/Spring/Spring.Scheduling.Quartz21/AssemblyInfo.cs → src/Spring/Spring.Scheduling.Quartz2/AssemblyInfo.cs
View File

0
src/Spring/Spring.Scheduling.Quartz21/JobMethodInvocationFailedException.cs → src/Spring/Spring.Scheduling.Quartz2/JobMethodInvocationFailedException.cs
View File

0
src/Spring/Spring.Scheduling.Quartz21/Scheduling/Quartz/AdaptableJobFactory.cs → src/Spring/Spring.Scheduling.Quartz2/Scheduling/Quartz/AdaptableJobFactory.cs
View File

0
src/Spring/Spring.Scheduling.Quartz21/Scheduling/Quartz/CronTriggerObject.cs → src/Spring/Spring.Scheduling.Quartz2/Scheduling/Quartz/CronTriggerObject.cs
View File

0
src/Spring/Spring.Scheduling.Quartz21/Scheduling/Quartz/DelegatingJob.cs → src/Spring/Spring.Scheduling.Quartz2/Scheduling/Quartz/DelegatingJob.cs
View File

0
src/Spring/Spring.Scheduling.Quartz21/Scheduling/Quartz/IJobDetailAwareTrigger.cs → src/Spring/Spring.Scheduling.Quartz2/Scheduling/Quartz/IJobDetailAwareTrigger.cs
View File

0
src/Spring/Spring.Scheduling.Quartz21/Scheduling/Quartz/ISchedulerContextAware.cs → src/Spring/Spring.Scheduling.Quartz2/Scheduling/Quartz/ISchedulerContextAware.cs
View File

0
src/Spring/Spring.Scheduling.Quartz21/Scheduling/Quartz/ISchedulingTaskExecutor.cs → src/Spring/Spring.Scheduling.Quartz2/Scheduling/Quartz/ISchedulingTaskExecutor.cs
View File

0
src/Spring/Spring.Scheduling.Quartz21/Scheduling/Quartz/ITaskExecutor.cs → src/Spring/Spring.Scheduling.Quartz2/Scheduling/Quartz/ITaskExecutor.cs
View File

0
src/Spring/Spring.Scheduling.Quartz21/Scheduling/Quartz/JobDetailObject.cs → src/Spring/Spring.Scheduling.Quartz2/Scheduling/Quartz/JobDetailObject.cs
View File

0
src/Spring/Spring.Scheduling.Quartz21/Scheduling/Quartz/LocalDataSourceJobStore.cs → src/Spring/Spring.Scheduling.Quartz2/Scheduling/Quartz/LocalDataSourceJobStore.cs
View File

0
src/Spring/Spring.Scheduling.Quartz21/Scheduling/Quartz/LocalTaskExecutorThreadPool.cs → src/Spring/Spring.Scheduling.Quartz2/Scheduling/Quartz/LocalTaskExecutorThreadPool.cs
View File

0
src/Spring/Spring.Scheduling.Quartz21/Scheduling/Quartz/MethodInvokingJob.cs → src/Spring/Spring.Scheduling.Quartz2/Scheduling/Quartz/MethodInvokingJob.cs
View File

0
src/Spring/Spring.Scheduling.Quartz21/Scheduling/Quartz/MethodInvokingJobDetailFactoryObject.cs → src/Spring/Spring.Scheduling.Quartz2/Scheduling/Quartz/MethodInvokingJobDetailFactoryObject.cs
View File

0
src/Spring/Spring.Scheduling.Quartz21/Scheduling/Quartz/MethodInvokingRunnable.cs → src/Spring/Spring.Scheduling.Quartz2/Scheduling/Quartz/MethodInvokingRunnable.cs
View File

0
src/Spring/Spring.Scheduling.Quartz21/Scheduling/Quartz/QuartzJobObject.cs → src/Spring/Spring.Scheduling.Quartz2/Scheduling/Quartz/QuartzJobObject.cs
View File

2
src/Spring/Spring.Scheduling.Quartz21/Scheduling/Quartz/SchedulerAccessor.cs → src/Spring/Spring.Scheduling.Quartz2/Scheduling/Quartz/SchedulerAccessor.cs
View File

@@ -349,7 +349,7 @@ namespace Spring.Scheduling.Quartz
{
if (overwriteExistingJobs || GetScheduler().GetJobDetail(jobDetail.Key) == null)
{
GetScheduler().AddJob(jobDetail, true);
GetScheduler().AddJob(jobDetail, true, true);
return true;
}
else

0
src/Spring/Spring.Scheduling.Quartz21/Scheduling/Quartz/SchedulerAccessorObject.cs → src/Spring/Spring.Scheduling.Quartz2/Scheduling/Quartz/SchedulerAccessorObject.cs
View File

0
src/Spring/Spring.Scheduling.Quartz21/Scheduling/Quartz/SchedulerFactoryObject.cs → src/Spring/Spring.Scheduling.Quartz2/Scheduling/Quartz/SchedulerFactoryObject.cs
View File

0
src/Spring/Spring.Scheduling.Quartz21/Scheduling/Quartz/SchedulingException.cs → src/Spring/Spring.Scheduling.Quartz2/Scheduling/Quartz/SchedulingException.cs
View File

0
src/Spring/Spring.Scheduling.Quartz21/Scheduling/Quartz/SimpleThreadPoolTaskExecutor.cs → src/Spring/Spring.Scheduling.Quartz2/Scheduling/Quartz/SimpleThreadPoolTaskExecutor.cs
View File

0
src/Spring/Spring.Scheduling.Quartz21/Scheduling/Quartz/SimpleTriggerObject.cs → src/Spring/Spring.Scheduling.Quartz2/Scheduling/Quartz/SimpleTriggerObject.cs
View File

0
src/Spring/Spring.Scheduling.Quartz21/Scheduling/Quartz/SpringDbProviderAdapter.cs → src/Spring/Spring.Scheduling.Quartz2/Scheduling/Quartz/SpringDbProviderAdapter.cs
View File

0
src/Spring/Spring.Scheduling.Quartz21/Scheduling/Quartz/SpringObjectJobFactory.cs → src/Spring/Spring.Scheduling.Quartz2/Scheduling/Quartz/SpringObjectJobFactory.cs
View File

0
src/Spring/Spring.Scheduling.Quartz21/Scheduling/Quartz/StatefulMethodInvokingJob.cs → src/Spring/Spring.Scheduling.Quartz2/Scheduling/Quartz/StatefulMethodInvokingJob.cs
View File

0
src/Spring/Spring.Scheduling.Quartz21/Scheduling/Quartz/TaskRejectedException.cs → src/Spring/Spring.Scheduling.Quartz2/Scheduling/Quartz/TaskRejectedException.cs
View File

20
src/Spring/Spring.Scheduling.Quartz21/Spring.Scheduling.Quartz21.2010.csproj → src/Spring/Spring.Scheduling.Quartz2/Spring.Scheduling.Quartz2.2010.csproj
View File

@@ -9,42 +9,44 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Spring</RootNamespace>
<AssemblyName>Spring.Scheduling.Quartz21</AssemblyName>
<AssemblyName>Spring.Scheduling.Quartz2</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
<TargetFrameworkProfile />
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\..\build\VS.NET.2010\Spring.Scheduling.Quartz21\Debug\</OutputPath>
<OutputPath>..\..\..\build\VS.NET.2010\Spring.Scheduling.Quartz2\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>..\..\..\build\VS.NET.2010\Spring.Scheduling.Quartz21\Debug\Spring.Scheduling.Quartz21.XML</DocumentationFile>
<DocumentationFile>..\..\..\build\VS.NET.2010\Spring.Scheduling.Quartz2\Debug\Spring.Scheduling.Quartz2.XML</DocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\..\build\VS.NET.2010\Spring.Scheduling.Quartz21\Release\</OutputPath>
<OutputPath>..\..\..\build\VS.NET.2010\Spring.Scheduling.Quartz2\Release\</OutputPath>
<DefineConstants>TRACE;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DocumentationFile>..\..\..\build\VS.NET.2010\Spring.Scheduling.Quartz21\Release\Spring.Scheduling.Quartz21.XML</DocumentationFile>
<DocumentationFile>..\..\..\build\VS.NET.2010\Spring.Scheduling.Quartz2\Release\Spring.Scheduling.Quartz2.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Common.Logging, Version=2.1.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\lib\Net\3.5\Common.Logging.dll</HintPath>
<HintPath>..\..\..\packages\Common.Logging.2.1.2\lib\net40\Common.Logging.dll</HintPath>
</Reference>
<Reference Include="Quartz">
<HintPath>..\..\..\lib\Quartz21\net\3.5\Quartz.dll</HintPath>
<HintPath>..\..\..\packages\Quartz.2.2.1\lib\net40\Quartz.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -90,7 +92,11 @@
<Name>Spring.Data.2010</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.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.
<Target Name="BeforeBuild">

6
src/Spring/Spring.Scheduling.Quartz21/Spring.Scheduling.Quartz21.build → src/Spring/Spring.Scheduling.Quartz2/Spring.Scheduling.Quartz2.build
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
<project name="Spring.Scheduling.Quartz21" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
<project name="Spring.Scheduling.Quartz2" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
<!--
Required properties:
* current.bin.dir - (path) root level to build to
@@ -8,9 +8,9 @@
-->
<target name="build">
<echo message="${quartz21.lib.dir}" />
<echo message="${quartz2.lib.dir}" />
<copy todir="${current.bin.dir}" overwrite="true">
<fileset basedir="${quartz21.lib.dir}">
<fileset basedir="${quartz2.lib.dir}">
<include name="**/*.dll" />
</fileset>
</copy>

33
src/Spring/Spring.Scheduling.Quartz2/Spring.Scheduling.Quartz2.nuspec Normal file
View File

@@ -0,0 +1,33 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Spring.Scheduling.Quartz2</id>
<projectUrl>http://www.springframework.net/</projectUrl>
<licenseUrl>http://www.springframework.net/license.html</licenseUrl>
<iconUrl>http://springframework.net/images/SpringSource_Leaves32x32.png</iconUrl>
<version>0.0.0</version>
<!-- this value is a placeholder replaced by build script -->
<authors>SpringSource</authors>
<description>Spring.NET Integration with the Quartz Scheduling Library 2.x</description>
<summary>
</summary>
<language>en-US</language>
<dependencies>
<dependency id="Common.Logging" version="2.1.2" />
<dependency id="Quartz" version="2.2.1" />
<dependency id="Spring.Core" version="2.0.0" />
<dependency id="Spring.Data" version="2.0.0" />
</dependencies>
</metadata>
<files>
<file src="build\net\3.5\release\Spring.Scheduling.Quartz2.dll" target="lib\net35" />
<file src="build\net\3.5\release\Spring.Scheduling.Quartz2.pdb" target="lib\net35" />
<file src="build\net\3.5\release\Spring.Scheduling.Quartz2.xml" target="lib\net35" />
<file src="build\net\4.0\release\Spring.Scheduling.Quartz2.dll" target="lib\net40" />
<file src="build\net\4.0\release\Spring.Scheduling.Quartz2.pdb" target="lib\net40" />
<file src="build\net\4.0\release\Spring.Scheduling.Quartz2.xml" target="lib\net40" />
<file src="build\net\4.5\release\Spring.Scheduling.Quartz2.dll" target="lib\net45" />
<file src="build\net\4.5\release\Spring.Scheduling.Quartz2.pdb" target="lib\net45" />
<file src="build\net\4.5\release\Spring.Scheduling.Quartz2.xml" target="lib\net45" />
</files>
</package>

5
src/Spring/Spring.Scheduling.Quartz2/packages.config Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Common.Logging" version="2.1.2" targetFramework="net40" />
<package id="Quartz" version="2.2.1" targetFramework="net40" />
</packages>

33
src/Spring/Spring.Scheduling.Quartz21/Spring.Scheduling.Quartz21.nuspec
View File

@@ -1,33 +0,0 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Spring.Scheduling.Quartz21</id>
<projectUrl>http://www.springframework.net/</projectUrl>
<licenseUrl>http://www.springframework.net/license.html</licenseUrl>
<iconUrl>http://springframework.net/images/SpringSource_Leaves32x32.png</iconUrl>
<version>0.0.0</version>
<!-- this value is a placeholder replaced by build script -->
<authors>SpringSource</authors>
<description>Spring.NET Integration with the Quartz Scheduling Library 2.0</description>
<summary>
</summary>
<language>en-US</language>
<dependencies>
<dependency id="Common.Logging" version="2.0" />
<dependency id="Quartz" version="2.0.0" />
<dependency id="Spring.Core" version="2.0.0" />
<dependency id="Spring.Data" version="2.0.0" />
</dependencies>
</metadata>
<files>
<file src="build\net\3.5\release\Spring.Scheduling.Quartz21.dll" target="lib\net35" />
<file src="build\net\3.5\release\Spring.Scheduling.Quartz21.pdb" target="lib\net35" />
<file src="build\net\3.5\release\Spring.Scheduling.Quartz21.xml" target="lib\net35" />
<file src="build\net\4.0\release\Spring.Scheduling.Quartz21.dll" target="lib\net40" />
<file src="build\net\4.0\release\Spring.Scheduling.Quartz21.pdb" target="lib\net40" />
<file src="build\net\4.0\release\Spring.Scheduling.Quartz21.xml" target="lib\net40" />
<file src="build\net\4.5\release\Spring.Scheduling.Quartz21.dll" target="lib\net45" />
<file src="build\net\4.5\release\Spring.Scheduling.Quartz21.pdb" target="lib\net45" />
<file src="build\net\4.5\release\Spring.Scheduling.Quartz21.xml" target="lib\net45" />
</files>
</package>

8
src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.2010.csproj
View File

@@ -16,6 +16,8 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -44,11 +46,11 @@
</Reference>
<Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\lib\NHibernate32\net\3.5\Iesi.Collections.dll</HintPath>
<HintPath>..\..\..\packages\Iesi.Collections.3.2.0.4000\lib\Net35\Iesi.Collections.dll</HintPath>
</Reference>
<Reference Include="NHibernate, Version=3.2.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\lib\NHibernate32\net\3.5\NHibernate.dll</HintPath>
<HintPath>..\..\..\packages\NHibernate.3.2.0.4000\lib\Net35\NHibernate.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -74,6 +76,7 @@
<Link>nant.xsd</Link>
</None>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj">
@@ -93,6 +96,7 @@
<Folder Include="Properties\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.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.
<Target Name="BeforeBuild">

6
src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.build
View File

@@ -15,6 +15,12 @@
<include name="**/*.dll" />
</fileset>
</copy>
<echo message="${iesi32.lib.dir}" />
<copy todir="${current.bin.dir}" overwrite="true">
<fileset basedir="${iesi32.lib.dir}">
<include name="**/*.dll" />
</fileset>
</copy>
<!-- build Spring.Data.NHibernate -->
<csc target="library" define="${current.build.defines.csc}"

5
src/Spring/Spring.Web.Conversation.NHibernate32/packages.config Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net40" />
<package id="NHibernate" version="3.2.0.4000" targetFramework="net40" />
</packages>

10
src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.2010.csproj
View File

@@ -16,6 +16,8 @@
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -44,11 +46,11 @@
</Reference>
<Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\lib\NHibernate33\net\3.5\Iesi.Collections.dll</HintPath>
<HintPath>..\..\..\packages\Iesi.Collections.3.3.3.4001\lib\Net35\Iesi.Collections.dll</HintPath>
</Reference>
<Reference Include="NHibernate, Version=3.3.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<Reference Include="NHibernate, Version=3.3.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\lib\NHibernate33\net\3.5\NHibernate.dll</HintPath>
<HintPath>..\..\..\packages\NHibernate.3.3.3.4001\lib\Net35\NHibernate.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -87,6 +89,7 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj">
@@ -106,6 +109,7 @@
<Folder Include="Properties\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.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.
<Target Name="BeforeBuild">

6
src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.build
View File

@@ -15,6 +15,12 @@
<include name="**/*.dll" />
</fileset>
</copy>
<echo message="${iesi33.lib.dir}" />
<copy todir="${current.bin.dir}" overwrite="true">
<fileset basedir="${iesi33.lib.dir}">
<include name="**/*.dll" />
</fileset>
</copy>
<!-- build Spring.Data.NHibernate -->
<csc target="library" define="${current.build.defines.csc}"

5
src/Spring/Spring.Web.Conversation.NHibernate33/packages.config Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Iesi.Collections" version="3.3.3.4001" targetFramework="net40" />
<package id="NHibernate" version="3.3.3.4001" targetFramework="net40" />
</packages>

34
src/Spring/Spring.Web.Mvc3/Spring.Web.Mvc3.2010.csproj
View File

@@ -13,6 +13,8 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -39,12 +41,38 @@
<HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Abstractions" />
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.Helpers.dll</HintPath>
</Reference>
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.AspNet.Mvc.3.0.20105.1\lib\net40\System.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Web.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.AspNet.Razor.1.0.20105.408\lib\net40\System.Web.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Web.Routing" />
<Reference Include="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages.Deployment, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
@@ -74,7 +102,11 @@
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.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.
<Target Name="BeforeBuild">

3
src/Spring/Spring.Web.Mvc3/Spring.Web.Mvc3.build
View File

@@ -48,8 +48,7 @@
<include name="${current.bin.dir}/Spring.Aop.dll" />
<include name="${current.bin.dir}/Spring.Web.dll" />
<include name="${programfiles}\Microsoft ASP.NET\ASP.NET MVC 3\Assemblies\System.Web.Mvc.dll" />
<include name="${programfilesx86}\Microsoft ASP.NET\ASP.NET MVC 3\Assemblies\System.Web.Mvc.dll" />
<include name="${spring.basedir}/packages/Microsoft.AspNet.Mvc.3.0.20105.1/lib/net40/System.Web.Mvc.dll" />
</references>
</csc>
</target>

8
src/Spring/Spring.Web.Mvc3/SpringMvcApplication.cs
View File

@@ -20,15 +20,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Web;
using System.Web.Mvc;
using Spring.Objects.Factory;
using Spring.Core.IO;
using Spring.Objects.Factory.Xml;
using System.Web.Routing;
using Spring.Context.Support;
namespace Spring.Web.Mvc

1
src/Spring/Spring.Web.Mvc3/SpringMvcDependencyResolver.cs
View File

@@ -1,5 +1,4 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Web.Mvc;

7
src/Spring/Spring.Web.Mvc3/packages.config Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.AspNet.Mvc" version="3.0.20105.1" targetFramework="net40" />
<package id="Microsoft.AspNet.Razor" version="1.0.20105.408" targetFramework="net40" />
<package id="Microsoft.AspNet.WebPages" version="1.0.20105.408" targetFramework="net40" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
</packages>

55
src/Spring/Spring.Web.Mvc4/Spring.Web.Mvc4.2010.csproj
View File

@@ -13,6 +13,8 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -39,14 +41,57 @@
<HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Net.Http, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http.WebRequest, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.WebRequest.dll</HintPath>
</Reference>
<Reference Include="System.Web" />
<Reference Include="System.Web.Abstractions" />
<Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll</HintPath>
</Reference>
<Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll</HintPath>
</Reference>
<Reference Include="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll</HintPath>
</Reference>
<Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\..\..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\..\..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Web.Routing" />
<Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
@@ -77,7 +122,11 @@
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.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.
<Target Name="BeforeBuild">

9
src/Spring/Spring.Web.Mvc4/Spring.Web.Mvc4.build
View File

@@ -48,12 +48,9 @@
<include name="${current.bin.dir}/Spring.Aop.dll" />
<include name="${current.bin.dir}/Spring.Web.dll" />
<include name="${programfiles}\Microsoft ASP.NET\ASP.NET MVC 4\Assemblies\System.Web.Mvc.dll" />
<include name="${programfilesx86}\Microsoft ASP.NET\ASP.NET MVC 4\Assemblies\System.Web.Mvc.dll" />
<include name="${programfiles}\Microsoft ASP.NET\ASP.NET MVC 4\Assemblies\System.Web.Http.dll" />
<include name="${programfilesx86}\Microsoft ASP.NET\ASP.NET MVC 4\Assemblies\System.Web.Http.dll" />
<include name="${programfiles}\Microsoft ASP.NET\ASP.NET MVC 4\Assemblies\System.Web.Http.WebHost.dll" />
<include name="${programfilesx86}\Microsoft ASP.NET\ASP.NET MVC 4\Assemblies\System.Web.Http.WebHost.dll" />
<include name="${spring.basedir}/packages/Microsoft.AspNet.Mvc.4.0.30506.0/lib/net40/System.Web.Mvc.dll" />
<include name="${spring.basedir}/packages/Microsoft.AspNet.WebApi.Core.4.0.30506.0/lib/net40/System.Web.Http.dll" />
<include name="${spring.basedir}/packages/Microsoft.AspNet.WebApi.WebHost.4.0.30506.0/lib/net40/System.Web.Http.WebHost.dll" />
</references>
</csc>

2
src/Spring/Spring.Web.Mvc4/SpringWebApiDependencyResolver.cs
View File

@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Web.Http.Dependencies;
using System.Web.Http.Services;
using Spring.Context;
using Spring.Context.Support;
using Spring.Core.IO;

12
src/Spring/Spring.Web.Mvc4/packages.config Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net40" />
<package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net40" />
<package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net40" />
<package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net40" />
<package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.30506.0" targetFramework="net40" />
<package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net40" />
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" />
</packages>