Skip to content

Commit 892b3de

Browse files
benrr101benrr101
committed
Move test UDTs out of the manual tests project - they never should've been there anyhow
1 parent 585335d commit 892b3de

12 files changed

Lines changed: 17 additions & 22 deletions

File tree

‎src/Microsoft.Data.SqlClient.slnx‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -316,20 +316,11 @@
316316
<Project Path="Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/SqlClient.Stress.Runner.csproj" />
317317
<Project Path="Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/SqlClient.Stress.Tests.csproj" />
318318
</Folder>
319-
<Folder Name="/test/TestClr/">
320-
<Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj">
321-
<BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
322-
<BuildDependency Project="Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj" />
323-
</Project>
324-
<Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj">
325-
<BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
326-
</Project>
327-
<Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj">
328-
<BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
329-
</Project>
330-
<Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj">
331-
<BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
332-
</Project>
319+
<Folder Name="/test/TestUdts/">
320+
<Project Path="Microsoft.Data.SqlClient/tests/TestUdts/Address/Address.csproj" />
321+
<Project Path="Microsoft.Data.SqlClient/tests/TestUdts/Circle/Circle.csproj" />
322+
<Project Path="Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Shapes.csproj" />
323+
<Project Path="Microsoft.Data.SqlClient/tests/TestUdts/Utf8String/Utf8String.csproj" />
333324
</Folder>
334325
<Project Path="../doc/apps/AzureAuthentication/AzureAuthentication.csproj" />
335326
</Solution>

‎src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
<IsTestProject>true</IsTestProject>
77
</PropertyGroup>
88

9+
<ItemGroup>
10+
<Compile Remove="SQL/UdtTest/UDTs/**/*.cs" />
11+
</ItemGroup>
12+
913
<!-- Target Frameworks =============================================== -->
1014
<PropertyGroup>
1115
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
@@ -108,13 +112,13 @@
108112
IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"
109113
PrivateAssets="all" />
110114

111-
<ProjectReference Include="SQL/UdtTest/UDTs/Address/Address.csproj" />
112-
<ProjectReference Include="SQL/UdtTest/UDTs/Circle/Circle.csproj" />
113-
<ProjectReference Include="SQL/UdtTest/UDTs/Shapes/Shapes.csproj" />
114-
<ProjectReference Include="SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj" />
115115
<PackageReference Include="Microsoft.SqlServer.Server" />
116116
<ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj" />
117117
<ProjectReference Include="$(TestsPath)CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj" />
118+
<ProjectReference Include="$(TestsPath)TestUdts/Address/Address.csproj" />
119+
<ProjectReference Include="$(TestsPath)TestUdts/Circle/Circle.csproj" />
120+
<ProjectReference Include="$(TestsPath)TestUdts/Shapes/Shapes.csproj" />
121+
<ProjectReference Include="$(TestsPath)TestUdts/Utf8String/Utf8String.csproj" />
118122
<ProjectReference Include="$(TestsPath)tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
119123
<ProjectReference Include="$(TestsPath)tools/TDS/TDS/TDS.csproj" />
120124
<ProjectReference Include="$(TestsPath)tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
@@ -142,12 +146,12 @@
142146
IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"
143147
PrivateAssets="all" />
144148

145-
<ProjectReference Include="SQL/UdtTest/UDTs/Address/Address.csproj" />
146-
<ProjectReference Include="SQL/UdtTest/UDTs/Circle/Circle.csproj" />
147-
<ProjectReference Include="SQL/UdtTest/UDTs/Shapes/Shapes.csproj" />
148-
<ProjectReference Include="SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj" />
149149
<PackageReference Include="Microsoft.SqlServer.Server" />
150150
<ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj" />
151+
<ProjectReference Include="$(TestsPath)TestUdts/Address/Address.csproj" />
152+
<ProjectReference Include="$(TestsPath)TestUdts/Circle/Circle.csproj" />
153+
<ProjectReference Include="$(TestsPath)TestUdts/Shapes/Shapes.csproj" />
154+
<ProjectReference Include="$(TestsPath)TestUdts/Utf8String/Utf8String.csproj" />
151155
<ProjectReference Include="$(TestsPath)CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj" />
152156
<ProjectReference Include="$(TestsPath)tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
153157
<ProjectReference Include="$(TestsPath)tools/TDS/TDS/TDS.csproj" />

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.cs renamed to src/Microsoft.Data.SqlClient/tests/TestUdts/Address/Address.cs

File renamed without changes.

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj renamed to src/Microsoft.Data.SqlClient/tests/TestUdts/Address/Address.csproj

File renamed without changes.

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.cs renamed to src/Microsoft.Data.SqlClient/tests/TestUdts/Circle/Circle.cs

File renamed without changes.

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj renamed to src/Microsoft.Data.SqlClient/tests/TestUdts/Circle/Circle.csproj

File renamed without changes.

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Point1.cs renamed to src/Microsoft.Data.SqlClient/tests/TestUdts/Circle/Point1.cs

File renamed without changes.

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Line.cs renamed to src/Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Line.cs

File renamed without changes.

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Point.cs renamed to src/Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Point.cs

File renamed without changes.

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj renamed to src/Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Shapes.csproj

File renamed without changes.

0 commit comments

Comments
 (0)