Skip to content

Commit be8147a

Browse files
joperezrjoperezr
authored
Merge branch 'main' into update-dependencies
2 parents ed54381 + f941e0e commit be8147a

File tree

76 files changed

+190
-98
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+190
-98
lines changed

‎.github/copilot-instructions.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@
2222
* Always use `is null` or `is not null` instead of `== null` or `!= null`.
2323
* Trust the C# null annotations and don't add null checks when the type system says a value cannot be null.
2424

25+
### Building
26+
27+
* Follow the instructions in the repo to build.
28+
* If temporarily introducing warnings during a refactoring, you can add the flag `/p:TreatWarningsAsErrors=false` to your build command to prevent the build from failing. However before you finish your work, you must strive to fix any warnings as well.
29+
30+
In building and testing, never use `dotnet` without extension. Use `dotnet.sh` on Unix, `dotnet.cmd` on Windows.
31+
2532
### Testing
2633

2734
* We use xUnit SDK v3 with Microsoft.Testing.Platform (https://learn.microsoft.com/dotnet/core/testing/microsoft-testing-platform-intro)
@@ -33,7 +40,11 @@
3340

3441
(1) Build from the root with `build.sh`.
3542
(2) If that produces errors, fix those errors and build again. Repeat until the build is successful.
36-
(3) To then run tests, use a command similar to this `dotnet test tests/Aspire.Seq.Tests/Aspire.Seq.Tests.csproj` (using the path to whatever projects are applicable to the change).
43+
(3) To then run tests, use a command similar to this `dotnet.sh test tests/Aspire.Seq.Tests/Aspire.Seq.Tests.csproj` (using the path to whatever projects are applicable to the change).
44+
45+
Note that tests for a project can be executed without first building from the root.
46+
47+
(4) To run just certain tests, it's important to include the filter after `--`, for example `dotnet.sh test tests/Aspire.Hosting.Testing.Tests/Aspire.Hosting.Testing.Tests.csproj --no-build --logger "console;verbosity=detailed" -- --filter "TestingBuilderHasAllPropertiesFromRealBuilder"`
3748

3849
## Quarantined tests
3950

‎.github/workflows/copilot-setup-steps.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,6 @@ jobs:
2121
env:
2222
# prevent GitInfo errors
2323
CI: false
24-
run: ./build.sh /p:PrepareForHelix=true
24+
# a full build is too slow; also do not fail on errors, continue so that
25+
# copilot can attempt to recover
26+
run: ./build.sh -restore || true

‎Aspire.slnx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@
325325
<Project Path="tests/Aspire.Azure.Security.KeyVault.Tests/Aspire.Azure.Security.KeyVault.Tests.csproj" />
326326
<Project Path="tests/Aspire.Azure.Storage.Blobs.Tests/Aspire.Azure.Storage.Blobs.Tests.csproj" />
327327
<Project Path="tests/Aspire.Azure.Storage.Queues.Tests/Aspire.Azure.Storage.Queues.Tests.csproj" />
328-
<Project Path="tests/Aspire.Components.Common.Tests/Aspire.Components.Common.Tests.csproj" />
328+
<Project Path="tests/Aspire.Components.Common.TestUtilities/Aspire.Components.Common.TestUtilities.csproj" />
329329
<Project Path="tests/Aspire.Confluent.Kafka.Tests/Aspire.Confluent.Kafka.Tests.csproj" />
330330
<Project Path="tests/Aspire.Keycloak.Authentication.Tests/Aspire.Keycloak.Authentication.Tests.csproj" />
331331
<Project Path="tests/Aspire.Microsoft.Azure.Cosmos.Tests/Aspire.Microsoft.Azure.Cosmos.Tests.csproj" />

‎eng/Testing.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<SkipTests Condition=" '$(IsLocalDevLoop)' == 'true' ">false</SkipTests>
7272
</PropertyGroup>
7373

74-
<ItemGroup Condition=" '$(IsTestProject)' == 'true' and '$(IncludeTestUtilities)' == 'true' ">
74+
<ItemGroup Condition=" ('$(IsTestProject)' == 'true' or '$(IsTestUtilityProject)' == 'true') and '$(IncludeTestUtilities)' == 'true' and '$(MSBuildProjectName)' != 'Aspire.TestUtilities' ">
7575
<ProjectReference Include="$(RepoRoot)tests\Aspire.TestUtilities\Aspire.TestUtilities.csproj" />
7676
</ItemGroup>
7777

‎eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.DeveloperControlPlane.darwin-amd64" Version="0.15.4">
4+
<Dependency Name="Microsoft.DeveloperControlPlane.darwin-amd64" Version="0.15.5">
55
<Uri>https://github.com/microsoft/usvc-apiserver</Uri>
6-
<Sha>2075f331c3eaab881912c4389c2db18cef5c63be</Sha>
6+
<Sha>3c39d1050b9a5521c9e95a1d513be0f93f73b26e</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.DeveloperControlPlane.darwin-arm64" Version="0.15.4">
8+
<Dependency Name="Microsoft.DeveloperControlPlane.darwin-arm64" Version="0.15.5">
99
<Uri>https://github.com/microsoft/usvc-apiserver</Uri>
10-
<Sha>2075f331c3eaab881912c4389c2db18cef5c63be</Sha>
10+
<Sha>3c39d1050b9a5521c9e95a1d513be0f93f73b26e</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DeveloperControlPlane.linux-amd64" Version="0.15.4">
12+
<Dependency Name="Microsoft.DeveloperControlPlane.linux-amd64" Version="0.15.5">
1313
<Uri>https://github.com/microsoft/usvc-apiserver</Uri>
14-
<Sha>2075f331c3eaab881912c4389c2db18cef5c63be</Sha>
14+
<Sha>3c39d1050b9a5521c9e95a1d513be0f93f73b26e</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.DeveloperControlPlane.linux-arm64" Version="0.15.4">
16+
<Dependency Name="Microsoft.DeveloperControlPlane.linux-arm64" Version="0.15.5">
1717
<Uri>https://github.com/microsoft/usvc-apiserver</Uri>
18-
<Sha>2075f331c3eaab881912c4389c2db18cef5c63be</Sha>
18+
<Sha>3c39d1050b9a5521c9e95a1d513be0f93f73b26e</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.DeveloperControlPlane.windows-386" Version="0.15.4">
20+
<Dependency Name="Microsoft.DeveloperControlPlane.windows-386" Version="0.15.5">
2121
<Uri>https://github.com/microsoft/usvc-apiserver</Uri>
22-
<Sha>2075f331c3eaab881912c4389c2db18cef5c63be</Sha>
22+
<Sha>3c39d1050b9a5521c9e95a1d513be0f93f73b26e</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.DeveloperControlPlane.windows-amd64" Version="0.15.4">
24+
<Dependency Name="Microsoft.DeveloperControlPlane.windows-amd64" Version="0.15.5">
2525
<Uri>https://github.com/microsoft/usvc-apiserver</Uri>
26-
<Sha>2075f331c3eaab881912c4389c2db18cef5c63be</Sha>
26+
<Sha>3c39d1050b9a5521c9e95a1d513be0f93f73b26e</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.DeveloperControlPlane.windows-arm64" Version="0.15.4">
28+
<Dependency Name="Microsoft.DeveloperControlPlane.windows-arm64" Version="0.15.5">
2929
<Uri>https://github.com/microsoft/usvc-apiserver</Uri>
30-
<Sha>2075f331c3eaab881912c4389c2db18cef5c63be</Sha>
30+
<Sha>3c39d1050b9a5521c9e95a1d513be0f93f73b26e</Sha>
3131
</Dependency>
3232
<Dependency Name="Microsoft.Extensions.Http.Resilience" Version="9.4.0">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>

‎eng/Versions.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<!-- Package versions defined directly in <reporoot>/Directory.Packages.props -->
2626
<MicrosoftDotnetSdkInternalVersion>8.0.100-rtm.23512.16</MicrosoftDotnetSdkInternalVersion>
2727
<!-- DCP -->
28-
<MicrosoftDeveloperControlPlanedarwinamd64Version>0.15.4</MicrosoftDeveloperControlPlanedarwinamd64Version>
29-
<MicrosoftDeveloperControlPlanedarwinarm64Version>0.15.4</MicrosoftDeveloperControlPlanedarwinarm64Version>
30-
<MicrosoftDeveloperControlPlanelinuxamd64Version>0.15.4</MicrosoftDeveloperControlPlanelinuxamd64Version>
31-
<MicrosoftDeveloperControlPlanelinuxarm64Version>0.15.4</MicrosoftDeveloperControlPlanelinuxarm64Version>
32-
<MicrosoftDeveloperControlPlanewindows386Version>0.15.4</MicrosoftDeveloperControlPlanewindows386Version>
33-
<MicrosoftDeveloperControlPlanewindowsamd64Version>0.15.4</MicrosoftDeveloperControlPlanewindowsamd64Version>
34-
<MicrosoftDeveloperControlPlanewindowsarm64Version>0.15.4</MicrosoftDeveloperControlPlanewindowsarm64Version>
28+
<MicrosoftDeveloperControlPlanedarwinamd64Version>0.15.5</MicrosoftDeveloperControlPlanedarwinamd64Version>
29+
<MicrosoftDeveloperControlPlanedarwinarm64Version>0.15.5</MicrosoftDeveloperControlPlanedarwinarm64Version>
30+
<MicrosoftDeveloperControlPlanelinuxamd64Version>0.15.5</MicrosoftDeveloperControlPlanelinuxamd64Version>
31+
<MicrosoftDeveloperControlPlanelinuxarm64Version>0.15.5</MicrosoftDeveloperControlPlanelinuxarm64Version>
32+
<MicrosoftDeveloperControlPlanewindows386Version>0.15.5</MicrosoftDeveloperControlPlanewindows386Version>
33+
<MicrosoftDeveloperControlPlanewindowsamd64Version>0.15.5</MicrosoftDeveloperControlPlanewindowsamd64Version>
34+
<MicrosoftDeveloperControlPlanewindowsarm64Version>0.15.5</MicrosoftDeveloperControlPlanewindowsarm64Version>
3535
<!-- Other -->
3636
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25271.1</MicrosoftDotNetRemoteExecutorVersion>
3737
<MicrosoftDotNetXUnitV3ExtensionsVersion>10.0.0-beta.25178.1</MicrosoftDotNetXUnitV3ExtensionsVersion>

‎eng/Xunit3/Xunit3.targets

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<Project>
22
<ItemGroup>
33
<PackageVersion Include="xunit.v3" Version="$(XunitV3Version)" />
4-
<PackageVersion Include="xunit.v3.core" Version="$(XunitV3Version)" />
5-
<PackageVersion Include="xunit.analyzers" Version="$(XunitAnalyzersVersion)" />
6-
<PackageVersion Include="xunit.v3.assert" Version="$(XunitV3Version)" />
74
<PackageVersion Include="xunit.v3.runner.console" Version="$(XunitV3Version)" />
85
<PackageVersion Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioVersion)" />
96
<PackageVersion Include="Microsoft.Testing.Platform" Version="$(MicrosoftTestingPlatformVersion)" />
@@ -13,9 +10,6 @@
1310
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="$(MicrosoftTestingPlatformVersion)" />
1411

1512
<PackageReference Include="xunit.v3" />
16-
<PackageReference Include="xunit.v3.core" />
17-
<PackageReference Include="xunit.analyzers" />
18-
<PackageReference Include="xunit.v3.assert" />
1913
<PackageReference Include="xunit.runner.visualstudio" />
2014
<PackageReference Include="Microsoft.Testing.Platform" />
2115
<PackageReference Include="Microsoft.Testing.Platform.MSBuild" />

‎src/Aspire.Hosting.Azure.AppContainers/AzureContainerAppEnvironmentResource.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace Aspire.Hosting.Azure.AppContainers;
1414
/// <param name="configureInfrastructure">The callback to configure the Azure infrastructure for this resource.</param>
1515
public class AzureContainerAppEnvironmentResource(string name, Action<AzureResourceInfrastructure> configureInfrastructure) :
1616
#pragma warning disable ASPIRECOMPUTE001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
17-
AzureProvisioningResource(name, configureInfrastructure), IComputeEnvironmentResource, IAzureContainerRegistry
17+
AzureProvisioningResource(name, configureInfrastructure), IAzureComputeEnvironmentResource, IAzureContainerRegistry
1818
#pragma warning restore ASPIRECOMPUTE001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
1919
{
2020
internal bool UseAzdNamingConvention { get; set; }

‎src/Aspire.Hosting.Azure.AppService/AzureAppServiceEnvironmentResource.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Aspire.Hosting.Azure;
1313
public class AzureAppServiceEnvironmentResource(string name, Action<AzureResourceInfrastructure> configureInfrastructure) :
1414
AzureProvisioningResource(name, configureInfrastructure),
1515
#pragma warning disable ASPIRECOMPUTE001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
16-
IComputeEnvironmentResource,
16+
IAzureComputeEnvironmentResource,
1717
IAzureContainerRegistry
1818
#pragma warning restore ASPIRECOMPUTE001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
1919
{

‎src/Aspire.Hosting.Azure/IAzureComputeEnvironmentResource.cs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
using System.Diagnostics.CodeAnalysis;
5+
using Aspire.Hosting.ApplicationModel;
6+
7+
namespace Aspire.Hosting.Azure;
8+
9+
/// <summary>
10+
/// Represents an Azure compute environment resource.
11+
/// </summary>
12+
[Experimental("ASPIRECOMPUTE001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
13+
public interface IAzureComputeEnvironmentResource : IComputeEnvironmentResource
14+
{
15+
}

‎src/Aspire.Hosting/Dcp/DcpExecutor.cs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1217,8 +1217,17 @@ async Task CreateContainerAsyncCore(AppResource cr, CancellationToken cancellati
12171217
// Create a custom container network for Aspire if there are container resources
12181218
if (containerResources.Any())
12191219
{
1220-
// The network will be created with a unique postfix to avoid conflicts with other Aspire AppHost networks
1221-
tasks.Add(_kubernetesService.CreateAsync(ContainerNetwork.Create(DefaultAspireNetworkName), cancellationToken));
1220+
var network = ContainerNetwork.Create(DefaultAspireNetworkName);
1221+
if (containerResources.Any(cr => cr.ModelResource.GetContainerLifetimeType() == ContainerLifetime.Persistent))
1222+
{
1223+
// If we have any persistent container resources
1224+
network.Spec.Persistent = true;
1225+
// Persistent networks require a predictable name to be reused between runs.
1226+
// Append the same project hash suffix used for persistent container names.
1227+
network.Spec.NetworkName = $"{DefaultAspireNetworkName}-{_nameGenerator.GetProjectHashSuffix()}";
1228+
}
1229+
1230+
tasks.Add(_kubernetesService.CreateAsync(network, cancellationToken));
12221231
}
12231232

12241233
foreach (var cr in containerResources)

‎src/Aspire.Hosting/Dcp/DcpNameGenerator.cs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ private static void AddInstancesAnnotation(IResource resource, ImmutableArray<Dc
6565
var nameSuffix = container.GetContainerLifetimeType() switch
6666
{
6767
ContainerLifetime.Session => GetRandomNameSuffix(),
68-
// Compute a short hash of the content root path to differentiate between multiple AppHost projects with similar resource names
69-
_ => _configuration["AppHost:Sha256"]!.Substring(0, RandomNameSuffixLength).ToLowerInvariant(),
68+
_ => GetProjectHashSuffix(),
7069
};
7170

7271
return (GetObjectNameForResource(container, _options.Value, nameSuffix), nameSuffix);
@@ -106,13 +105,20 @@ private static string GenerateUniqueServiceName(HashSet<string> serviceNames, st
106105
return uniqueName;
107106
}
108107

109-
private static string GetRandomNameSuffix()
108+
public static string GetRandomNameSuffix()
110109
{
111110
// RandomNameSuffixLength of lowercase characters
112111
var suffix = PasswordGenerator.Generate(RandomNameSuffixLength, true, false, false, false, RandomNameSuffixLength, 0, 0, 0);
113112
return suffix;
114113
}
115114

115+
public string GetProjectHashSuffix()
116+
{
117+
// Compute a short hash of the content root path to differentiate between multiple AppHost projects with similar resource names
118+
var suffix = _configuration["AppHost:Sha256"]!.Substring(0, RandomNameSuffixLength).ToLowerInvariant();
119+
return suffix;
120+
}
121+
116122
public static string GetObjectNameForResource(IResource resource, DcpOptions options, string suffix = "")
117123
{
118124
if (resource.TryGetLastAnnotation<ContainerNameAnnotation>(out var containerNameAnnotation))

‎src/Components/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ New components MUST have:
231231
* ConfigurationSchema.json file
232232
* Public APIs
233233
* Tests
234-
* [ConformanceTests](../../tests/Aspire.Components.Common.Tests/ConformanceTests.cs)
234+
* [ConformanceTests](../../tests/Aspire.Components.Common.TestUtilities/ConformanceTests.cs)
235235
* [EndToEndTests](../../tests/Aspire.EndToEnd.Tests/README.md#adding-tests-for-new-components)
236236
* Other unit tests as needed
237237
* Tracing support

‎tests/Aspire.Azure.AI.Inference.Tests/Aspire.Azure.AI.Inference.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<ItemGroup>
1616
<ProjectReference Include="..\..\src\Components\Aspire.Azure.AI.Inference\Aspire.Azure.AI.Inference.csproj" />
17-
<ProjectReference Include="..\Aspire.Components.Common.Tests\Aspire.Components.Common.Tests.csproj" />
17+
<ProjectReference Include="..\Aspire.Components.Common.TestUtilities\Aspire.Components.Common.TestUtilities.csproj" />
1818
</ItemGroup>
1919

2020
</Project>

‎tests/Aspire.Azure.AI.OpenAI.Tests/Aspire.Azure.AI.OpenAI.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<ItemGroup>
1616
<ProjectReference Include="..\..\src\Components\Aspire.Azure.AI.OpenAI\Aspire.Azure.AI.OpenAI.csproj" />
17-
<ProjectReference Include="..\Aspire.Components.Common.Tests\Aspire.Components.Common.Tests.csproj" />
17+
<ProjectReference Include="..\Aspire.Components.Common.TestUtilities\Aspire.Components.Common.TestUtilities.csproj" />
1818
</ItemGroup>
1919

2020
</Project>

‎tests/Aspire.Azure.Data.Tables.Tests/Aspire.Azure.Data.Tables.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<ItemGroup>
1616
<ProjectReference Include="..\..\src\Components\Aspire.Azure.Data.Tables\Aspire.Azure.Data.Tables.csproj" />
17-
<ProjectReference Include="..\Aspire.Components.Common.Tests\Aspire.Components.Common.Tests.csproj" />
17+
<ProjectReference Include="..\Aspire.Components.Common.TestUtilities\Aspire.Components.Common.TestUtilities.csproj" />
1818
</ItemGroup>
1919

2020
</Project>

‎tests/Aspire.Azure.Messaging.EventHubs.Tests/Aspire.Azure.Messaging.EventHubs.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<ProjectReference Include="..\..\src\Components\Aspire.Azure.Messaging.EventHubs\Aspire.Azure.Messaging.EventHubs.csproj" />
1919
<ProjectReference Include="..\..\src\Components\Aspire.Azure.Storage.Blobs\Aspire.Azure.Storage.Blobs.csproj" />
20-
<ProjectReference Include="..\Aspire.Components.Common.Tests\Aspire.Components.Common.Tests.csproj" />
20+
<ProjectReference Include="..\Aspire.Components.Common.TestUtilities\Aspire.Components.Common.TestUtilities.csproj" />
2121
</ItemGroup>
2222

2323
</Project>

‎tests/Aspire.Azure.Messaging.ServiceBus.Tests/Aspire.Azure.Messaging.ServiceBus.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<ItemGroup>
1616
<ProjectReference Include="..\..\src\Components\Aspire.Azure.Messaging.ServiceBus\Aspire.Azure.Messaging.ServiceBus.csproj" />
17-
<ProjectReference Include="..\Aspire.Components.Common.Tests\Aspire.Components.Common.Tests.csproj" />
17+
<ProjectReference Include="..\Aspire.Components.Common.TestUtilities\Aspire.Components.Common.TestUtilities.csproj" />
1818
</ItemGroup>
1919

2020
</Project>

‎tests/Aspire.Azure.Messaging.WebPubSub.Tests/Aspire.Azure.Messaging.WebPubSub.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<None Include="$(RepoRoot)src\Components\Aspire.Azure.Messaging.WebPubSub\ConfigurationSchema.json" CopyToOutputDirectory="PreserveNewest" />
99

1010
<ProjectReference Include="..\..\src\Components\Aspire.Azure.Messaging.WebPubSub\Aspire.Azure.Messaging.WebPubSub.csproj" />
11-
<ProjectReference Include="..\Aspire.Components.Common.Tests\Aspire.Components.Common.Tests.csproj" />
11+
<ProjectReference Include="..\Aspire.Components.Common.TestUtilities\Aspire.Components.Common.TestUtilities.csproj" />
1212
</ItemGroup>
1313

1414
</Project>

‎tests/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.Tests/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<None Include="$(RepoRoot)src\Components\Aspire.Npgsql.EntityFrameworkCore.PostgreSQL\ConfigurationSchema.json" CopyToOutputDirectory="PreserveNewest" />
1717

1818
<ProjectReference Include="..\..\src\Components\Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL\Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.csproj" />
19-
<ProjectReference Include="..\Aspire.Components.Common.Tests\Aspire.Components.Common.Tests.csproj" />
19+
<ProjectReference Include="..\Aspire.Components.Common.TestUtilities\Aspire.Components.Common.TestUtilities.csproj" />
2020

2121
<PackageReference Include="Microsoft.DotNet.RemoteExecutor" />
2222
<PackageReference Include="Testcontainers.PostgreSQL" />

‎tests/Aspire.Azure.Npgsql.Tests/Aspire.Azure.Npgsql.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<ItemGroup>
1313
<ProjectReference Include="..\..\src\Components\Aspire.Azure.Npgsql\Aspire.Azure.Npgsql.csproj" />
14-
<ProjectReference Include="..\Aspire.Components.Common.Tests\Aspire.Components.Common.Tests.csproj" />
14+
<ProjectReference Include="..\Aspire.Components.Common.TestUtilities\Aspire.Components.Common.TestUtilities.csproj" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎tests/Aspire.Azure.Npgsql.Tests/PostgreSQLContainerFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
using Aspire.Components.Common.Tests;
4+
using Aspire.Components.Common.TestUtilities;
55
using Aspire.Hosting.Postgres;
66
using Aspire.TestUtilities;
77
using Testcontainers.PostgreSql;

‎tests/Aspire.Azure.Search.Documents.Tests/Aspire.Azure.Search.Documents.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<ItemGroup>
1616
<ProjectReference Include="..\..\src\Components\Aspire.Azure.Search.Documents\Aspire.Azure.Search.Documents.csproj" />
17-
<ProjectReference Include="..\Aspire.Components.Common.Tests\Aspire.Components.Common.Tests.csproj" />
17+
<ProjectReference Include="..\Aspire.Components.Common.TestUtilities\Aspire.Components.Common.TestUtilities.csproj" />
1818
</ItemGroup>
1919

2020
</Project>

‎tests/Aspire.Azure.Security.KeyVault.Tests/Aspire.Azure.Security.KeyVault.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<ItemGroup>
1616
<ProjectReference Include="..\..\src\Components\Aspire.Azure.Security.KeyVault\Aspire.Azure.Security.KeyVault.csproj" />
17-
<ProjectReference Include="..\Aspire.Components.Common.Tests\Aspire.Components.Common.Tests.csproj" />
17+
<ProjectReference Include="..\Aspire.Components.Common.TestUtilities\Aspire.Components.Common.TestUtilities.csproj" />
1818
</ItemGroup>
1919

2020
</Project>

0 commit comments

Comments
 (0)