Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[3638] trunk/nhibernate/src/NHibernate.Test
|
From: <aye...@us...> - 2008-07-18 06:00:29
|
Revision: 3638
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3638&view=rev
Author: ayenderahien
Date: 2008-07-18 06:00:38 +0000 (Fri, 18 Jul 2008)
Log Message:
-----------
Applying patch from Will Shaver for NH-1291, Example.Create with anonymous objects
Adding test project modifications
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-2.0.csproj
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-2.0.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-2.0.csproj 2008-07-18 05:59:41 UTC (rev 3637)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-2.0.csproj 2008-07-18 06:00:38 UTC (rev 3638)
@@ -285,6 +285,9 @@
<Compile Include="NHSpecificTest\CriteriaFromHql\Person.cs" />
<Compile Include="NHSpecificTest\NH1077\A.cs" />
<Compile Include="NHSpecificTest\NH1077\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1291AnonExample\Home.cs" />
+ <Compile Include="NHSpecificTest\NH1291AnonExample\NH1291AnonExampleFixture.cs" />
+ <Compile Include="NHSpecificTest\NH1291AnonExample\Person.cs" />
<Compile Include="NHSpecificTest\NH1098\FilterParameterOrderFixture.cs" />
<Compile Include="NHSpecificTest\NH1098\Model.cs" />
<Compile Include="NHSpecificTest\NH1101\Domain.cs" />
@@ -1276,6 +1279,7 @@
<EmbeddedResource Include="NHSpecificTest\NH1098\Mappings.hbm.xml" />
</ItemGroup>
<ItemGroup>
+<<<<<<< .mine
<EmbeddedResource Include="NHSpecificTest\NH1297\Mappings.hbm.xml" />
</ItemGroup>
<ItemGroup>
@@ -1336,6 +1340,68 @@
<EmbeddedResource Include="NHSpecificTest\NH1284\Mappings.hbm.xml" />
</ItemGroup>
<ItemGroup>
+=======
+ <EmbeddedResource Include="NHSpecificTest\NH1291AnonExample\Mappings.hbm.xml" />
+ </ItemGroup>
+ <ItemGroup>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> .theirs
<Folder Include="Properties\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
@@ -1354,4 +1420,4 @@
if exist "$(ProjectDir)hibernate.cfg.xml" (copy "$(ProjectDir)hibernate.cfg.xml" "hibernate.cfg.xml")
copy /y "..\..\..\NHibernate.DomainModel\ABC.hbm.xml" "ABC.hbm.xml"</PostBuildEvent>
</PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj 2008-07-18 05:59:41 UTC (rev 3637)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj 2008-07-18 06:00:38 UTC (rev 3638)
@@ -282,12 +282,35 @@
<Compile Include="NHSpecificTest\BasicTimeFixture.cs" />
<Compile Include="NHSpecificTest\BugTestCase.cs" />
<Compile Include="NHSpecificTest\CollectionFixture.cs" />
+ <Compile Include="NHSpecificTest\NH1077\A.cs" />
+ <Compile Include="NHSpecificTest\NH1077\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1101\Domain.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="NHSpecificTest\NH1101\Fixture.cs">
+ <SubType>Code</SubType>
+ </Compile>
<Compile Include="NHSpecificTest\NH1144\Classes.cs" />
<Compile Include="NHSpecificTest\NH1144\Fixture.cs" />
<Compile Include="NHSpecificTest\CriteriaFromHql\Person.cs" />
<Compile Include="NHSpecificTest\CriteriaFromHql\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1284\Fixture.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="NHSpecificTest\NH1284\Model.cs">
+ <SubType>Code</SubType>
+ </Compile>
<Compile Include="NHSpecificTest\NH1290\AuxType.cs" />
<Compile Include="NHSpecificTest\NH1290\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1291AnonExample\Home.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="NHSpecificTest\NH1291AnonExample\NH1291AnonExampleFixture.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="NHSpecificTest\NH1291AnonExample\Person.cs">
+ <SubType>Code</SubType>
+ </Compile>
<Compile Include="NHSpecificTest\NH1301\Domain.cs" />
<Compile Include="NHSpecificTest\NH1301\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1313\A.cs" />
@@ -358,6 +381,21 @@
<Compile Include="NHSpecificTest\NH1332\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1347\A.cs" />
<Compile Include="NHSpecificTest\NH1347\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1355\Category.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="NHSpecificTest\NH1355\CustomVersionType.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="NHSpecificTest\NH1355\UserTypeTimestamp.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="NHSpecificTest\NH1362\Fixture.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="NHSpecificTest\NH1362\Model.cs">
+ <SubType>Code</SubType>
+ </Compile>
<Compile Include="NHSpecificTest\NH280\Fixture.cs" />
<Compile Include="NHSpecificTest\NH280\Foo.cs" />
<Compile Include="NHSpecificTest\NH1018\Employee.cs" />
@@ -368,6 +406,12 @@
<Compile Include="NHSpecificTest\NH1080\Domain.cs" />
<Compile Include="NHSpecificTest\NH1080\Fixture.cs" />
<Compile Include="NHSpecificTest\NH364\Invoice.cs" />
+ <Compile Include="NHSpecificTest\NH693\Fixture.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="NHSpecificTest\NH693\Something.cs">
+ <SubType>Code</SubType>
+ </Compile>
<Compile Include="NHSpecificTest\NH883\Cat.cs" />
<Compile Include="NHSpecificTest\NH883\Fixture.cs" />
<Compile Include="NHSpecificTest\Docs\Associations\BiM21\Address.cs" />
@@ -1249,6 +1293,29 @@
<EmbeddedResource Include="NHSpecificTest\NH1144\Mappings.hbm.xml" />
</ItemGroup>
<ItemGroup>
+ <EmbeddedResource Include="NHSpecificTest\NH1077\Mappings.hbm.xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="NHSpecificTest\NH1101\Mappings.hbm.xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="NHSpecificTest\NH1284\Mappings.hbm.xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="NHSpecificTest\NH1291AnonExample\Mappings.hbm.xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="NHSpecificTest\NH1355\Category.hbm.xml" />
+ <EmbeddedResource Include="NHSpecificTest\NH1355\CategoryTD.hbm.xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="NHSpecificTest\NH1362\Mappings.hbm.xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="NHSpecificTest\NH693\EmptyTableName.hbm.xml" />
+ <EmbeddedResource Include="NHSpecificTest\NH693\SpaceTableName.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.
|
