-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Only enable Aspire functionality in non-optimized builds (i.e. Debug) #31494
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
a58e8db
Only enable Aspire functionality in debug
jfversluis ee3c6c8
Default to false and add warning
jfversluis be5b9e6
Update src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard…
jfversluis 2688475
Update src/Core/src/Hosting/Dispatching/AppHostBuilderExtensions.cs
jfversluis 25328c7
Update src/Core/src/Hosting/Dispatching/AppHostBuilderExtensions.cs
jfversluis ff53944
Add documentation and flip default value
jfversluis e44ba73
Update Microsoft.Maui.Controls.targets
jfversluis 473e66d
Use Optimized MS Build
jfversluis File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| using System; | ||
| using System.Collections; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Text.RegularExpressions; | ||
| using Microsoft.Extensions.Configuration; | ||
| using Microsoft.Extensions.DependencyInjection; | ||
|
|
@@ -35,8 +36,34 @@ public static MauiAppBuilder ConfigureDispatching(this MauiAppBuilder builder) | |
|
|
||
| public static MauiAppBuilder ConfigureEnvironmentVariables(this MauiAppBuilder builder) | ||
| { | ||
| if (!RuntimeFeature.EnableMauiAspire) | ||
| { | ||
| return builder; | ||
| } | ||
|
|
||
| IDictionary environmentVariables = Environment.GetEnvironmentVariables(); | ||
|
|
||
| #if ANDROID | ||
| const string androidEnvVarFilePath = "/data/local/tmp/ide-launchenv.txt"; | ||
|
|
||
| // For Android we read the environment variables from a text file that is written to the device/emulator | ||
| // If the file not exists, we will use the default environment variables which is less stable | ||
| if (OperatingSystem.IsAndroid() && System.IO.File.Exists(androidEnvVarFilePath)) | ||
jfversluis marked this conversation as resolved.
Show resolved
Hide resolved
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do we need the
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Probably not! Double safe! |
||
| { | ||
| var envVarLines = System.IO.File.ReadAllLines(androidEnvVarFilePath); | ||
|
|
||
| var fileEnvironmentVariables = envVarLines | ||
| .Select(line => line.Split('=', 2)) | ||
jfversluis marked this conversation as resolved.
Show resolved
Hide resolved
jfversluis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| .ToDictionary(parts => parts[0], parts => parts[1]); | ||
|
|
||
| // Merge file environment variables into the existing environment variables | ||
| foreach (var kvp in fileEnvironmentVariables) | ||
| { | ||
| environmentVariables[kvp.Key] = kvp.Value; | ||
| } | ||
| } | ||
| #endif | ||
|
|
||
| string devTunnelId = environmentVariables["DEVTUNNEL_ID"]?.ToString() ?? string.Empty; | ||
|
|
||
| var variablesToInclude = new HashSet<string> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.