diff --git a/Directory.Packages.props b/Directory.Packages.props
index 08ef317..889acfd 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -3,22 +3,22 @@
true
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Aspire/Aspire.AppHost/Aspire.AppHost.csproj b/src/Aspire/Aspire.AppHost/Aspire.AppHost.csproj
index b8795e8..5ed2065 100644
--- a/src/Aspire/Aspire.AppHost/Aspire.AppHost.csproj
+++ b/src/Aspire/Aspire.AppHost/Aspire.AppHost.csproj
@@ -1,12 +1,11 @@
-
+
Exe
enable
enable
true
4314ae44-7ea1-4bdc-bda3-c55826dd2434
- net9.0
diff --git a/src/Aspire/Aspire.AppHost/Program.cs b/src/Aspire/Aspire.AppHost/Program.cs
index 3c588c3..f2bb85f 100644
--- a/src/Aspire/Aspire.AppHost/Program.cs
+++ b/src/Aspire/Aspire.AppHost/Program.cs
@@ -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);
@@ -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(
diff --git a/src/Aspire/Aspire.AppHost/appsettings.json b/src/Aspire/Aspire.AppHost/appsettings.json
index e4919bd..168b646 100644
--- a/src/Aspire/Aspire.AppHost/appsettings.json
+++ b/src/Aspire/Aspire.AppHost/appsettings.json
@@ -7,8 +7,10 @@
}
},
"Parameters": {
- "password": "P@ssword123!",
- "apikey": "password",
- "isDevelopment": "True"
+ "apiKey": "password",
+ "isDevelopment": "True",
+ "rabbitPassword": "guest",
+ "sqlPassword": "P@ssword123!",
+ "minioPassword": "minioadmin"
}
}
diff --git a/src/FakeDataSeeder/FakeDataSeeder.csproj b/src/FakeDataSeeder/FakeDataSeeder.csproj
index 4c6267a..e1382c0 100644
--- a/src/FakeDataSeeder/FakeDataSeeder.csproj
+++ b/src/FakeDataSeeder/FakeDataSeeder.csproj
@@ -2,7 +2,6 @@
Exe
- net10.0
enable
enable
diff --git a/src/FileSync/FileSync.csproj b/src/FileSync/FileSync.csproj
index 2c366b9..4741c84 100644
--- a/src/FileSync/FileSync.csproj
+++ b/src/FileSync/FileSync.csproj
@@ -2,7 +2,6 @@
Exe
- net10.0
enable
enable
8317f847-53e8-4625-a75d-5aab845b6f17
diff --git a/src/Visualiser/Visualiser.csproj b/src/Visualiser/Visualiser.csproj
index cefedde..4e9e8d3 100644
--- a/src/Visualiser/Visualiser.csproj
+++ b/src/Visualiser/Visualiser.csproj
@@ -1,7 +1,6 @@
- net10.0
enable
enable
Visualiser