Skip to content

[release/10.0.1xx] [android] fix Aspire integration / env vars #32120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
github-actions wants to merge 1 commit into from
+8 −9
Closed

[release/10.0.1xx] [android] fix Aspire integration / env vars #32120

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 8 additions & 9 deletions src/Core/src/Hosting/Dispatching/AppHostBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,15 @@ public static MauiAppBuilder ConfigureEnvironmentVariables(this MauiAppBuilder b
// If the file not exists, we will use the default environment variables which is less stable
if (OperatingSystem.IsAndroid() && System.IO.File.Exists(androidEnvVarFilePath))
{
var envVarLines = System.IO.File.ReadAllLines(androidEnvVarFilePath);

var fileEnvironmentVariables = envVarLines
.Select(line => line.Split('=', 2))
.ToDictionary(parts => parts[0], parts => parts[1]);

// Merge file environment variables into the existing environment variables
foreach (var kvp in fileEnvironmentVariables)
foreach (var line in System.IO.File.ReadLines(androidEnvVarFilePath))
{
environmentVariables[kvp.Key] = kvp.Value;
int index = line.IndexOf('=', StringComparison.Ordinal);
if (index > 0)
{
string key = line.Substring(0, index);
string value = line.Substring(index + 1); // May be empty for values like "KEY="
environmentVariables[key] = value;
}
}
}
#endif
Expand Down