diff --git a/DataFresh.Common/DataFresh.Common.csproj b/DataFresh.Common/DataFresh.Common.csproj
index 7f4e12d..d01ebfc 100644
--- a/DataFresh.Common/DataFresh.Common.csproj
+++ b/DataFresh.Common/DataFresh.Common.csproj
@@ -1,119 +1,129 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ Local
+ 8.0.30319
+ 2.0
+ {0BAA8852-1597-43BB-AF78-BABA707D4D86}
+ Debug
+ AnyCPU
+
+
+ DataFresh.Common
+
+ JScript
+ Grid
+ IE50
+ false
+ Library
+ DataFresh.Common
+ OnBuildSuccess
+
+
+
+ v2.0
+ 0.0
+
+ publish\
+ true
+ Disk
+ false
+ Foreground
+ 7
+ Days
+ false
+ false
+ true
+ 0
+ 1.0.0.%2a
+ false
+ false
+ true
+
+
+ bin\Debug\
+ false
+ 285212672
+ false
+
+ DEBUG;TRACE
+
+ true
+ 4096
+ false
+
+ false
+ false
+ false
+ false
+ 4
+ full
+ prompt
+ AllRules.ruleset
+
+
+ bin\Release\
+ false
+ 285212672
+ false
+
+ TRACE
+
+ false
+ 4096
+ false
+
+ true
+ false
+ false
+ false
+ 4
+ none
+ prompt
+ AllRules.ruleset
+
+
+
+ System
+
+
+ System.Data
+
+
+ System.XML
+
+
+
+
+ Code
+
+
+
+
+
+
+
+
+
+
+ False
+ .NET Framework 3.5 SP1 Client Profile
+ false
+
+
+ False
+ .NET Framework 3.5 SP1
+ true
+
+
+ False
+ Windows Installer 3.1
+ true
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/DataFresh/DataFresh.csproj b/DataFresh/DataFresh.csproj
index 5b817ee..e8a7c88 100644
--- a/DataFresh/DataFresh.csproj
+++ b/DataFresh/DataFresh.csproj
@@ -1,132 +1,141 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ Local
+ 8.0.30319
+ 2.0
+ {05438358-2120-4D97-974E-ACF80F7EA6F7}
+ Debug
+ AnyCPU
+
+
+ DataFresh
+
+ JScript
+ Grid
+ IE50
+ false
+ Library
+ DataFresh
+ OnBuildSuccess
+
+
+
+ v2.0
+ 0.0
+
+ publish\
+ true
+ Disk
+ false
+ Foreground
+ 7
+ Days
+ false
+ false
+ true
+ 0
+ 1.0.0.%2a
+ false
+ false
+ true
+
+
+ bin\Debug\
+ false
+ 285212672
+ false
+
+ DEBUG;TRACE
+
+ true
+ 4096
+ false
+
+ false
+ false
+ false
+ false
+ 4
+ full
+ prompt
+ AllRules.ruleset
+
+
+ bin\Release\
+ false
+ 285212672
+ false
+
+ TRACE
+
+ true
+ 4096
+ false
+
+ true
+ false
+ false
+ false
+ 4
+ full
+ prompt
+ AllRules.ruleset
+
+
+
+ System
+
+
+ System.Data
+
+
+ System.XML
+
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+
+
+
+
+ False
+ .NET Framework 3.5 SP1 Client Profile
+ false
+
+
+ False
+ .NET Framework 3.5 SP1
+ true
+
+
+ False
+ Windows Installer 3.1
+ true
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/DataFresh/Resources/PrepareDataFresh.sql b/DataFresh/Resources/PrepareDataFresh.sql
index 9c49153..aca4761 100644
--- a/DataFresh/Resources/PrepareDataFresh.sql
+++ b/DataFresh/Resources/PrepareDataFresh.sql
@@ -62,7 +62,7 @@ AS
-- Delete All data from Changed Tables and Refill
DECLARE ChangedTable_Cursor CURSOR FOR
- SELECT [tablename] FROM #ChangedTables WHERE tablename not in('df_ChangeTracking', 'dr_DeltaVersion')
+ SELECT [tablename] FROM #ChangedTables WHERE tablename not in('dbo.df_ChangeTracking', 'dbo.dr_DeltaVersion')
OPEN ChangedTable_Cursor
FETCH NEXT FROM ChangedTable_Cursor INTO @TableName
@@ -72,7 +72,7 @@ AS
SET @sql = N'DELETE [' + @TableName + ']; DELETE df_ChangeTracking WHERE TableName=''' + @TableName + ''''
EXEC sp_executesql @sql
- SET @sql = N'IF(SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE table_name = ''' + @TableName + ''' AND IDENT_SEED(TABLE_NAME) IS NOT NULL) > 0
+ SET @sql = N'IF(SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE table_schema + ''.'' + table_name = ''' + @TableName + ''' AND IDENT_SEED(TABLE_NAME) IS NOT NULL) > 0
BEGIN
DBCC CHECKIDENT ([' + @TableName + '], RESEED, 0)
END'
@@ -120,28 +120,29 @@ AS
DECLARE @sql NVARCHAR(4000)
DECLARE @TableName VARCHAR(255)
+ DECLARE @TableSchema VARCHAR(255)
DECLARE Table_Cursor CURSOR FOR
- SELECT [table_name] FROM information_schema.tables WHERE table_type = 'BASE TABLE'
+ SELECT [table_name], [table_schema] FROM information_schema.tables WHERE table_type = 'BASE TABLE'
OPEN Table_Cursor
- FETCH NEXT FROM Table_Cursor INTO @TableName
+ FETCH NEXT FROM Table_Cursor INTO @TableName, @TableSchema
WHILE (@@Fetch_Status = 0)
BEGIN
- SET @sql = N'IF EXISTS (SELECT * FROM dbo.SYSOBJECTS WHERE ID = Object_ID(N''[dbo].[trig_df_ChangeTracking_' + @TableName + ']'') AND OBJECTPROPERTY(ID, N''IsTrigger'') = 1)
- DROP TRIGGER [dbo].[trig_df_ChangeTracking_' + @TableName + ']'
+ SET @sql = N'IF EXISTS (SELECT * FROM dbo.SYSOBJECTS WHERE ID = Object_ID(N''[' + @TableSchema + '].[trig_df_ChangeTracking_' + @TableName + ']'') AND OBJECTPROPERTY(ID, N''IsTrigger'') = 1)
+ DROP TRIGGER [' + @TableSchema + '].[trig_df_ChangeTracking_' + @TableName + ']'
EXEC sp_executesql @sql
- SET @sql = N'CREATE TRIGGER [dbo].[trig_df_ChangeTracking_' + @TableName + '] on [' + @TableName + '] for insert, update, delete
+ SET @sql = N'CREATE TRIGGER [' + @TableSchema + '].[trig_df_ChangeTracking_' + @TableName + '] on [' + @TableSchema + '].[' + @TableName + '] for insert, update, delete
as
SET NOCOUNT ON
- INSERT INTO df_ChangeTracking (tablename) VALUES (''' + @TableName + ''')
+ INSERT INTO df_ChangeTracking (tablename) VALUES (''' + @TableSchema + '.' + @TableName + ''')
SET NOCOUNT OFF'
EXEC sp_executesql @sql
- FETCH NEXT FROM Table_Cursor INTO @TableName
+ FETCH NEXT FROM Table_Cursor INTO @TableName, @TableSchema
END
CLOSE Table_Cursor
@@ -163,7 +164,7 @@ AS
DECLARE @CMD NVARCHAR(4000)
DECLARE Table_Cursor CURSOR FOR
- SELECT N'bcp "' + DB_NAME() + '.dbo.[' + Table_Name + ']" out "' + @BasePath + Table_Name + '.df" -n -k -E -C 1252 -S ' + @@ServerName + ' -T' FROM Information_Schema.tables WHERE table_type = 'BASE TABLE'
+ SELECT N'bcp "' + DB_NAME() + '.[' + Table_Schema + '].[' + Table_Name + ']" out "' + @BasePath + Table_Schema + '.' + Table_Name + '.df" -n -k -E -C 1252 -S ' + @@ServerName + ' -T' FROM Information_Schema.tables WHERE table_type = 'BASE TABLE'
OPEN Table_Cursor
FETCH NEXT FROM Table_Cursor INTO @CMD
@@ -187,39 +188,40 @@ AS
DECLARE @sql NVARCHAR(4000)
DECLARE @TableName VARCHAR(255)
+ DECLARE @TableSchema VARCHAR(255)
- SELECT Table_Name as TableName INTO #UserTables FROM Information_Schema.tables WHERE table_type = 'BASE TABLE'
+ SELECT Table_Name as TableName, Table_Schema as TableSchema INTO #UserTables FROM Information_Schema.tables WHERE table_type = 'BASE TABLE'
DECLARE Table_Cursor INSENSITIVE SCROLL CURSOR FOR
- SELECT [tablename] FROM #UserTables
+ SELECT [tablename], [tableschema] FROM #UserTables
OPEN Table_Cursor
-- Deactivate Constrains for tables referencing changed tables
- FETCH NEXT FROM Table_Cursor INTO @TableName
+ FETCH NEXT FROM Table_Cursor INTO @TableName, @TableSchema
WHILE (@@Fetch_Status = 0)
BEGIN
- SET @sql = N'Alter Table [' + @TableName + '] NOCHECK CONSTRAINT ALL'
+ SET @sql = N'Alter Table [' + @TableSchema + '].[' + @TableName + '] NOCHECK CONSTRAINT ALL'
EXEC sp_executesql @sql
- FETCH NEXT FROM Table_Cursor INTO @TableName
+ FETCH NEXT FROM Table_Cursor INTO @TableName, @TableSchema
END
-- Delete All data from Changed Tables and Refill
DECLARE UserTable_Cursor CURSOR FOR
- SELECT [tablename] FROM #UserTables WHERE tablename not in ('df_ChangeTracking', 'dr_DeltaVersion')
+ SELECT [tablename], [tableschema] FROM #UserTables WHERE tablename not in ('df_ChangeTracking', 'dr_DeltaVersion') and tableschema <> 'dbo'
OPEN UserTable_Cursor
- FETCH NEXT FROM UserTable_Cursor INTO @TableName
+ FETCH NEXT FROM UserTable_Cursor INTO @TableName, @TableSchema
WHILE (@@Fetch_Status = 0)
BEGIN
- PRINT @TableName
- SET @sql = N'DELETE [' + @TableName + ']'
+ PRINT @TableSchema + '.' + @TableName
+ SET @sql = N'DELETE [' + @TableSchema + '].[' + @TableName + ']'
EXEC sp_executesql @sql
- SET @sql = N'BULK INSERT [' + @TableName + ']
+ SET @sql = N'BULK INSERT [' + @TableSchema + '].[' + @TableName + ']
FROM ''' + @BasePath + @TableName + '.df''
WITH
(
@@ -229,20 +231,20 @@ AS
)'
EXEC sp_executesql @sql
- FETCH NEXT FROM UserTable_Cursor INTO @TableName
+ FETCH NEXT FROM UserTable_Cursor INTO @TableName, @TableSchema
END
CLOSE UserTable_Cursor
DEALLOCATE UserTable_Cursor
-- ReEnable Constrants for All Tables
- FETCH FIRST FROM Table_Cursor INTO @TableName
+ FETCH FIRST FROM Table_Cursor INTO @TableName, @TableSchema
WHILE (@@Fetch_Status = 0)
BEGIN
- SET @sql = N'Alter Table [' + @TableName + '] CHECK CONSTRAINT ALL'
+ SET @sql = N'Alter Table [' + @TableSchema + '].[' + @TableName + '] CHECK CONSTRAINT ALL'
EXEC sp_executesql @sql
- FETCH NEXT FROM Table_Cursor INTO @TableName
+ FETCH NEXT FROM Table_Cursor INTO @TableName, @TableSchema
END
CLOSE Table_Cursor
@@ -254,21 +256,22 @@ CREATE PROCEDURE dbo.[df_ChangeTrackingTriggerRemove]
AS
DECLARE @sql NVARCHAR(4000)
DECLARE @TableName VARCHAR(255)
+ DECLARE @TableSchema VARCHAR(255)
DECLARE Table_Cursor CURSOR FOR
- SELECT [table_name] FROM information_schema.tables WHERE table_type = 'BASE TABLE'
+ SELECT [table_name], [table_schema] FROM information_schema.tables WHERE table_type = 'BASE TABLE'
OPEN Table_Cursor
- FETCH NEXT FROM Table_Cursor INTO @TableName
+ FETCH NEXT FROM Table_Cursor INTO @TableName, @TableSchema
WHILE (@@Fetch_Status = 0)
BEGIN
- SET @sql = N'IF EXISTS (SELECT * FROM DBO.SYSOBJECTS WHERE ID = Object_ID(N''[dbo].[trig_df_ChangeTracking_' + @TableName + ']'') AND OBJECTPROPERTY(ID, N''IsTrigger'') = 1)
- DROP TRIGGER [dbo].[trig_df_ChangeTracking_' + @TableName + ']'
+ SET @sql = N'IF EXISTS (SELECT * FROM DBO.SYSOBJECTS WHERE ID = Object_ID(N''[' + @TableSchema + '].[trig_df_ChangeTracking_' + @TableName + ']'') AND OBJECTPROPERTY(ID, N''IsTrigger'') = 1)
+ DROP TRIGGER [' + @TableSchema + '].[trig_df_ChangeTracking_' + @TableName + ']'
EXEC sp_executesql @sql
- FETCH NEXT FROM Table_Cursor INTO @TableName
+ FETCH NEXT FROM Table_Cursor INTO @TableName, @TableSchema
END
CLOSE Table_Cursor
diff --git a/DataFreshUtil/DataFreshUtil.csproj b/DataFreshUtil/DataFreshUtil.csproj
index 7b6e37b..f6d4f6f 100644
--- a/DataFreshUtil/DataFreshUtil.csproj
+++ b/DataFreshUtil/DataFreshUtil.csproj
@@ -1,109 +1,132 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ Local
+ 8.0.30319
+ 2.0
+ {D1044AB1-AB58-42E3-A37B-4099116982A5}
+ Debug
+ AnyCPU
+ App.ico
+
+ DataFreshUtil
+
+ JScript
+ Grid
+ IE50
+ false
+ Exe
+ DataFreshUtil
+ OnBuildSuccess
+
+
+
+ v2.0
+ 0.0
+
+ publish\
+ true
+ Disk
+ false
+ Foreground
+ 7
+ Days
+ false
+ false
+ true
+ 0
+ 1.0.0.%2a
+ false
+ false
+ true
+
+
+ bin\Debug\
+ false
+ 285212672
+ false
+
+ DEBUG;TRACE
+
+ true
+ 4096
+ false
+
+ false
+ false
+ false
+ false
+ 4
+ full
+ prompt
+ AllRules.ruleset
+
+
+ bin\Release\
+ false
+ 285212672
+ false
+
+ TRACE
+
+ false
+ 4096
+ false
+
+ true
+ false
+ false
+ false
+ 4
+ none
+ prompt
+ AllRules.ruleset
+
+
+
+ DataFresh
+ {05438358-2120-4D97-974E-ACF80F7EA6F7}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+
+
+ System
+
+
+ System.Data
+
+
+ System.XML
+
+
+
+
+ Code
+
+
+ Code
+
+
+
+
+
+ False
+ .NET Framework 3.5 SP1 Client Profile
+ false
+
+
+ False
+ .NET Framework 3.5 SP1
+ true
+
+
+ False
+ Windows Installer 3.1
+ true
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/EntropyZero DataFresh Solution.sln b/EntropyZero DataFresh Solution.sln
index 8a9727a..fe6f735 100644
--- a/EntropyZero DataFresh Solution.sln
+++ b/EntropyZero DataFresh Solution.sln
@@ -1,51 +1,41 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataFresh", "DataFresh\DataFresh.csproj", "{05438358-2120-4D97-974E-ACF80F7EA6F7}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestHarnessExample", "TestHarnessExample\TestHarnessExample.csproj", "{D688D8F0-3CDE-4C39-BF81-ED8C210C8F8E}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testing.DataFresh", "Testing.DataFresh\Testing.DataFresh.csproj", "{3E910EED-904F-4A52-A611-9278B682EFD3}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataFreshUtil", "DataFreshUtil\DataFreshUtil.csproj", "{D1044AB1-AB58-42E3-A37B-4099116982A5}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataFresh.Common", "DataFresh.Common\DataFresh.Common.csproj", "{0BAA8852-1597-43BB-AF78-BABA707D4D86}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfiguration) = preSolution
- Debug = Debug
- Release = Release
- EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {05438358-2120-4D97-974E-ACF80F7EA6F7}.Debug.ActiveCfg = Debug|.NET
- {05438358-2120-4D97-974E-ACF80F7EA6F7}.Debug.Build.0 = Debug|.NET
- {05438358-2120-4D97-974E-ACF80F7EA6F7}.Release.ActiveCfg = Release|.NET
- {05438358-2120-4D97-974E-ACF80F7EA6F7}.Release.Build.0 = Release|.NET
- {D688D8F0-3CDE-4C39-BF81-ED8C210C8F8E}.Debug.ActiveCfg = Debug|.NET
- {D688D8F0-3CDE-4C39-BF81-ED8C210C8F8E}.Debug.Build.0 = Debug|.NET
- {D688D8F0-3CDE-4C39-BF81-ED8C210C8F8E}.Release.ActiveCfg = Release|.NET
- {D688D8F0-3CDE-4C39-BF81-ED8C210C8F8E}.Release.Build.0 = Release|.NET
- {3E910EED-904F-4A52-A611-9278B682EFD3}.Debug.ActiveCfg = Debug|.NET
- {3E910EED-904F-4A52-A611-9278B682EFD3}.Debug.Build.0 = Debug|.NET
- {3E910EED-904F-4A52-A611-9278B682EFD3}.Release.ActiveCfg = Release|.NET
- {3E910EED-904F-4A52-A611-9278B682EFD3}.Release.Build.0 = Release|.NET
- {D1044AB1-AB58-42E3-A37B-4099116982A5}.Debug.ActiveCfg = Debug|.NET
- {D1044AB1-AB58-42E3-A37B-4099116982A5}.Debug.Build.0 = Debug|.NET
- {D1044AB1-AB58-42E3-A37B-4099116982A5}.Release.ActiveCfg = Release|.NET
- {D1044AB1-AB58-42E3-A37B-4099116982A5}.Release.Build.0 = Release|.NET
- {0BAA8852-1597-43BB-AF78-BABA707D4D86}.Debug.ActiveCfg = Debug|.NET
- {0BAA8852-1597-43BB-AF78-BABA707D4D86}.Release.ActiveCfg = Release|.NET
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataFresh", "DataFresh\DataFresh.csproj", "{05438358-2120-4D97-974E-ACF80F7EA6F7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestHarnessExample", "TestHarnessExample\TestHarnessExample.csproj", "{D688D8F0-3CDE-4C39-BF81-ED8C210C8F8E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testing.DataFresh", "Testing.DataFresh\Testing.DataFresh.csproj", "{3E910EED-904F-4A52-A611-9278B682EFD3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataFreshUtil", "DataFreshUtil\DataFreshUtil.csproj", "{D1044AB1-AB58-42E3-A37B-4099116982A5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataFresh.Common", "DataFresh.Common\DataFresh.Common.csproj", "{0BAA8852-1597-43BB-AF78-BABA707D4D86}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {05438358-2120-4D97-974E-ACF80F7EA6F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {05438358-2120-4D97-974E-ACF80F7EA6F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {05438358-2120-4D97-974E-ACF80F7EA6F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {05438358-2120-4D97-974E-ACF80F7EA6F7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D688D8F0-3CDE-4C39-BF81-ED8C210C8F8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D688D8F0-3CDE-4C39-BF81-ED8C210C8F8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D688D8F0-3CDE-4C39-BF81-ED8C210C8F8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D688D8F0-3CDE-4C39-BF81-ED8C210C8F8E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3E910EED-904F-4A52-A611-9278B682EFD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3E910EED-904F-4A52-A611-9278B682EFD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3E910EED-904F-4A52-A611-9278B682EFD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3E910EED-904F-4A52-A611-9278B682EFD3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D1044AB1-AB58-42E3-A37B-4099116982A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D1044AB1-AB58-42E3-A37B-4099116982A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D1044AB1-AB58-42E3-A37B-4099116982A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D1044AB1-AB58-42E3-A37B-4099116982A5}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0BAA8852-1597-43BB-AF78-BABA707D4D86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0BAA8852-1597-43BB-AF78-BABA707D4D86}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/TODO.txt b/TODO.txt
index 3a02287..eb824c4 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,3 +1,2 @@
1) Fix unit tests to create DatafreshSample DB automatically
-2) Clean up scripts in Sample Project
-3) Update to VS2008!
\ No newline at end of file
+2) Clean up scripts in Sample Project
\ No newline at end of file
diff --git a/TestHarnessExample/Scripts/Create Database.bat b/TestHarnessExample/Scripts/Create Database.bat
index 152f83c..e54178c 100644
--- a/TestHarnessExample/Scripts/Create Database.bat
+++ b/TestHarnessExample/Scripts/Create Database.bat
@@ -1,5 +1,5 @@
-osql.exe -S 127.0.0.1 -U test -P test -d DataFreshSample -i database.sql
+osql.exe -S localhost -U test -P test -d DataFreshSample -i database.sql
-DataFreshUtil.exe -s 127.0.0.1 -u test -p test -d DataFreshSample -c PREPARE
+DataFreshUtil.exe -s localhost -u test -p test -d DataFreshSample -c PREPARE
pause
\ No newline at end of file
diff --git a/TestHarnessExample/TestHarnessExample.csproj b/TestHarnessExample/TestHarnessExample.csproj
index ae24df0..c74e405 100644
--- a/TestHarnessExample/TestHarnessExample.csproj
+++ b/TestHarnessExample/TestHarnessExample.csproj
@@ -1,147 +1,146 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ Local
+ 8.0.30319
+ 2.0
+ {D688D8F0-3CDE-4C39-BF81-ED8C210C8F8E}
+ Debug
+ AnyCPU
+
+
+ TestHarnessExample
+
+ JScript
+ Grid
+ IE50
+ false
+ Library
+ TestHarnessExample
+ OnBuildSuccess
+
+
+
+ v2.0
+ 0.0
+
+ publish\
+ true
+ Disk
+ false
+ Foreground
+ 7
+ Days
+ false
+ false
+ true
+ 0
+ 1.0.0.%2a
+ false
+ false
+ true
+
+
+ bin\Debug\
+ false
+ 285212672
+ false
+
+ DEBUG;TRACE
+
+ true
+ 4096
+ false
+
+ false
+ false
+ false
+ false
+ 4
+ full
+ prompt
+ AllRules.ruleset
+
+
+ bin\Release\
+ false
+ 285212672
+ false
+
+ TRACE
+
+ true
+ 4096
+ false
+
+ true
+ false
+ false
+ false
+ 4
+ full
+ prompt
+ AllRules.ruleset
+
+
+
+ DataFresh
+ {05438358-2120-4D97-974E-ACF80F7EA6F7}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+
+
+ nunit.framework
+ ..\DataFresh.Common\Assemblies\nunit.framework.dll
+
+
+ System
+
+
+ System.Data
+
+
+ System.XML
+
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+
+
+
+
+
+
+
+
+
+ False
+ .NET Framework 3.5 SP1 Client Profile
+ false
+
+
+ False
+ .NET Framework 3.5 SP1
+ true
+
+
+ False
+ Windows Installer 3.1
+ true
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Testing.DataFresh/Testing.DataFresh.csproj b/Testing.DataFresh/Testing.DataFresh.csproj
index c344754..994e69b 100644
--- a/Testing.DataFresh/Testing.DataFresh.csproj
+++ b/Testing.DataFresh/Testing.DataFresh.csproj
@@ -1,132 +1,145 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ Local
+ 8.0.30319
+ 2.0
+ {3E910EED-904F-4A52-A611-9278B682EFD3}
+ Debug
+ AnyCPU
+
+
+ Testing.DataFresh
+
+ JScript
+ Grid
+ IE50
+ false
+ Library
+ Testing.DataFresh
+ OnBuildSuccess
+
+
+
+ v2.0
+ 0.0
+
+ publish\
+ true
+ Disk
+ false
+ Foreground
+ 7
+ Days
+ false
+ false
+ true
+ 0
+ 1.0.0.%2a
+ false
+ false
+ true
+
+
+ bin\Debug\
+ false
+ 285212672
+ false
+
+ DEBUG;TRACE
+
+ true
+ 4096
+ false
+
+ false
+ false
+ false
+ false
+ 4
+ full
+ prompt
+ AllRules.ruleset
+
+
+ bin\Release\
+ false
+ 285212672
+ false
+
+ TRACE
+
+ true
+ 4096
+ false
+
+ true
+ false
+ false
+ false
+ 4
+ full
+ prompt
+ AllRules.ruleset
+
+
+
+ DataFresh
+ {05438358-2120-4D97-974E-ACF80F7EA6F7}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+
+
+ deltaRunner
+ ..\DataFresh.Common\Assemblies\deltaRunner.dll
+
+
+ nunit.framework
+ ..\DataFresh.Common\Assemblies\nunit.framework.dll
+
+
+ System
+
+
+ System.Data
+
+
+ System.XML
+
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+
+
+
+
+ False
+ .NET Framework 3.5 SP1 Client Profile
+ false
+
+
+ False
+ .NET Framework 3.5 SP1
+ true
+
+
+ False
+ Windows Installer 3.1
+ true
+
+
+
+
+
+
+
+
\ No newline at end of file