Skip to content

Commit 78d45b4

Browse files
eerhardteerhardt
authored
Merge branch 'main' into ExtractPythonTests
2 parents 8cac0a3 + b6cbbd8 commit 78d45b4

File tree

9 files changed

+289
-25
lines changed

9 files changed

+289
-25
lines changed

‎.github/dependabot.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,11 @@ updates:
2929
AspNetCoreHealthChecks:
3030
patterns:
3131
- "AspNetCore.HealthChecks.*"
32-
AspNetCore:
33-
patterns:
34-
- "Microsoft.AspNetCore.*"
35-
- "Microsoft.Extensions.Features"
3632
AWS:
3733
patterns:
3834
- "AWS.*"
3935
- "AWSSDK.*"
4036
- "OpenTelemetry.*.AWS"
41-
MicrosoftExtensions:
42-
patterns:
43-
- "Microsoft.Extensions.*"
4437
EntityFrameworkCore:
4538
patterns:
4639
- "Microsoft.EntityFrameworkCore.*"
@@ -50,6 +43,13 @@ updates:
5043
OpenTelemetry:
5144
patterns:
5245
- "OpenTelemetry.*"
46+
Orleans:
47+
patterns:
48+
- "Microsoft.Orleans*"
49+
NetPlatform:
50+
patterns:
51+
- "Microsoft.AspNetCore.*"
52+
- "Microsoft.Extensions.*"
5353
Npgsql:
5454
patterns:
5555
- "Npgsql.*"

‎Aspire.sln‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hosting", "Hosting", "{830A
508508
EndProject
509509
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Hosting.Redis.Tests", "tests\Aspire.Hosting.Redis.Tests\Aspire.Hosting.Redis.Tests.csproj", "{1BC02557-B78B-48CE-9D3C-488A6B7672F4}"
510510
EndProject
511+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Hosting.PostgreSQL.Tests", "tests\Aspire.Hosting.PostgreSQL.Tests\Aspire.Hosting.PostgreSQL.Tests.csproj", "{7425E5B2-BC47-4521-AC40-B8CECA329E08}"
512+
EndProject
511513
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Hosting.Qdrant.Tests", "tests\Aspire.Hosting.Qdrant.Tests\Aspire.Hosting.Qdrant.Tests.csproj", "{8E2AA85E-C351-47B4-AF91-58557FAD5840}"
512514
EndProject
513515
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Hosting.Python.Tests", "tests\Aspire.Hosting.Python.Tests\Aspire.Hosting.Python.Tests.csproj", "{72F5A6F3-3516-402B-8F8D-50A7BC2E4BD4}"
@@ -1338,6 +1340,10 @@ Global
13381340
{72F5A6F3-3516-402B-8F8D-50A7BC2E4BD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
13391341
{72F5A6F3-3516-402B-8F8D-50A7BC2E4BD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
13401342
{72F5A6F3-3516-402B-8F8D-50A7BC2E4BD4}.Release|Any CPU.Build.0 = Release|Any CPU
1343+
{7425E5B2-BC47-4521-AC40-B8CECA329E08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1344+
{7425E5B2-BC47-4521-AC40-B8CECA329E08}.Debug|Any CPU.Build.0 = Debug|Any CPU
1345+
{7425E5B2-BC47-4521-AC40-B8CECA329E08}.Release|Any CPU.ActiveCfg = Release|Any CPU
1346+
{7425E5B2-BC47-4521-AC40-B8CECA329E08}.Release|Any CPU.Build.0 = Release|Any CPU
13411347
EndGlobalSection
13421348
GlobalSection(SolutionProperties) = preSolution
13431349
HideSolutionNode = FALSE
@@ -1583,6 +1589,7 @@ Global
15831589
{1BC02557-B78B-48CE-9D3C-488A6B7672F4} = {830A89EC-4029-4753-B25A-068BAE37DEC7}
15841590
{8E2AA85E-C351-47B4-AF91-58557FAD5840} = {830A89EC-4029-4753-B25A-068BAE37DEC7}
15851591
{72F5A6F3-3516-402B-8F8D-50A7BC2E4BD4} = {830A89EC-4029-4753-B25A-068BAE37DEC7}
1592+
{7425E5B2-BC47-4521-AC40-B8CECA329E08} = {830A89EC-4029-4753-B25A-068BAE37DEC7}
15861593
EndGlobalSection
15871594
GlobalSection(ExtensibilityGlobals) = postSolution
15881595
SolutionGuid = {6DCEDFEC-988E-4CB3-B45B-191EB5086E0C}

‎eng/Versions.props‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.24360.5</MicrosoftDotNetXUnitExtensionsPackageVersion>
3434
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.24360.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
3535
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.24360.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
36-
<MicrosoftExtensionsHttpResiliencePackageVersion>8.6.0</MicrosoftExtensionsHttpResiliencePackageVersion>
37-
<MicrosoftExtensionsDiagnosticsTestingPackageVersion>8.6.0</MicrosoftExtensionsDiagnosticsTestingPackageVersion>
36+
<MicrosoftExtensionsHttpResiliencePackageVersion>8.7.0</MicrosoftExtensionsHttpResiliencePackageVersion>
37+
<MicrosoftExtensionsDiagnosticsTestingPackageVersion>8.7.0</MicrosoftExtensionsDiagnosticsTestingPackageVersion>
3838
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>8.0.0</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
39-
<MicrosoftExtensionsConfigurationBinderPackageVersion>8.0.1</MicrosoftExtensionsConfigurationBinderPackageVersion>
39+
<MicrosoftExtensionsConfigurationBinderPackageVersion>8.0.2</MicrosoftExtensionsConfigurationBinderPackageVersion>
4040
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>8.0.1</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
4141
<MicrosoftExtensionsHostingAbstractionsPackageVersion>8.0.0</MicrosoftExtensionsHostingAbstractionsPackageVersion>
4242
<MicrosoftExtensionsHostingPackageVersion>8.0.0</MicrosoftExtensionsHostingPackageVersion>
@@ -48,16 +48,16 @@
4848
<MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>8.0.6</MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>
4949
<MicrosoftAspNetCoreOpenApiPackageVersion>8.0.6</MicrosoftAspNetCoreOpenApiPackageVersion>
5050
<MicrosoftAspNetCoreOutputCachingStackExchangeRedisPackageVersion>8.0.6</MicrosoftAspNetCoreOutputCachingStackExchangeRedisPackageVersion>
51-
<MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>8.0.6</MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>
52-
<MicrosoftExtensionsDiagnosticsHealthChecksEntityFrameworkCorePackageVersion>8.0.6</MicrosoftExtensionsDiagnosticsHealthChecksEntityFrameworkCorePackageVersion>
53-
<MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion>8.0.6</MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion>
51+
<MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>8.0.7</MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>
52+
<MicrosoftExtensionsDiagnosticsHealthChecksEntityFrameworkCorePackageVersion>8.0.7</MicrosoftExtensionsDiagnosticsHealthChecksEntityFrameworkCorePackageVersion>
53+
<MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion>8.0.7</MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion>
5454
<MicrosoftExtensionsFeaturesPackageVersion>8.0.6</MicrosoftExtensionsFeaturesPackageVersion>
55-
<MicrosoftExtensionsTimeProviderTestingVersion>8.6.0</MicrosoftExtensionsTimeProviderTestingVersion>
55+
<MicrosoftExtensionsTimeProviderTestingVersion>8.7.0</MicrosoftExtensionsTimeProviderTestingVersion>
5656
<!-- EF -->
57-
<MicrosoftEntityFrameworkCoreCosmosPackageVersion>8.0.6</MicrosoftEntityFrameworkCoreCosmosPackageVersion>
58-
<MicrosoftEntityFrameworkCoreDesignPackageVersion>8.0.6</MicrosoftEntityFrameworkCoreDesignPackageVersion>
59-
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>8.0.6</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
60-
<MicrosoftEntityFrameworkCoreToolsPackageVersion>8.0.6</MicrosoftEntityFrameworkCoreToolsPackageVersion>
57+
<MicrosoftEntityFrameworkCoreCosmosPackageVersion>8.0.7</MicrosoftEntityFrameworkCoreCosmosPackageVersion>
58+
<MicrosoftEntityFrameworkCoreDesignPackageVersion>8.0.7</MicrosoftEntityFrameworkCoreDesignPackageVersion>
59+
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>8.0.7</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
60+
<MicrosoftEntityFrameworkCoreToolsPackageVersion>8.0.7</MicrosoftEntityFrameworkCoreToolsPackageVersion>
6161
<MicrosoftNETRuntimeWorkloadTestingInternalVersion>9.0.0-preview.5.24272.3</MicrosoftNETRuntimeWorkloadTestingInternalVersion>
6262
</PropertyGroup>
6363
</Project>

‎src/Aspire.Hosting.PostgreSQL/Aspire.Hosting.PostgreSQL.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<InternalsVisibleTo Include="Aspire.Hosting.Tests" />
25+
<InternalsVisibleTo Include="Aspire.Hosting.PostgreSQL.Tests" />
2626
</ItemGroup>
2727

2828
</Project>

‎src/Shared/SecretsStore.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace Microsoft.Extensions.SecretManager.Tools.Internal;
1212
/// <summary>
1313
/// Adapted from dotnet user-secrets at https://github.com/dotnet/aspnetcore/blob/482730a4c773ee4b3ae9525186d10999c89b556d/src/Tools/dotnet-user-secrets/src/Internal/SecretsStore.cs
1414
/// </summary>
15-
internal class SecretsStore
15+
internal sealed class SecretsStore
1616
{
1717
private readonly string _secretsFilePath;
1818
private readonly Dictionary<string, string?> _secrets;

tests/Aspire.Hosting.Tests/Postgres/AddPostgresTests.cs renamed to tests/Aspire.Hosting.PostgreSQL.Tests/AddPostgresTests.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33

44
using System.Net.Sockets;
55
using System.Text.Json;
6+
using Aspire.Hosting.ApplicationModel;
67
using Aspire.Hosting.Postgres;
78
using Aspire.Hosting.Tests.Utils;
89
using Aspire.Hosting.Utils;
910
using Microsoft.Extensions.DependencyInjection;
1011
using Xunit;
1112

12-
namespace Aspire.Hosting.Tests.Postgres;
13+
namespace Aspire.Hosting.PostgreSQL.Tests;
1314

1415
public class AddPostgresTests
1516
{
@@ -20,7 +21,7 @@ public void AddPostgresAddsGeneratedPasswordParameterWithUserSecretsParameterDef
2021

2122
var pg = appBuilder.AddPostgres("pg");
2223

23-
Assert.IsType<UserSecretsParameterDefault>(pg.Resource.PasswordParameter.Default);
24+
Assert.Equal(nameof(UserSecretsParameterDefault), pg.Resource.PasswordParameter.Default?.GetType().Name);
2425
}
2526

2627
[Fact]
@@ -30,7 +31,7 @@ public void AddPostgresDoesNotAddGeneratedPasswordParameterWithUserSecretsParame
3031

3132
var pg = appBuilder.AddPostgres("pg");
3233

33-
Assert.IsNotType<UserSecretsParameterDefault>(pg.Resource.PasswordParameter.Default);
34+
Assert.Equal(nameof(GenerateParameterDefault), pg.Resource.PasswordParameter.Default?.GetType().Name);
3435
}
3536

3637
[Fact]

‎tests/Aspire.Hosting.PostgreSQL.Tests/Aspire.Hosting.PostgreSQL.Tests.csproj‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>$(NetCurrent)</TargetFramework>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<ProjectReference Include="..\..\src\Aspire.Hosting.AppHost\Aspire.Hosting.AppHost.csproj" />
9+
<ProjectReference Include="..\..\src\Aspire.Hosting.PostgreSQL\Aspire.Hosting.PostgreSQL.csproj" />
10+
<ProjectReference Include="..\Aspire.Hosting.Tests\Aspire.Hosting.Tests.csproj" />
11+
</ItemGroup>
12+
13+
<ItemGroup>
14+
<Compile Include="$(SharedDir)SecretsStore.cs" Link="Utils\SecretsStore.cs" />
15+
<Compile Include="$(RepoRoot)src\Aspire.Hosting\ApplicationModel\UserSecretsParameterDefault.cs" Link="Utils\UserSecretsParameterDefault.cs" />
16+
</ItemGroup>
17+
18+
</Project>

0 commit comments

Comments
 (0)