Revert "move to Dapper.AOT.Test.Integration.csproj"

This reverts commit e804648.
DapperLib · Jul 21, 2024 · 835655b · 835655b
1 parent acff97e
commit 835655b
Show file tree

Hide file tree

Showing 14 changed files with 10 additions and 109 deletions.
diff --git a/Dapper.AOT.sln b/Dapper.AOT.sln
@@ -40,8 +40,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "docs", "docs\docs.csproj",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UsageVanilla", "test\UsageVanilla\UsageVanilla.csproj", "{840EA1CA-62FF-409E-89F5-CD3BB269BAE3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dapper.AOT.Test.Integration", "test\Dapper.AOT.Test.Integration\Dapper.AOT.Test.Integration.csproj", "{63423B18-04F1-4571-ABB2-8D0925B0C3EB}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -80,10 +78,6 @@ Global
 		{840EA1CA-62FF-409E-89F5-CD3BB269BAE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{840EA1CA-62FF-409E-89F5-CD3BB269BAE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{840EA1CA-62FF-409E-89F5-CD3BB269BAE3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{63423B18-04F1-4571-ABB2-8D0925B0C3EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{63423B18-04F1-4571-ABB2-8D0925B0C3EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{63423B18-04F1-4571-ABB2-8D0925B0C3EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{63423B18-04F1-4571-ABB2-8D0925B0C3EB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -97,7 +91,6 @@ Global
 		{A77B633C-573E-43CD-85A4-8063B33143B4} = {FE215D4B-811B-47BB-9F05-6382DD1C6729}
 		{C6527566-38F4-43CC-9E0E-91C4B8854774} = {1135D4FD-770E-41DF-920B-A8F75E42A832}
 		{840EA1CA-62FF-409E-89F5-CD3BB269BAE3} = {9A846B95-90CE-4335-9043-48C5B8EA4FB8}
-		{63423B18-04F1-4571-ABB2-8D0925B0C3EB} = {9A846B95-90CE-4335-9043-48C5B8EA4FB8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A89CDAFA-494F-4168-9648-1138BA738D43}

diff --git a/test/Dapper.AOT.Test.Integration/Dapper.AOT.Test.Integration.csproj b/test/Dapper.AOT.Test.Integration/Dapper.AOT.Test.Integration.csproj
diff --git a/test/Dapper.AOT.Test.Integration/DbStringTests.cs b/test/Dapper.AOT.Test.Integration/DbStringTests.cs
diff --git a/test/Dapper.AOT.Test/Dapper.AOT.Test.csproj b/test/Dapper.AOT.Test/Dapper.AOT.Test.csproj
@@ -26,8 +26,8 @@
 		<None Update="**/*DAP*.*.cs*">
 			<DependentUpon>$([System.String]::Copy(%(Filename)).Replace('.VB.cs', '.cs'))</DependentUpon>
 		</None>
+
 	</ItemGroup>
-
     <ItemGroup>
         <PackageReference Include="Dapper" Condition="'$(TargetFramework)'!='net48'" />
         <PackageReference Include="Dapper.StrongName" Condition="'$(TargetFramework)'=='net48'" />

diff --git a/...est.Integration/Helpers/XUnitSkippable.cs → ...Dapper.AOT.Test/Helpers/XUnitSkippable.cs b/...est.Integration/Helpers/XUnitSkippable.cs → ...Dapper.AOT.Test/Helpers/XUnitSkippable.cs
diff --git a/...r.AOT.Test.Integration/BatchPostgresql.cs → ...r.AOT.Test/Integration/BatchPostgresql.cs b/...r.AOT.Test.Integration/BatchPostgresql.cs → ...r.AOT.Test/Integration/BatchPostgresql.cs
@@ -1,6 +1,5 @@
 using System.Data;
 using System.Linq;
-using Dapper.AOT.Test.Integration.Setup;
 using Xunit;
 
 namespace Dapper.AOT.Test.Integration;

diff --git a/...Dapper.AOT.Test.Integration/BatchTests.cs → ...Dapper.AOT.Test/Integration/BatchTests.cs b/...Dapper.AOT.Test.Integration/BatchTests.cs → ...Dapper.AOT.Test/Integration/BatchTests.cs
@@ -5,7 +5,6 @@
 using System.Collections.ObjectModel;
 using System.Data;
 using System.Linq;
-using Dapper.AOT.Test.Integration.Setup;
 using Xunit;
 
 namespace Dapper.AOT.Test.Integration;

diff --git a/...Integration/BulkInsertIngegrationTests.cs → ...Integration/BulkInsertIngegrationTests.cs b/...Integration/BulkInsertIngegrationTests.cs → ...Integration/BulkInsertIngegrationTests.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Dapper.AOT.Test.Integration.Setup;
 using Xunit;
 
 namespace Dapper.AOT.Test.Integration;

diff --git a/...pper.AOT.Test.Integration/DynamicTests.cs → ...pper.AOT.Test/Integration/DynamicTests.cs b/...pper.AOT.Test.Integration/DynamicTests.cs → ...pper.AOT.Test/Integration/DynamicTests.cs
@@ -1,7 +1,6 @@
 using Microsoft.Data.SqlClient;
 using System;
 using System.Collections.Generic;
-using Dapper.AOT.Test.Integration.Setup;
 using Xunit;
 
 namespace Dapper.AOT.Test.Integration;

diff --git a/...Test.Integration/ManualGridReaderTests.cs → ...Test/Integration/ManualGridReaderTests.cs b/...Test.Integration/ManualGridReaderTests.cs → ...Test/Integration/ManualGridReaderTests.cs
@@ -1,10 +1,10 @@
-using System;
+using Microsoft.Data.SqlClient;
+using System;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.Data.SqlClient;
 using Xunit;
 
-namespace Dapper.AOT.Test.Integration.Setup;
+namespace Dapper.AOT.Test.Integration;
 
 [Collection(SharedSqlClient.Collection)]
 public class ManualGridReaderTests : IDisposable

diff --git a/...st.Integration/Setup/PostgresqlFixture.cs → ...AOT.Test/Integration/PostgresqlFixture.cs b/...st.Integration/Setup/PostgresqlFixture.cs → ...AOT.Test/Integration/PostgresqlFixture.cs
@@ -1,9 +1,9 @@
-using System.Threading.Tasks;
-using Npgsql;
+using Npgsql;
+using System.Threading.Tasks;
 using Testcontainers.PostgreSql;
 using Xunit;
 
-namespace Dapper.AOT.Test.Integration.Setup;
+namespace Dapper.AOT.Test.Integration;
 
 [CollectionDefinition(Collection)]
 public class SharedPostgresqlClient : ICollectionFixture<PostgresqlFixture>

diff --git a/...Dapper.AOT.Test.Integration/QueryTests.cs → ...Dapper.AOT.Test/Integration/QueryTests.cs b/...Dapper.AOT.Test.Integration/QueryTests.cs → ...Dapper.AOT.Test/Integration/QueryTests.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Data.Common;
 using System.Threading.Tasks;
-using Dapper.AOT.Test.Integration.Setup;
 using Xunit;
 
 namespace Dapper.AOT.Test.Integration;

diff --git a/...est.Integration/Setup/SqlClientFixture.cs → ....AOT.Test/Integration/SqlClientFixture.cs b/...est.Integration/Setup/SqlClientFixture.cs → ....AOT.Test/Integration/SqlClientFixture.cs
@@ -1,8 +1,8 @@
-using System;
-using Microsoft.Data.SqlClient;
+using Microsoft.Data.SqlClient;
+using System;
 using Xunit;
 
-namespace Dapper.AOT.Test.Integration.Setup;
+namespace Dapper.AOT.Test.Integration;
 
 [CollectionDefinition(Collection)]
 public class SharedSqlClient : ICollectionFixture<SqlClientFixture>

diff --git a/test/Dapper.AOT.Test/Interceptors/DbString.output.netfx.cs b/test/Dapper.AOT.Test/Interceptors/DbString.output.netfx.cs
@@ -143,9 +143,6 @@ namespace Dapper.Aot.Generated
     /// <summary>
     /// Contains helpers to properly handle <see href="https://github.com/DapperLib/Dapper/blob/main/Dapper/DbString.cs"/>
     /// </summary>
-#if !DAPPERAOT_INTERNAL
-    file
-#endif
     static class DbStringHelpers
     {
         public static void ConfigureDbStringDbParameter(