Skip to content

Commit 6ca2896

Browse files
samgibsonmojsamgibsonmoj
authored
Upgrade aspire (#20)
* Updates Aspire dependencies to v13 * Configures parameters for various services * Updates CommunityToolkit packages to stable version
1 parent 2b70c04 commit 6ca2896

7 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎Directory.Packages.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.5.2" />
7-
<PackageVersion Include="Aspire.Hosting.RabbitMQ" Version="9.5.2" />
8-
<PackageVersion Include="Aspire.Hosting.Redis" Version="9.5.2" />
9-
<PackageVersion Include="Aspire.Hosting.SqlServer" Version="9.5.2" />
10-
<PackageVersion Include="Aspire.RabbitMQ.Client" Version="9.5.2" />
6+
<PackageVersion Include="Aspire.Hosting.AppHost" Version="13.0.0" />
7+
<PackageVersion Include="Aspire.Hosting.RabbitMQ" Version="13.0.0" />
8+
<PackageVersion Include="Aspire.Hosting.Redis" Version="13.0.0" />
9+
<PackageVersion Include="Aspire.Hosting.SqlServer" Version="13.0.0" />
10+
<PackageVersion Include="Aspire.RabbitMQ.Client" Version="13.0.0" />
1111
<PackageVersion Include="AWSSDK.Core" Version="4.0.1.3" />
1212
<PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.3.11" />
1313
<PackageVersion Include="AWSSDK.SecurityToken" Version="4.0.4.1" />
14-
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.Minio" Version="9.9.0" />
15-
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects" Version="9.8.1-beta.424" />
14+
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.Minio" Version="13.0.0" />
15+
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects" Version="13.0.0" />
1616
<PackageVersion Include="Autofac" Version="8.4.0" />
1717
<PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
1818
<PackageVersion Include="AWSSDK.S3" Version="4.0.11.1" />
1919
<PackageVersion Include="AutoMapper" Version="12.0.1" />
2020
<PackageVersion Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
21-
<PackageVersion Include="CommunityToolkit.Aspire.Minio.Client" Version="9.9.0" />
21+
<PackageVersion Include="CommunityToolkit.Aspire.Minio.Client" Version="13.0.0" />
2222
<PackageVersion Include="coverlet.collector" Version="6.0.4">
2323
<PrivateAssets>all</PrivateAssets>
2424
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎src/Aspire/Aspire.AppHost/Aspire.AppHost.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Sdk Name="Aspire.AppHost.Sdk" Version="9.5.2" />
2+
<Sdk Name="Aspire.AppHost.Sdk" Version="13.0.0" />
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsAspireHost>true</IsAspireHost>
88
<UserSecretsId>4314ae44-7ea1-4bdc-bda3-c55826dd2434</UserSecretsId>
9-
<TargetFramework>net9.0</TargetFramework>
109
</PropertyGroup>
1110

1211
<ItemGroup>

‎src/Aspire/Aspire.AppHost/Program.cs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@
33
var builder = DistributedApplication.CreateBuilder(args);
44

55
// Parameters
6-
var password = builder.AddParameter("password", true);
7-
var apiKey = builder.AddParameter("apikey", true);
8-
var isDevelopment = builder.AddParameter("IsDevelopment");
6+
var apiKey = builder.AddParameter("apiKey", true);
7+
var isDevelopment = builder.AddParameter("isDevelopment");
8+
var rabbitPassword = builder.AddParameter("rabbitPassword", true);
9+
var sqlPassword = builder.AddParameter("sqlPassword", true);
10+
var minioPassword = builder.AddParameter("minioPassword", true);
911

1012
var hostMount = HostExtensions.Create(Path.Combine(builder.AppHostDirectory, "DMS_STAGING"));
1113
var targetMount = "/app/";
1214

1315
// Database setup
14-
var sql = builder.AddDmsSqlServer(password)
16+
var sql = builder.AddDmsSqlServer(sqlPassword)
1517
.WithBindMount(hostMount, targetMount);
1618

1719
var databases = builder.AddDmsDatabases(sql, seedData: false);
@@ -23,11 +25,11 @@
2325
builder.AddDmsVisualiser(apiService);
2426

2527
var rabbit = builder
26-
.AddRabbitMQ("RabbitMQ")
28+
.AddRabbitMQ("RabbitMQ", password: rabbitPassword)
2729
.WithManagementPlugin();
2830

2931
// MinIO (s3 emulation)
30-
var minio = builder.AddMinioContainer("minio")
32+
var minio = builder.AddMinioContainer("minio", rootPassword: minioPassword)
3133
.WithDataVolume("dms-minio-data");
3234

3335
builder.AddDmsServices(

‎src/Aspire/Aspire.AppHost/appsettings.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77
}
88
},
99
"Parameters": {
10-
"password": "P@ssword123!",
11-
"apikey": "password",
12-
"isDevelopment": "True"
10+
"apiKey": "password",
11+
"isDevelopment": "True",
12+
"rabbitPassword": "guest",
13+
"sqlPassword": "P@ssword123!",
14+
"minioPassword": "minioadmin"
1315
}
1416
}

‎src/FakeDataSeeder/FakeDataSeeder.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net10.0</TargetFramework>
65
<ImplicitUsings>enable</ImplicitUsings>
76
<Nullable>enable</Nullable>
87
</PropertyGroup>

‎src/FileSync/FileSync.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net10.0</TargetFramework>
65
<ImplicitUsings>enable</ImplicitUsings>
76
<Nullable>enable</Nullable>
87
<UserSecretsId>8317f847-53e8-4625-a75d-5aab845b6f17</UserSecretsId>

‎src/Visualiser/Visualiser.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net10.0</TargetFramework>
54
<Nullable>enable</Nullable>
65
<ImplicitUsings>enable</ImplicitUsings>
76
<RootNamespace>Visualiser</RootNamespace>

0 commit comments

Comments
 (0)