Skip to content

Commit 4a9578a

Browse files
authored
Constrain test-only dependencies to /tests folder (#8576)
Follow up on #8279
1 parent fcfc216 commit 4a9578a

File tree

4 files changed

+36
-22
lines changed

4 files changed

+36
-22
lines changed

Directory.Packages.props

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<PropertyGroup>
77
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
88
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
9-
<TestcontainersPackageVersion>4.3.0</TestcontainersPackageVersion>
109
<AzureProvisiongVersion>1.0.0</AzureProvisiongVersion>
1110
<!-- The Npgsql version used when using Npgsql EF Core on net8. The major versions need to match between Npgsql and EF Core. -->
1211
<Npgsql8Version>8.0.6</Npgsql8Version>
@@ -125,26 +124,6 @@
125124
<PackageVersion Include="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23564.4" />
126125
<PackageVersion Include="Microsoft.DotNet.GenAPI.Task" Version="9.0.103-servicing.25065.25" />
127126
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.25072.1" />
128-
<!-- unit test dependencies -->
129-
<PackageVersion Include="bUnit" Version="1.36.0" /> <!-- Can't update passed to 1.37.x versions as those lift up LTS versions when targeting net8 -->
130-
<PackageVersion Include="JsonSchema.Net" Version="7.3.3" />
131-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
132-
<PackageVersion Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorVersion)" />
133-
<PackageVersion Include="Microsoft.DotNet.XUnitV3Extensions" Version="$(MicrosoftDotNetXUnitV3ExtensionsVersion)" />
134-
<PackageVersion Include="Microsoft.Playwright" Version="1.50.0" />
135-
<PackageVersion Include="Testcontainers.Kafka" Version="$(TestcontainersPackageVersion)" />
136-
<PackageVersion Include="Testcontainers.MongoDb" Version="$(TestcontainersPackageVersion)" />
137-
<PackageVersion Include="Testcontainers.MsSql" Version="$(TestcontainersPackageVersion)" />
138-
<PackageVersion Include="Testcontainers.MySql" Version="$(TestcontainersPackageVersion)" />
139-
<PackageVersion Include="Testcontainers.PostgreSQL" Version="$(TestcontainersPackageVersion)" />
140-
<PackageVersion Include="Testcontainers.RabbitMq" Version="$(TestcontainersPackageVersion)" />
141-
<PackageVersion Include="Testcontainers.Redis" Version="$(TestcontainersPackageVersion)" />
142-
<PackageVersion Include="Testcontainers.Nats" Version="$(TestcontainersPackageVersion)" />
143-
<PackageVersion Include="Testcontainers.Milvus" Version="$(TestcontainersPackageVersion)" />
144-
<PackageVersion Include="Testcontainers.Oracle" Version="$(TestcontainersPackageVersion)" />
145-
<PackageVersion Include="Testcontainers.Elasticsearch" Version="$(TestcontainersPackageVersion)" />
146-
<PackageVersion Include="Testcontainers" Version="$(TestcontainersPackageVersion)" />
147-
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
148127
<!-- playground apps dependencies -->
149128
<PackageVersion Include="Microsoft.Orleans.Clustering.AzureStorage" Version="9.1.2" />
150129
<PackageVersion Include="Microsoft.Orleans.Persistence.AzureStorage" Version="9.1.2" />

src/Components/Aspire.Microsoft.Data.SqlClient/Aspire.Microsoft.Data.SqlClient.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<ItemGroup>
2323
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" />
2424
<PackageReference Include="Microsoft.Data.SqlClient" />
25-
<PackageReference Include="Microsoft.DotNet.RemoteExecutor" />
2625
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
2726
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
2827
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />

tests/Aspire.Microsoft.Data.SqlClient.Tests/Aspire.Microsoft.Data.SqlClient.Tests.csproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,19 @@
44
<TargetFramework>$(DefaultTargetFramework)</TargetFramework>
55
</PropertyGroup>
66

7+
<ItemGroup>
8+
<PackageReference Include="Microsoft.DotNet.RemoteExecutor" />
9+
</ItemGroup>
10+
711
<ItemGroup>
812
<Compile Include="$(RepoRoot)src\Aspire.Hosting.SqlServer\SqlServerContainerImageTags.cs" />
13+
</ItemGroup>
914

15+
<ItemGroup>
1016
<None Include="$(RepoRoot)src\Components\Aspire.Microsoft.Data.SqlClient\ConfigurationSchema.json" CopyToOutputDirectory="PreserveNewest" />
17+
</ItemGroup>
1118

19+
<ItemGroup>
1220
<ProjectReference Include="..\..\src\Components\Aspire.Microsoft.Data.SqlClient\Aspire.Microsoft.Data.SqlClient.csproj" />
1321
<ProjectReference Include="..\Aspire.Components.Common.Tests\Aspire.Components.Common.Tests.csproj" />
1422
<PackageReference Include="Testcontainers.MsSql" />

tests/Directory.Packages.props

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Packages.props, $(MSBuildThisFileDirectory)..))" />
3+
<PropertyGroup>
4+
<TestcontainersPackageVersion>4.3.0</TestcontainersPackageVersion>
5+
</PropertyGroup>
6+
<ItemGroup>
7+
<!-- unit test dependencies -->
8+
<PackageVersion Include="bUnit" Version="1.36.0" /> <!-- Can't update passed to 1.37.x versions as those lift up LTS versions when targeting net8 -->
9+
<PackageVersion Include="JsonSchema.Net" Version="7.3.3" />
10+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
11+
<PackageVersion Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorVersion)" />
12+
<PackageVersion Include="Microsoft.DotNet.XUnitV3Extensions" Version="$(MicrosoftDotNetXUnitV3ExtensionsVersion)" />
13+
<PackageVersion Include="Microsoft.Playwright" Version="1.50.0" />
14+
<PackageVersion Include="Testcontainers.Kafka" Version="$(TestcontainersPackageVersion)" />
15+
<PackageVersion Include="Testcontainers.MongoDb" Version="$(TestcontainersPackageVersion)" />
16+
<PackageVersion Include="Testcontainers.MsSql" Version="$(TestcontainersPackageVersion)" />
17+
<PackageVersion Include="Testcontainers.MySql" Version="$(TestcontainersPackageVersion)" />
18+
<PackageVersion Include="Testcontainers.PostgreSQL" Version="$(TestcontainersPackageVersion)" />
19+
<PackageVersion Include="Testcontainers.RabbitMq" Version="$(TestcontainersPackageVersion)" />
20+
<PackageVersion Include="Testcontainers.Redis" Version="$(TestcontainersPackageVersion)" />
21+
<PackageVersion Include="Testcontainers.Nats" Version="$(TestcontainersPackageVersion)" />
22+
<PackageVersion Include="Testcontainers.Milvus" Version="$(TestcontainersPackageVersion)" />
23+
<PackageVersion Include="Testcontainers.Oracle" Version="$(TestcontainersPackageVersion)" />
24+
<PackageVersion Include="Testcontainers.Elasticsearch" Version="$(TestcontainersPackageVersion)" />
25+
<PackageVersion Include="Testcontainers" Version="$(TestcontainersPackageVersion)" />
26+
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
27+
</ItemGroup>
28+
</Project>

0 commit comments

Comments
 (0)