Move Async API's to default namespace

mythz · mythz · commit 2ff1434bf2e5 · 2014-10-29T05:30:09.000-04:00
diff --git a/src/ServiceStack.OrmLite/OrmLiteReadApiAsync.cs b/src/ServiceStack.OrmLite/OrmLiteReadApiAsync.cs
@@ -8,9 +8,9 @@
 using System.Linq.Expressions;
 using System.Threading;
 using System.Threading.Tasks;
-using ServiceStack.Text;
+using ServiceStack.OrmLite.Async;
 
-namespace ServiceStack.OrmLite.Async
+namespace ServiceStack.OrmLite
 {
     public static class OrmLiteReadApiAsync
     {
diff --git a/src/ServiceStack.OrmLite/OrmLiteReadExpressionsApiAsync.cs b/src/ServiceStack.OrmLite/OrmLiteReadExpressionsApiAsync.cs
@@ -7,8 +7,9 @@
 using System.Linq.Expressions;
 using System.Threading;
 using System.Threading.Tasks;
+using ServiceStack.OrmLite.Async;
 
-namespace ServiceStack.OrmLite.Async
+namespace ServiceStack.OrmLite
 {
     public static class OrmLiteReadExpressionsApiAsync
     {
diff --git a/src/ServiceStack.OrmLite/OrmLiteWriteApiAsync.cs b/src/ServiceStack.OrmLite/OrmLiteWriteApiAsync.cs
@@ -9,8 +9,9 @@
 using System.Threading;
 using System.Threading.Tasks;
 using ServiceStack.Data;
+using ServiceStack.OrmLite.Async;
 
-namespace ServiceStack.OrmLite.Async
+namespace ServiceStack.OrmLite
 {
     public static class OrmLiteWriteApiAsync
     {
diff --git a/src/ServiceStack.OrmLite/OrmLiteWriteExpressionsApiAsync.cs b/src/ServiceStack.OrmLite/OrmLiteWriteExpressionsApiAsync.cs
@@ -3,8 +3,9 @@
 using System.Linq.Expressions;
 using System.Threading;
 using System.Threading.Tasks;
+using ServiceStack.OrmLite.Async;
 
-namespace ServiceStack.OrmLite.Async
+namespace ServiceStack.OrmLite
 {
     public static class OrmLiteWriteExpressionsApiAsync
     {
diff --git a/src/ServiceStack.OrmLite/ServiceStack.OrmLite.csproj b/src/ServiceStack.OrmLite/ServiceStack.OrmLite.csproj
@@ -106,15 +106,15 @@
   <ItemGroup>
     <Compile Include="AliasNamingStrategy.cs" />
     <Compile Include="Async\async.cs" />
-    <Compile Include="Async\OrmLiteReadApiAsync.cs" />
+    <Compile Include="OrmLiteReadApiAsync.cs" />
     <Compile Include="Async\OrmLiteReadCommandExtensionsAsync.cs" />
     <Compile Include="Async\OrmLiteResultsFilterExtensionsAsync.cs" />
     <Compile Include="Async\OrmLiteUtilExtensionsAsync.cs" />
-    <Compile Include="Async\OrmLiteWriteApiAsync.cs" />
+    <Compile Include="OrmLiteWriteApiAsync.cs" />
     <Compile Include="Async\OrmLiteWriteCommandExtensionsAsync.cs" />
-    <Compile Include="Async\OrmLiteReadExpressionsApiAsync.cs" />
+    <Compile Include="OrmLiteReadExpressionsApiAsync.cs" />
     <Compile Include="Async\ReadExpressionCommandExtensionsAsync.cs" />
-    <Compile Include="Async\OrmLiteWriteExpressionsApiAsync.cs" />
+    <Compile Include="OrmLiteWriteExpressionsApiAsync.cs" />
     <Compile Include="Async\WriteExpressionCommandExtensionsAsync.cs" />
     <Compile Include="Expressions\SqlExpression.Join.cs" />
     <Compile Include="Expressions\SqlExpressionVisitor.cs" />
diff --git a/tests/ServiceStack.OrmLite.Tests/ApiSqlServerTestsAsync.cs b/tests/ServiceStack.OrmLite.Tests/ApiSqlServerTestsAsync.cs
@@ -2,7 +2,6 @@
 using System.Data;
 using System.Threading.Tasks;
 using NUnit.Framework;
-using ServiceStack.OrmLite.Async;
 using ServiceStack.OrmLite.Tests.Shared;
 
 namespace ServiceStack.OrmLite.Tests
diff --git a/tests/ServiceStack.OrmLite.Tests/ApiSqliteTestsAsync.cs b/tests/ServiceStack.OrmLite.Tests/ApiSqliteTestsAsync.cs
@@ -2,7 +2,6 @@
 using System.Data;
 using System.Threading.Tasks;
 using NUnit.Framework;
-using ServiceStack.OrmLite.Async;
 using ServiceStack.OrmLite.Tests.Shared;
 
 namespace ServiceStack.OrmLite.Tests
diff --git a/tests/ServiceStack.OrmLite.Tests/AsyncTests.cs b/tests/ServiceStack.OrmLite.Tests/AsyncTests.cs
@@ -1,9 +1,7 @@
-﻿using System.Linq;
-using System.Threading;
+﻿using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using ServiceStack.Common.Tests.Models;
-using ServiceStack.OrmLite.Async;
 using ServiceStack.Text;
 
 using ServiceStack.OrmLite.Tests.Shared;

Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@`
`8`	`8`	`using System.Linq.Expressions;`
`9`	`9`	`using System.Threading;`
`10`	`10`	`using System.Threading.Tasks;`
`11`		`-using ServiceStack.Text;`
	`11`	`+using ServiceStack.OrmLite.Async;`
`12`	`12`
`13`		`-namespace ServiceStack.OrmLite.Async`
	`13`	`+namespace ServiceStack.OrmLite`
`14`	`14`	`{`
`15`	`15`	`public static class OrmLiteReadApiAsync`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,9 @@`
`7`	`7`	`using System.Linq.Expressions;`
`8`	`8`	`using System.Threading;`
`9`	`9`	`using System.Threading.Tasks;`
	`10`	`+using ServiceStack.OrmLite.Async;`
`10`	`11`
`11`		`-namespace ServiceStack.OrmLite.Async`
	`12`	`+namespace ServiceStack.OrmLite`
`12`	`13`	`{`
`13`	`14`	`public static class OrmLiteReadExpressionsApiAsync`
`14`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,9 @@`
`9`	`9`	`using System.Threading;`
`10`	`10`	`using System.Threading.Tasks;`
`11`	`11`	`using ServiceStack.Data;`
	`12`	`+using ServiceStack.OrmLite.Async;`
`12`	`13`
`13`		`-namespace ServiceStack.OrmLite.Async`
	`14`	`+namespace ServiceStack.OrmLite`
`14`	`15`	`{`
`15`	`16`	`public static class OrmLiteWriteApiAsync`
`16`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,9 @@`
`3`	`3`	`using System.Linq.Expressions;`
`4`	`4`	`using System.Threading;`
`5`	`5`	`using System.Threading.Tasks;`
	`6`	`+using ServiceStack.OrmLite.Async;`
`6`	`7`
`7`		`-namespace ServiceStack.OrmLite.Async`
	`8`	`+namespace ServiceStack.OrmLite`
`8`	`9`	`{`
`9`	`10`	`public static class OrmLiteWriteExpressionsApiAsync`
`10`	`11`	`{`