From 835655b6559b511967bb99ff0c5d38f074017ce9 Mon Sep 17 00:00:00 2001
From: Dmitrii Korolev <dmkorolev@microsoft.com>
Date: Sun, 21 Jul 2024 23:40:54 +0200
Subject: [PATCH] Revert "move to Dapper.AOT.Test.Integration.csproj"

This reverts commit e80464847eb93880d6b4c36227a32897281b32f8.
---
 Dapper.AOT.sln                                |  7 ---
 .../Dapper.AOT.Test.Integration.csproj        | 54 -------------------
 .../DbStringTests.cs                          | 30 -----------
 test/Dapper.AOT.Test/Dapper.AOT.Test.csproj   |  2 +-
 .../Helpers/XUnitSkippable.cs                 |  0
 .../Integration}/BatchPostgresql.cs           |  1 -
 .../Integration}/BatchTests.cs                |  1 -
 .../BulkInsertIngegrationTests.cs             |  1 -
 .../Integration}/DynamicTests.cs              |  1 -
 .../Integration}/ManualGridReaderTests.cs     |  6 +--
 .../Integration}/PostgresqlFixture.cs         |  6 +--
 .../Integration}/QueryTests.cs                |  1 -
 .../Integration}/SqlClientFixture.cs          |  6 +--
 .../Interceptors/DbString.output.netfx.cs     |  3 --
 14 files changed, 10 insertions(+), 109 deletions(-)
 delete mode 100644 test/Dapper.AOT.Test.Integration/Dapper.AOT.Test.Integration.csproj
 delete mode 100644 test/Dapper.AOT.Test.Integration/DbStringTests.cs
 rename test/{Dapper.AOT.Test.Integration => Dapper.AOT.Test}/Helpers/XUnitSkippable.cs (100%)
 rename test/{Dapper.AOT.Test.Integration => Dapper.AOT.Test/Integration}/BatchPostgresql.cs (98%)
 rename test/{Dapper.AOT.Test.Integration => Dapper.AOT.Test/Integration}/BatchTests.cs (99%)
 rename test/{Dapper.AOT.Test.Integration => Dapper.AOT.Test/Integration}/BulkInsertIngegrationTests.cs (99%)
 rename test/{Dapper.AOT.Test.Integration => Dapper.AOT.Test/Integration}/DynamicTests.cs (95%)
 rename test/{Dapper.AOT.Test.Integration => Dapper.AOT.Test/Integration}/ManualGridReaderTests.cs (98%)
 rename test/{Dapper.AOT.Test.Integration/Setup => Dapper.AOT.Test/Integration}/PostgresqlFixture.cs (93%)
 rename test/{Dapper.AOT.Test.Integration => Dapper.AOT.Test/Integration}/QueryTests.cs (99%)
 rename test/{Dapper.AOT.Test.Integration/Setup => Dapper.AOT.Test/Integration}/SqlClientFixture.cs (96%)

diff --git a/Dapper.AOT.sln b/Dapper.AOT.sln
index 17d61ea5..15a5e283 100644
--- 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
deleted file mode 100644
index 755afdfa..00000000
--- a/test/Dapper.AOT.Test.Integration/Dapper.AOT.Test.Integration.csproj
+++ /dev/null
@@ -1,54 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFrameworks>net6.0;net48</TargetFrameworks>
-        <RootNamespace>Dapper.AOT.Test.Integration</RootNamespace>
-        <DefineConstants>$(DefineConstants);DAPPERAOT_INTERNAL</DefineConstants>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <Compile Remove="Accessors/Data/**/*.*.cs" />
-        <None Include="Accessors/Data/**/*.*" />
-        <None Update="Accessors/Data/**/*.*" CopyToOutputDirectory="PreserveNewest" />
-
-        <Compile Remove="Interceptors/**/*.*.cs" />
-        <None Include="Interceptors/**/*.*" />
-        <None Update="Interceptors/**/*.*" CopyToOutputDirectory="PreserveNewest" />
-
-        <Compile Include="..\..\src\Dapper.AOT.Analyzers\AotGridReader.cs" Link="AotGridReader.cs" />
-        <Compile Include="..\..\src\Dapper.AOT.Analyzers\InGeneration\DapperHelpers.cs" Link="DapperHelpers.cs" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Dapper" Condition="'$(TargetFramework)'!='net48'" />
-        <PackageReference Include="Dapper.StrongName" Condition="'$(TargetFramework)'=='net48'" />
-        <PackageReference Include="System.ComponentModel.Annotations" Condition="'$(TargetFramework)'=='net48'" />
-        <PackageReference Include="Microsoft.Build" Condition="'$(TargetFramework)'!='net6.0'" />
-        <PackageReference Include="Microsoft.Build" VersionOverride="[17.3.2]" Condition="'$(TargetFramework)'=='net6.0'" />
-        <PackageReference Include="Microsoft.Build.Utilities.Core" />
-        <PackageReference Include="Npgsql" />
-        <PackageReference Include="Oracle.ManagedDataAccess" Condition="'$(TargetFramework)'=='net48'" />
-        <PackageReference Include="Oracle.ManagedDataAccess.Core" Condition="'$(TargetFramework)'!='net48'" />
-        <PackageReference Include="System.ComponentModel.Annotations" />
-        <PackageReference Include="System.Data.Common" />
-        <PackageReference Include="System.Data.SqlClient" />
-        <PackageReference Include="Microsoft.Data.SqlClient" />
-        <PackageReference Include="xunit" />
-        <PackageReference Include="xunit.runner.visualstudio">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" />
-        <ProjectReference Include="../../src/Dapper.AOT.Analyzers/Dapper.AOT.Analyzers.csproj" />
-        <ProjectReference Include="../../src/Dapper.AOT/Dapper.AOT.csproj" />
-
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
-        <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" />
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" />
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" />
-        <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.XUnit" />
-        <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" />
-        <PackageReference Include="Testcontainers.PostgreSql" />
-    </ItemGroup>
-    
-</Project>
diff --git a/test/Dapper.AOT.Test.Integration/DbStringTests.cs b/test/Dapper.AOT.Test.Integration/DbStringTests.cs
deleted file mode 100644
index 0e185aa0..00000000
--- a/test/Dapper.AOT.Test.Integration/DbStringTests.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Linq;
-using Dapper.AOT.Test.Integration.Setup;
-using Xunit;
-
-namespace Dapper.AOT.Test.Integration;
-
-[Collection(SharedPostgresqlClient.Collection)]
-public class DbStringTests
-{
-    private PostgresqlFixture _fixture;
-    
-    public DbStringTests(PostgresqlFixture fixture)
-    {
-        _fixture = fixture;
-        fixture.NpgsqlConnection.Execute("""
-            CREATE TABLE IF NOT EXISTS dbStringTable(
-                id     integer PRIMARY KEY,
-                name   varchar(40) NOT NULL CHECK (name <> '')
-            );
-            TRUNCATE dbStringTable;
-        """
-        );
-    }
-    
-    [Fact]
-    public void ExecuteMulti()
-    {
-        
-    }
-}
\ No newline at end of file
diff --git a/test/Dapper.AOT.Test/Dapper.AOT.Test.csproj b/test/Dapper.AOT.Test/Dapper.AOT.Test.csproj
index c96c32a3..67a758e5 100644
--- 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/test/Dapper.AOT.Test.Integration/Helpers/XUnitSkippable.cs b/test/Dapper.AOT.Test/Helpers/XUnitSkippable.cs
similarity index 100%
rename from test/Dapper.AOT.Test.Integration/Helpers/XUnitSkippable.cs
rename to test/Dapper.AOT.Test/Helpers/XUnitSkippable.cs
diff --git a/test/Dapper.AOT.Test.Integration/BatchPostgresql.cs b/test/Dapper.AOT.Test/Integration/BatchPostgresql.cs
similarity index 98%
rename from test/Dapper.AOT.Test.Integration/BatchPostgresql.cs
rename to test/Dapper.AOT.Test/Integration/BatchPostgresql.cs
index 274ca64b..55fb266c 100644
--- a/test/Dapper.AOT.Test.Integration/BatchPostgresql.cs
+++ b/test/Dapper.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/test/Dapper.AOT.Test.Integration/BatchTests.cs b/test/Dapper.AOT.Test/Integration/BatchTests.cs
similarity index 99%
rename from test/Dapper.AOT.Test.Integration/BatchTests.cs
rename to test/Dapper.AOT.Test/Integration/BatchTests.cs
index 8ca88475..d154bdce 100644
--- a/test/Dapper.AOT.Test.Integration/BatchTests.cs
+++ b/test/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/test/Dapper.AOT.Test.Integration/BulkInsertIngegrationTests.cs b/test/Dapper.AOT.Test/Integration/BulkInsertIngegrationTests.cs
similarity index 99%
rename from test/Dapper.AOT.Test.Integration/BulkInsertIngegrationTests.cs
rename to test/Dapper.AOT.Test/Integration/BulkInsertIngegrationTests.cs
index 706c724f..4d827379 100644
--- a/test/Dapper.AOT.Test.Integration/BulkInsertIngegrationTests.cs
+++ b/test/Dapper.AOT.Test/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/test/Dapper.AOT.Test.Integration/DynamicTests.cs b/test/Dapper.AOT.Test/Integration/DynamicTests.cs
similarity index 95%
rename from test/Dapper.AOT.Test.Integration/DynamicTests.cs
rename to test/Dapper.AOT.Test/Integration/DynamicTests.cs
index 7e18b7fa..46553881 100644
--- a/test/Dapper.AOT.Test.Integration/DynamicTests.cs
+++ b/test/Dapper.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/Dapper.AOT.Test.Integration/ManualGridReaderTests.cs b/test/Dapper.AOT.Test/Integration/ManualGridReaderTests.cs
similarity index 98%
rename from test/Dapper.AOT.Test.Integration/ManualGridReaderTests.cs
rename to test/Dapper.AOT.Test/Integration/ManualGridReaderTests.cs
index c4861da4..eade42b9 100644
--- a/test/Dapper.AOT.Test.Integration/ManualGridReaderTests.cs
+++ b/test/Dapper.AOT.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/test/Dapper.AOT.Test.Integration/Setup/PostgresqlFixture.cs b/test/Dapper.AOT.Test/Integration/PostgresqlFixture.cs
similarity index 93%
rename from test/Dapper.AOT.Test.Integration/Setup/PostgresqlFixture.cs
rename to test/Dapper.AOT.Test/Integration/PostgresqlFixture.cs
index 1023b18b..59329192 100644
--- a/test/Dapper.AOT.Test.Integration/Setup/PostgresqlFixture.cs
+++ b/test/Dapper.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/test/Dapper.AOT.Test.Integration/QueryTests.cs b/test/Dapper.AOT.Test/Integration/QueryTests.cs
similarity index 99%
rename from test/Dapper.AOT.Test.Integration/QueryTests.cs
rename to test/Dapper.AOT.Test/Integration/QueryTests.cs
index 3f660a23..7241759c 100644
--- a/test/Dapper.AOT.Test.Integration/QueryTests.cs
+++ b/test/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/test/Dapper.AOT.Test.Integration/Setup/SqlClientFixture.cs b/test/Dapper.AOT.Test/Integration/SqlClientFixture.cs
similarity index 96%
rename from test/Dapper.AOT.Test.Integration/Setup/SqlClientFixture.cs
rename to test/Dapper.AOT.Test/Integration/SqlClientFixture.cs
index da22c4b8..860d85dc 100644
--- a/test/Dapper.AOT.Test.Integration/Setup/SqlClientFixture.cs
+++ b/test/Dapper.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
index fa609c25..98e93105 100644
--- 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="/DapperLib/Dapper/blob/main/Dapper/DbString.cs"/>
     /// </summary>
-#if !DAPPERAOT_INTERNAL
-    file
-#endif
     static class DbStringHelpers
     {
         public static void ConfigureDbStringDbParameter(