Skip to content

Commit 19ecb01

Browse files
benrr101paulmedynski
benrr101
authored and
paulmedynski
committed
Move test UDTs out of the manual tests project - they never should've been there anyhow
1 parent 6aafe4c commit 19ecb01

12 files changed

Lines changed: 27 additions & 23 deletions

File tree

‎src/Microsoft.Data.SqlClient.slnx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -209,10 +209,10 @@
209209
<Project Path="Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/SqlClient.Stress.Runner.csproj" />
210210
<Project Path="Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/SqlClient.Stress.Tests.csproj" />
211211
</Folder>
212-
<Folder Name="/test/TestClr/">
213-
<Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj" />
214-
<Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj" />
215-
<Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj" />
216-
<Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj" />
212+
<Folder Name="/test/TestUdts/">
213+
<Project Path="Microsoft.Data.SqlClient/tests/TestUdts/Address/Address.csproj" />
214+
<Project Path="Microsoft.Data.SqlClient/tests/TestUdts/Circle/Circle.csproj" />
215+
<Project Path="Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Shapes.csproj" />
216+
<Project Path="Microsoft.Data.SqlClient/tests/TestUdts/Utf8String/Utf8String.csproj" />
217217
</Folder>
218218
</Solution>

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

Lines changed: 22 additions & 18 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,17 +112,17 @@
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" />
117-
<ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj" />
118-
<ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
119-
<ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj" />
120-
<ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
121-
<ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDS.Servers.csproj" />
117+
<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" />
122+
<ProjectReference Include="$(TestsPath)tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
123+
<ProjectReference Include="$(TestsPath)tools/TDS/TDS/TDS.csproj" />
124+
<ProjectReference Include="$(TestsPath)tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
125+
<ProjectReference Include="$(TestsPath)tools/TDS/TDS.Servers/TDS.Servers.csproj" />
122126
</ItemGroup>
123127

124128
<!-- References for netcore -->
@@ -141,17 +145,17 @@
141145
IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"
142146
PrivateAssets="all" />
143147

144-
<ProjectReference Include="SQL/UdtTest/UDTs/Address/Address.csproj" />
145-
<ProjectReference Include="SQL/UdtTest/UDTs/Circle/Circle.csproj" />
146-
<ProjectReference Include="SQL/UdtTest/UDTs/Shapes/Shapes.csproj" />
147-
<ProjectReference Include="SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj" />
148148
<PackageReference Include="Microsoft.SqlServer.Server" />
149149
<ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj" />
150-
<ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj" />
151-
<ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
152-
<ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj" />
153-
<ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
154-
<ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDS.Servers.csproj" />
150+
<ProjectReference Include="$(TestsPath)TestUdts/Address/Address.csproj" />
151+
<ProjectReference Include="$(TestsPath)TestUdts/Circle/Circle.csproj" />
152+
<ProjectReference Include="$(TestsPath)TestUdts/Shapes/Shapes.csproj" />
153+
<ProjectReference Include="$(TestsPath)TestUdts/Utf8String/Utf8String.csproj" />
154+
<ProjectReference Include="$(TestsPath)CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj" />
155+
<ProjectReference Include="$(TestsPath)tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
156+
<ProjectReference Include="$(TestsPath)tools/TDS/TDS/TDS.csproj" />
157+
<ProjectReference Include="$(TestsPath)tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
158+
<ProjectReference Include="$(TestsPath)tools/TDS/TDS.Servers/TDS.Servers.csproj" />
155159
</ItemGroup>
156160

157161
</Project>

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)