From: <te...@us...> - 2008-08-30 14:14:17
|
Revision: 3738 http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3738&view=rev Author: tehlike Date: 2008-08-30 14:14:27 +0000 (Sat, 30 Aug 2008) Log Message: ----------- Synchronizing 3.5 project with 2.0 Modified Paths: -------------- trunk/nhibernate/src/NHibernate/NHibernate-3.5.csproj trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj Modified: trunk/nhibernate/src/NHibernate/NHibernate-3.5.csproj =================================================================== --- trunk/nhibernate/src/NHibernate/NHibernate-3.5.csproj 2008-08-29 10:55:05 UTC (rev 3737) +++ trunk/nhibernate/src/NHibernate/NHibernate-3.5.csproj 2008-08-30 14:14:27 UTC (rev 3738) @@ -530,6 +530,7 @@ <Compile Include="Context\ICurrentSessionContext.cs" /> <Compile Include="Context\ManagedWebSessionContext.cs" /> <Compile Include="Context\MapBasedSessionContext.cs" /> + <Compile Include="Context\ThreadLocalSessionContext.cs" /> <Compile Include="Context\ThreadStaticSessionContext.cs" /> <Compile Include="Context\WebSessionContext.cs" /> <Compile Include="CriteriaTransformer.cs" /> @@ -641,6 +642,7 @@ <Compile Include="Dialect\Schema\MsSqlMetaData.cs" /> <Compile Include="Dialect\Schema\OracleMetaData.cs" /> <Compile Include="Dialect\Sybase11Dialect.cs" /> + <Compile Include="Driver\ASA10ClientDriver.cs" /> <Compile Include="Driver\ISqlParameterFormatter.cs" /> <Compile Include="Driver\SqlStringFormatter.cs" /> <Compile Include="EmptyInterceptor.cs" /> @@ -678,6 +680,9 @@ <Compile Include="Engine\Query\Sql\NativeSQLQueryRootReturn.cs" /> <Compile Include="Engine\Query\Sql\NativeSQLQueryScalarReturn.cs" /> <Compile Include="Engine\StatefulPersistenceContext.cs" /> + <Compile Include="Engine\TransactionHelper.cs" /> + <Compile Include="Engine\Transaction\IIsolatedWork.cs" /> + <Compile Include="Engine\Transaction\Isolater.cs" /> <Compile Include="Engine\TwoPhaseLoad.cs" /> <Compile Include="Engine\ValueInclusion.cs" /> <Compile Include="Engine\VersionValue.cs" /> @@ -792,6 +797,13 @@ <Compile Include="Exceptions\SQLStateConverter.cs" /> <Compile Include="FKUnmatchingColumnsException.cs" /> <Compile Include="Id\AbstractPostInsertGenerator.cs" /> + <Compile Include="Id\Enhanced\IAccessCallback.cs" /> + <Compile Include="Id\Enhanced\IDatabaseStructure.cs" /> + <Compile Include="Id\Enhanced\IOptimizer.cs" /> + <Compile Include="Id\Enhanced\OptimizerFactory.cs" /> + <Compile Include="Id\Enhanced\SequenceStructure.cs" /> + <Compile Include="Id\Enhanced\SequenceStyleGenerator.cs" /> + <Compile Include="Id\Enhanced\TableStructure.cs" /> <Compile Include="Id\Insert\AbstractReturningDelegate.cs"> <SubType>Code</SubType> </Compile> Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj =================================================================== --- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj 2008-08-29 10:55:05 UTC (rev 3737) +++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj 2008-08-30 14:14:27 UTC (rev 3738) @@ -26,7 +26,7 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <UseVSHostingProcess>false</UseVSHostingProcess> - <TreatWarningsAsErrors>true</TreatWarningsAsErrors> + <TreatWarningsAsErrors>false</TreatWarningsAsErrors> <NoWarn>618,612</NoWarn> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> @@ -72,11 +72,22 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> + <Compile Include="Any\Address.cs" /> + <Compile Include="Any\AnyTypeTest.cs" /> + <Compile Include="Any\ComplexPropertyValue.cs" /> + <Compile Include="Any\IntegerPropertyValue.cs" /> + <Compile Include="Any\IPropertyValue.cs" /> + <Compile Include="Any\Person.cs" /> + <Compile Include="Any\PropertySet.cs" /> + <Compile Include="Any\StringPropertyValue.cs" /> <Compile Include="Assertions\InheritedAreMarkedSerializable.cs" /> <Compile Include="Assertions\IsSerializable.cs" /> <Compile Include="CacheTest\CacheFixture.cs" /> <Compile Include="CacheTest\QueryCacheFixture.cs" /> <Compile Include="CacheTest\TimestamperFixture.cs" /> + <Compile Include="Cascade\Job.cs" /> + <Compile Include="Cascade\JobBatch.cs" /> + <Compile Include="Cascade\RefreshFixture.cs" /> <Compile Include="CfgTest\ConfigurationFixture.cs" /> <Compile Include="CfgTest\ConfigurationSchemaFixture.cs" /> <Compile Include="CfgTest\DefaultNsAssmFixture.cs" /> @@ -116,6 +127,9 @@ <Compile Include="Criteria\Student.cs" /> <Compile Include="Criteria\StudentDTO.cs" /> <Compile Include="DebugConnectionProvider.cs" /> + <Compile Include="Deletetransient\Address.cs" /> + <Compile Include="Deletetransient\DeleteTransientEntityTest.cs" /> + <Compile Include="Deletetransient\Person.cs" /> <Compile Include="DialectTest\DB2DialectFixture.cs" /> <Compile Include="DialectTest\DialectFixture.cs" /> <Compile Include="DialectTest\FirebirdDialectFixture.cs" /> @@ -125,7 +139,46 @@ <Compile Include="DriverTest\NullReferenceFixture.cs" /> <Compile Include="DriverTest\OracleClientDriverFixture.cs" /> <Compile Include="DriverTest\OracleDataClientDriverFixture.cs" /> + <Compile Include="DynamicEntity\Address.cs" /> + <Compile Include="DynamicEntity\Company.cs" /> + <Compile Include="DynamicEntity\Customer.cs" /> + <Compile Include="DynamicEntity\DataProxyHandler.cs" /> + <Compile Include="DynamicEntity\Interceptor\InterceptorDynamicEntity.cs" /> + <Compile Include="DynamicEntity\Interceptor\ProxyInterceptor.cs" /> + <Compile Include="DynamicEntity\IProxyMarker.cs" /> + <Compile Include="DynamicEntity\Person.cs" /> + <Compile Include="DynamicEntity\ProxyHelper.cs" /> + <Compile Include="DynamicEntity\Tuplizer\EntityNameInterceptor.cs" /> + <Compile Include="DynamicEntity\Tuplizer\MyEntityInstantiator.cs" /> + <Compile Include="DynamicEntity\Tuplizer\MyEntityTuplizer.cs" /> + <Compile Include="DynamicEntity\Tuplizer\TuplizerDynamicEntity.cs" /> <Compile Include="EngineTest\TypedValueFixture.cs" /> + <Compile Include="EntityModeTest\Map\Basic\DynamicClassFixture.cs" /> + <Compile Include="Events\Collections\AbstractCollectionEventFixture.cs" /> + <Compile Include="Events\Collections\AbstractParentWithCollection.cs" /> + <Compile Include="Events\Collections\Association\AbstractAssociationCollectionEventFixture.cs" /> + <Compile Include="Events\Collections\Association\Bidirectional\ManyToMany\BidirectionalManyToManyBagToSetCollectionEventFixture.cs" /> + <Compile Include="Events\Collections\Association\Bidirectional\ManyToMany\BidirectionalManyToManySetToSetCollectionEventFixture.cs" /> + <Compile Include="Events\Collections\Association\Bidirectional\ManyToMany\ChildWithBidirectionalManyToMany.cs" /> + <Compile Include="Events\Collections\Association\Bidirectional\ManyToMany\ParentWithBidirectionalManyToMany.cs" /> + <Compile Include="Events\Collections\Association\Bidirectional\OneToMany\BidirectionalOneToManyBagCollectionEventFixture.cs" /> + <Compile Include="Events\Collections\Association\Bidirectional\OneToMany\BidirectionalOneToManyBagSubclassCollectionEventFixture.cs" /> + <Compile Include="Events\Collections\Association\Bidirectional\OneToMany\BidirectionalOneToManySetCollectionEventFixture.cs" /> + <Compile Include="Events\Collections\Association\Bidirectional\OneToMany\ChildWithManyToOne.cs" /> + <Compile Include="Events\Collections\Association\Bidirectional\OneToMany\ParentWithBidirectionalOneToMany.cs" /> + <Compile Include="Events\Collections\Association\Bidirectional\OneToMany\ParentWithBidirectionalOneToManySubclass.cs" /> + <Compile Include="Events\Collections\Association\Unidirectional\ManyToMany\UnidirectionalManyToManyBagCollectionEventFixture.cs" /> + <Compile Include="Events\Collections\Association\Unidirectional\OneToMany\UnidirectionalOneToManyBagCollectionEventFixture.cs" /> + <Compile Include="Events\Collections\Association\Unidirectional\OneToMany\UnidirectionalOneToManySetCollectionEventFixture.cs" /> + <Compile Include="Events\Collections\Association\Unidirectional\ParentWithCollectionOfEntities.cs" /> + <Compile Include="Events\Collections\ChildEntity.cs" /> + <Compile Include="Events\Collections\ChildValue.cs" /> + <Compile Include="Events\Collections\CollectionListeners.cs" /> + <Compile Include="Events\Collections\IChild.cs" /> + <Compile Include="Events\Collections\IEntity.cs" /> + <Compile Include="Events\Collections\IParentWithCollection.cs" /> + <Compile Include="Events\Collections\Values\ParentWithCollectionOfValues.cs" /> + <Compile Include="Events\Collections\Values\ValuesBagCollectionEventFixture.cs" /> <Compile Include="ExceptionsTest\PropertyAccessExceptionFixture.cs" /> <Compile Include="ExpressionTest\BaseExpressionFixture.cs" /> <Compile Include="ExpressionTest\BetweenExpressionFixture.cs" /> @@ -147,6 +200,11 @@ <Compile Include="ExpressionTest\SQLExpressionFixture.cs" /> <Compile Include="ExpressionTest\SubQueries\Classes.cs" /> <Compile Include="ExpressionTest\SubQueries\SubQueriesSqlFixture.cs" /> + <Compile Include="Extralazy\Document.cs" /> + <Compile Include="Extralazy\ExtraLazyFixture.cs" /> + <Compile Include="Extralazy\Group.cs" /> + <Compile Include="Extralazy\SessionAttribute.cs" /> + <Compile Include="Extralazy\User.cs" /> <Compile Include="FilterTest\BinaryFiltered.cs" /> <Compile Include="FilterTest\Category.cs" /> <Compile Include="FilterTest\Department.cs" /> @@ -200,6 +258,7 @@ <Compile Include="HQLFunctionTest\SQLFunctionTemplateTest.cs" /> <Compile Include="BulkManipulation\NativeSQLBulkOperations.cs" /> <Compile Include="BulkManipulation\Vehicles.cs" /> + <Compile Include="IdGen\Enhanced\SequenceStyleConfigUnitFixture.cs" /> <Compile Include="IdTest\HiLoInt16Class.cs" /> <Compile Include="IdTest\HiLoInt32Class.cs" /> <Compile Include="IdTest\HiLoInt64Class.cs" /> @@ -267,6 +326,10 @@ <Compile Include="MultipleCollectionFetchTest\MultipleSetFetchFixture.cs" /> <Compile Include="MultipleCollectionFetchTest\Person.cs" /> <Compile Include="MultiThreadRunner.cs" /> + <Compile Include="Naturalid\Immutable\ImmutableNaturalIdFixture.cs" /> + <Compile Include="Naturalid\Immutable\User.cs" /> + <Compile Include="Naturalid\Mutable\MutableNaturalIdFixture.cs" /> + <Compile Include="Naturalid\Mutable\User.cs" /> <Compile Include="NHAssert.cs" /> <Compile Include="NHibernateUtilTest.cs" /> <Compile Include="NHSpecificTest\AliasFixture.cs" /> @@ -1320,6 +1383,29 @@ <EmbeddedResource Include="NHSpecificTest\NH1253\Mappings.hbm.xml" /> </ItemGroup> <ItemGroup> + <EmbeddedResource Include="Any\Person.hbm.xml" /> + <EmbeddedResource Include="Any\Properties.hbm.xml" /> + <EmbeddedResource Include="Cascade\Job.hbm.xml" /> + <EmbeddedResource Include="Cascade\JobBatch.hbm.xml" /> + <EmbeddedResource Include="Deletetransient\Person.hbm.xml" /> + <EmbeddedResource Include="DynamicEntity\Interceptor\Customer.hbm.xml" /> + <EmbeddedResource Include="DynamicEntity\Tuplizer\Customer.hbm.xml" /> + <EmbeddedResource Include="EntityModeTest\Map\Basic\ProductLine.hbm.xml" /> + <EmbeddedResource Include="Events\Collections\Association\Bidirectional\ManyToMany\BidirectionalManyToManyBagToSetMapping.hbm.xml" /> + <EmbeddedResource Include="Events\Collections\Association\Bidirectional\ManyToMany\BidirectionalManyToManySetToSetMapping.hbm.xml" /> + <EmbeddedResource Include="Events\Collections\Association\Bidirectional\OneToMany\BidirectionalOneToManyBagMapping.hbm.xml" /> + <EmbeddedResource Include="Events\Collections\Association\Bidirectional\OneToMany\BidirectionalOneToManyBagSubclassMapping.hbm.xml" /> + <EmbeddedResource Include="Events\Collections\Association\Bidirectional\OneToMany\BidirectionalOneToManySetMapping.hbm.xml" /> + <EmbeddedResource Include="Events\Collections\Association\Unidirectional\ManyToMany\UnidirectionalManyToManyBagMapping.hbm.xml" /> + <EmbeddedResource Include="Events\Collections\Association\Unidirectional\OneToMany\UnidirectionalOneToManyBagMapping.hbm.xml" /> + <EmbeddedResource Include="Events\Collections\Association\Unidirectional\OneToMany\UnidirectionalOneToManySetMapping.hbm.xml" /> + <EmbeddedResource Include="Events\Collections\Values\ValuesBagMapping.hbm.xml" /> + <EmbeddedResource Include="Extralazy\UserGroup.hbm.xml" /> + <EmbeddedResource Include="Naturalid\Immutable\User.hbm.xml" /> + <EmbeddedResource Include="Naturalid\Mutable\User.hbm.xml" /> + <EmbeddedResource Include="TypeParameters\Typedef.hbm.xml" /> + </ItemGroup> + <ItemGroup> <Folder Include="Properties\" /> <Folder Include="Unionsubclass2\" /> </ItemGroup> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |