Skip to content

[net10.0] [dotnet] Don't overwrite any existing value for DOTNET_DiagnosticPorts when computed through our build logic. #23997

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

Merged
merged 2 commits into from
Oct 15, 2025
Merged

[net10.0] [dotnet] Don't overwrite any existing value for DOTNET_DiagnosticPorts when computed through our build logic. #23997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c75d87d
[dotnet] Don't overwrite any existing value for DOTNET_DiagnosticPort…
rolfbjarne Oct 3, 2025
4b59327
Auto-format source code
Oct 14, 2025
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
2 changes: 1 addition & 1 deletion dotnet/targets/Xamarin.Shared.Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@
DeploymentTarget=$(_MinimumOSVersion)
@(_CustomLinkFlags -> 'CustomLinkFlags=%(Identity)')
EnableSGenConc=$(EnableSGenConc)
@(_BundlerEnvironmentVariables -> 'EnvironmentVariable=%(Identity)=%(Value)')
@(_BundlerEnvironmentVariables -> 'EnvironmentVariable=Overwrite=%(Overwrite)|%(Identity)=%(Value)')
@(_XamarinFrameworkAssemblies -> 'FrameworkAssembly=%(Filename)')
Interpreter=$(MtouchInterpreter)
IntermediateLinkDir=$(IntermediateLinkDir)
Expand Down
6 changes: 3 additions & 3 deletions msbuild/Xamarin.Shared/Xamarin.Shared.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,9 +235,9 @@ Copyright (C) 2020 Microsoft. All rights reserved.
<DiagnosticConfiguration Condition="'$(DiagnosticSuspend)' == 'true'">$(DiagnosticConfiguration),suspend</DiagnosticConfiguration>
<DiagnosticConfiguration Condition="'$(DiagnosticSuspend)' != 'true'">$(DiagnosticConfiguration),nosuspend</DiagnosticConfiguration>
</PropertyGroup>
<PropertyGroup Condition="'$(EnableDiagnostics)' == 'true' And '$(DiagnosticConfiguration)' != '' And '$(DiagnosticConfiguration)' != 'disable'">
<AppBundleExtraOptions>$(AppBundleExtraOptions) --setenv=DOTNET_DiagnosticPorts=$(DiagnosticConfiguration)</AppBundleExtraOptions>
</PropertyGroup>
<ItemGroup Condition="'$(EnableDiagnostics)' == 'true' And '$(DiagnosticConfiguration)' != '' And '$(DiagnosticConfiguration)' != 'disable'">
<_BundlerEnvironmentVariables Include="DOTNET_DiagnosticPorts" Value="$(DiagnosticConfiguration)" Overwrite="false" />
</ItemGroup>

<PropertyGroup Condition="'$(IsBindingProject)' == 'true'">
<GeneratedSourcesDir Condition="'$(GeneratedSourcesDir)' == ''">$(IntermediateOutputPath)$(_PlatformName)</GeneratedSourcesDir>
Expand Down
2 changes: 1 addition & 1 deletion tools/common/Application.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public bool AreAnyAssembliesTrimmed {
public bool EnableDiagnostics;
public bool? DebugTrack;

public Dictionary<string, string> EnvironmentVariables = new Dictionary<string, string> ();
public Dictionary<string, (string Value, bool Overwrite)> EnvironmentVariables = new Dictionary<string, (string Value, bool Overwrite)> ();

public MarshalObjectiveCExceptionMode MarshalObjectiveCExceptions;
public MarshalManagedExceptionMode MarshalManagedExceptions;
Expand Down
8 changes: 6 additions & 2 deletions tools/common/Target.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,8 +777,12 @@ void GenerateIOSMain (StringWriter sw, Abi abi)
if (!string.IsNullOrEmpty (app.MonoGCParams))
sw.WriteLine ("\tsetenv (\"MONO_GC_PARAMS\", \"{0}\", 1);", app.MonoGCParams);
// Do this last, so that the app developer can override any other environment variable we set.
foreach (var kvp in app.EnvironmentVariables)
sw.WriteLine ("\tsetenv (\"{0}\", \"{1}\", 1);", kvp.Key.Replace ("\"", "\\\""), kvp.Value.Replace ("\"", "\\\""));
foreach (var kvp in app.EnvironmentVariables) {
var name = kvp.Key;
var value = kvp.Value.Value;
var overwrite = kvp.Value.Overwrite;
sw.WriteLine ("\tsetenv (\"{0}\", \"{1}\", {2});", name.Replace ("\"", "\\\""), value.Replace ("\"", "\\\""), overwrite ? 1 : 0);
}
if (app.XamarinRuntime != XamarinRuntime.NativeAOT)
sw.WriteLine ("\txamarin_supports_dynamic_registration = {0};", app.DynamicRegistrationSupported ? "TRUE" : "FALSE");
#if NET && !LEGACY_TOOLS
Expand Down
14 changes: 13 additions & 1 deletion tools/dotnet-linker/LinkerConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,11 +173,23 @@ public static LinkerConfiguration GetInstance (LinkContext context)
Application.EnableSGenConc = string.Equals (value, "true", StringComparison.OrdinalIgnoreCase);
break;
case "EnvironmentVariable":
var overwrite = true;
var needle = "Overwrite=";
if (value.StartsWith (needle, StringComparison.Ordinal)) {
var pipe = value.IndexOf ('|', needle.Length);
if (pipe > 0) {
var overwriteString = value [needle.Length..pipe];
if (!TryParseOptionalBoolean (overwriteString, out var parsedOverwrite))
throw new InvalidOperationException ($"Unable to parse the 'Overwrite' value '{overwriteString}' for the environment variable entry '{value}' in {linker_file}");
overwrite = parsedOverwrite.Value;
value = value [(pipe + 1)..];
}
}
var separators = new char [] { ':', '=' };
var equals = value.IndexOfAny (separators);
var name = value.Substring (0, equals);
var val = value.Substring (equals + 1);
Application.EnvironmentVariables.Add (name, val);
Application.EnvironmentVariables.Add (name, new (val, overwrite));
break;
case "FrameworkAssembly":
FrameworkAssemblies.Add (value);
Expand Down
Loading