Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.5.2" />
<PackageVersion Include="Aspire.Hosting.RabbitMQ" Version="9.5.2" />
<PackageVersion Include="Aspire.Hosting.Redis" Version="9.5.2" />
<PackageVersion Include="Aspire.Hosting.SqlServer" Version="9.5.2" />
<PackageVersion Include="Aspire.RabbitMQ.Client" Version="9.5.2" />
<PackageVersion Include="Aspire.Hosting.AppHost" Version="13.0.0" />
<PackageVersion Include="Aspire.Hosting.RabbitMQ" Version="13.0.0" />
<PackageVersion Include="Aspire.Hosting.Redis" Version="13.0.0" />
<PackageVersion Include="Aspire.Hosting.SqlServer" Version="13.0.0" />
<PackageVersion Include="Aspire.RabbitMQ.Client" Version="13.0.0" />
<PackageVersion Include="AWSSDK.Core" Version="4.0.1.3" />
<PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.3.11" />
<PackageVersion Include="AWSSDK.SecurityToken" Version="4.0.4.1" />
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.Minio" Version="9.9.0" />
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects" Version="9.8.1-beta.424" />
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.Minio" Version="13.0.0" />
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects" Version="13.0.0" />
<PackageVersion Include="Autofac" Version="8.4.0" />
<PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
<PackageVersion Include="AWSSDK.S3" Version="4.0.11.1" />
<PackageVersion Include="AutoMapper" Version="12.0.1" />
<PackageVersion Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
<PackageVersion Include="CommunityToolkit.Aspire.Minio.Client" Version="9.9.0" />
<PackageVersion Include="CommunityToolkit.Aspire.Minio.Client" Version="13.0.0" />
<PackageVersion Include="coverlet.collector" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
3 changes: 1 addition & 2 deletions src/Aspire/Aspire.AppHost/Aspire.AppHost.csproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Aspire.AppHost.Sdk" Version="9.5.2" />
<Sdk Name="Aspire.AppHost.Sdk" Version="13.0.0" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsAspireHost>true</IsAspireHost>
<UserSecretsId>4314ae44-7ea1-4bdc-bda3-c55826dd2434</UserSecretsId>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
14 changes: 8 additions & 6 deletions src/Aspire/Aspire.AppHost/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,17 @@
var builder = DistributedApplication.CreateBuilder(args);

// Parameters
var password = builder.AddParameter("password", true);
var apiKey = builder.AddParameter("apikey", true);
var isDevelopment = builder.AddParameter("IsDevelopment");
var apiKey = builder.AddParameter("apiKey", true);
var isDevelopment = builder.AddParameter("isDevelopment");
var rabbitPassword = builder.AddParameter("rabbitPassword", true);
var sqlPassword = builder.AddParameter("sqlPassword", true);
var minioPassword = builder.AddParameter("minioPassword", true);

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

// Database setup
var sql = builder.AddDmsSqlServer(password)
var sql = builder.AddDmsSqlServer(sqlPassword)
.WithBindMount(hostMount, targetMount);

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

var rabbit = builder
.AddRabbitMQ("RabbitMQ")
.AddRabbitMQ("RabbitMQ", password: rabbitPassword)
.WithManagementPlugin();

// MinIO (s3 emulation)
var minio = builder.AddMinioContainer("minio")
var minio = builder.AddMinioContainer("minio", rootPassword: minioPassword)
.WithDataVolume("dms-minio-data");

builder.AddDmsServices(
Expand Down
8 changes: 5 additions & 3 deletions src/Aspire/Aspire.AppHost/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
}
},
"Parameters": {
"password": "P@ssword123!",
"apikey": "password",
"isDevelopment": "True"
"apiKey": "password",
"isDevelopment": "True",
"rabbitPassword": "guest",
"sqlPassword": "P@ssword123!",
"minioPassword": "minioadmin"
}
}
1 change: 0 additions & 1 deletion src/FakeDataSeeder/FakeDataSeeder.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion src/FileSync/FileSync.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<UserSecretsId>8317f847-53e8-4625-a75d-5aab845b6f17</UserSecretsId>
Expand Down
1 change: 0 additions & 1 deletion src/Visualiser/Visualiser.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>Visualiser</RootNamespace>
Expand Down