Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[4960] trunk/nhibernate
|
From: <ste...@us...> - 2010-03-17 16:26:40
|
Revision: 4960
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4960&view=rev
Author: steverstrong
Date: 2010-03-17 16:26:33 +0000 (Wed, 17 Mar 2010)
Log Message:
-----------
Fixed TestDatabaseSetup.build file
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.build
trunk/nhibernate/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.cs
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj
Property Changed:
----------------
trunk/nhibernate/
trunk/nhibernate/lib/net/3.5/
trunk/nhibernate/src/
trunk/nhibernate/src/NHibernate.ByteCode.Castle.Tests/
trunk/nhibernate/src/NHibernate.TestDatabaseSetup/
Property changes on: trunk/nhibernate
___________________________________________________________________
Modified: svn:ignore
- build
+ build
output
build.old
Property changes on: trunk/nhibernate/lib/net/3.5
___________________________________________________________________
Modified: svn:ignore
- NHibernate.dll
+ NHibernate.dll
Remotion.Data.Linq.pdb
Property changes on: trunk/nhibernate/src
___________________________________________________________________
Modified: svn:ignore
- *.suo
CloverSrc
_ReSharper*
*.resharperoptions
*.resharper.user
CloverBuild
Ankh.Load
*.resharper
ConsoleTest
_UpgradeReport_Files
NHibernate.userprefs
NHibernate.usertasks
UpgradeLog.XML
UpgradeLog2.XML
UpgradeLog3.XML
UpgradeLog4.XML
UpgradeLog5.XML
UpgradeLog6.XML
UpgradeLog7.XML
UpgradeLog8.XML
UpgradeLog9.XML
NHibernate.sln.proj
NHibernate.sln.AssemblySurfaceCache.user
NHibernate.sln.cache
.git
.gitignore
NHibernate.5.0.ReSharper.user
+ *.suo
CloverSrc
_ReSharper*
*.resharperoptions
*.resharper.user
CloverBuild
Ankh.Load
*.resharper
ConsoleTest
_UpgradeReport_Files
NHibernate.userprefs
NHibernate.usertasks
UpgradeLog.XML
UpgradeLog2.XML
UpgradeLog3.XML
UpgradeLog4.XML
UpgradeLog5.XML
UpgradeLog6.XML
UpgradeLog7.XML
UpgradeLog8.XML
UpgradeLog9.XML
NHibernate.sln.proj
NHibernate.sln.AssemblySurfaceCache.user
NHibernate.sln.cache
.git
.gitignore
NHibernate.5.0.ReSharper.user
LocalTestRun.testrunconfig
Property changes on: trunk/nhibernate/src/NHibernate.ByteCode.Castle.Tests
___________________________________________________________________
Modified: svn:ignore
- obj
.#*
*.user
*.xsx
AssemblyInfo.cs
hibernate.cfg.xml
*.aps
*.eto
[Bb]in
[Dd]ebug
[Rr]elease
*resharper*
*.xml
+ *.aps
*.eto
*.user
*.xml
*.xsx
*resharper*
.#*
AssemblyInfo.cs
[Bb]in
[Dd]ebug
[Rr]elease
bin
hibernate.cfg.xml
obj
Property changes on: trunk/nhibernate/src/NHibernate.TestDatabaseSetup
___________________________________________________________________
Added: svn:ignore
+ AssemblyInfo.cs
bin
obj
Added: trunk/nhibernate/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj (rev 0)
+++ trunk/nhibernate/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj 2010-03-17 16:26:33 UTC (rev 4960)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.30729</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{BEEC1564-6FB6-49F7-BBE5-8EBD2F0F6E8A}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>NHibernate.TestDatabaseSetup</RootNamespace>
+ <AssemblyName>NHibernate.TestDatabaseSetup</AssemblyName>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <StartupObject>
+ </StartupObject>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="nunit.framework, Version=2.5.0.9122, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\lib\net\3.5\nunit.framework.dll</HintPath>
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.Core">
+ <RequiredTargetFramework>3.5</RequiredTargetFramework>
+ </Reference>
+ <Reference Include="System.Data" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="TestDatabaseSetup.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="App.config" />
+ <None Include="TestDatabaseSetup.build" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\NHibernate\NHibernate.csproj">
+ <Project>{5909BFE7-93CF-4E5F-BE22-6293368AF01D}</Project>
+ <Name>NHibernate</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.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.build
===================================================================
--- trunk/nhibernate/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.build 2010-03-17 15:35:33 UTC (rev 4959)
+++ trunk/nhibernate/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.build 2010-03-17 16:26:33 UTC (rev 4960)
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<project name="NHibernate.Test" default="build" xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd">
+<project name="NHibernate.TestDatabaseSetup" default="build" xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd">
<property name="root.dir" value="../.." />
<property name="config.FileName" value="hibernate.cfg.xml" />
<include buildfile="${root.dir}/build-common/common-project.xml" />
@@ -14,15 +14,9 @@
<include name="NHibernate.dll" />
<include name="nunit.framework.dll" />
</assemblyfileset>
- <resourcefileset id="project.resources" prefix="NHibernate.Test" dynamicprefix="true">
- <include name="**/*.xml" />
- <exclude name="bin/**/*.xml" />
- </resourcefileset>
</target>
<target name="generate-assemblyinfo" depends="init common.generate-assemblyinfo" />
<target name="build" depends="init generate-assemblyinfo common.compile-tests">
-
-
<if test="${file::exists(config.FileName)}">
<copy file="hibernate.cfg.xml" tofile="${bin.dir}/hibernate.cfg.xml" />
</if>
Modified: trunk/nhibernate/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.cs 2010-03-17 15:35:33 UTC (rev 4959)
+++ trunk/nhibernate/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.cs 2010-03-17 16:26:33 UTC (rev 4960)
@@ -1,8 +1,8 @@
using System;
using NUnit.Framework;
-using Sql=System.Data.SqlClient;
+using System.Data.SqlClient;
-namespace NHibernate.TeamCity.TestDatabaseSetup
+namespace NHibernate.TestDatabaseSetup
{
[TestFixture]
public class DatabaseSetup
@@ -12,11 +12,11 @@
{
var cfg = new Cfg.Configuration();
- using (var conn = new Sql.SqlConnection(cfg.Properties["connection.connection_string"]))
+ using (var conn = new SqlConnection(cfg.Properties["connection.connection_string"]))
{
conn.Open();
- using (var cmd = new Sql.SqlCommand("use master", conn))
+ using (var cmd = new System.Data.SqlClient.SqlCommand("use master", conn))
{
cmd.ExecuteNonQuery();
@@ -37,3 +37,5 @@
}
}
}
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
