[Nhibernate-commit] SF.net SVN: nhibernate:[3641] trunk/nhibernate/src/NHibernate.Test

[<fab...@us...>]

Revision: 3641
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3641&view=rev
Author:   fabiomaulo
Date:     2008-07-19 14:07:03 +0000 (Sat, 19 Jul 2008)

Log Message:
-----------
Make Test prj compilable in VS2005

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-2.0.csproj

Property Changed:
----------------
    trunk/nhibernate/src/NHibernate.Test/


Property changes on: trunk/nhibernate/src/NHibernate.Test
___________________________________________________________________
Modified: svn:ignore
   - bin
obj
.#*
*.user
*.xsx
AssemblyInfo.cs
hibernate.cfg.xml
Debug
Release
*.aps
*.eto
[Bb]in
[Dd]ebug
[Rr]elease

   + bin
obj
.#*
*.user
*.xsx
AssemblyInfo.cs
hibernate.cfg.xml
Debug
Release
*.aps
*.eto
[Bb]in
[Dd]ebug
[Rr]elease
*resharper*


Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-2.0.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-2.0.csproj	2008-07-18 07:32:56 UTC (rev 3640)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-2.0.csproj	2008-07-19 14:07:03 UTC (rev 3641)
@@ -285,9 +285,6 @@
     <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" />
@@ -350,6 +347,9 @@
     <Compile Include="NHSpecificTest\NH1284\Model.cs" />
     <Compile Include="NHSpecificTest\NH1290\AuxType.cs" />
     <Compile Include="NHSpecificTest\NH1290\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1291AnonExample\Home.cs" />
+    <Compile Include="NHSpecificTest\NH1291AnonExample\NH1291AnonExampleFixture.cs" />
+    <Compile Include="NHSpecificTest\NH1291AnonExample\Person.cs" />
     <Compile Include="NHSpecificTest\NH1297\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH1297\Model.cs" />
     <Compile Include="NHSpecificTest\NH1301\Domain.cs">
@@ -1281,7 +1281,6 @@
     <EmbeddedResource Include="NHSpecificTest\NH1098\Mappings.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
-<<<<<<< .mine
     <EmbeddedResource Include="NHSpecificTest\NH1297\Mappings.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
@@ -1343,68 +1342,9 @@
     <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" />
@@ -1423,4 +1363,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>
+</Project>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.