Skip to content

[release/9.0.1xx] [xabt] fix MONO_GC_PARAMS=bridge-implementation=new env var #10293

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
jonathanpeppers merged 1 commit into from
Jul 15, 2025
Merged

[release/9.0.1xx] [xabt] fix MONO_GC_PARAMS=bridge-implementation=new env var #10293

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion .external
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DevDiv/android-platform-support:release/9.0.1xx@0ec8d44d5d90dd2b8ab69cc9791e22da4ff16a52
DevDiv/android-platform-support:release/9.0.1xx@709210edd65a679cd5a7b36c8e3a3140fba1c512
24 changes: 20 additions & 4 deletions tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,14 +961,19 @@ public void FastDeployEnvironmentFiles ([Values (false, true)] bool isRelease)
OtherBuildItems = {
new BuildItem("AndroidEnvironment", "env.txt") {
TextContent = () => @"Foo=Bar
Bar34=Foo55",
Bar34=Foo55
Empty=
MONO_GC_PARAMS=bridge-implementation=new",
}
}
};
proj.MainActivity = proj.DefaultMainActivity.Replace ("//${AFTER_ONCREATE}", @"
Console.WriteLine (""Foo="" + Environment.GetEnvironmentVariable(""Foo""));
Console.WriteLine (""Bar34="" + Environment.GetEnvironmentVariable(""Bar34""));
Console.WriteLine (""DOTNET_MODIFIABLE_ASSEMBLIES="" + Environment.GetEnvironmentVariable(""DOTNET_MODIFIABLE_ASSEMBLIES""));");
Console.WriteLine (""Empty="" + Environment.GetEnvironmentVariable(""Empty""));
Console.WriteLine (""MONO_GC_PARAMS="" + Environment.GetEnvironmentVariable(""MONO_GC_PARAMS""));
Console.WriteLine (""DOTNET_MODIFIABLE_ASSEMBLIES="" + Environment.GetEnvironmentVariable(""DOTNET_MODIFIABLE_ASSEMBLIES""));
");
var builder = CreateApkBuilder ();
Assert.IsTrue (builder.Build (proj), "`dotnet build` should succeed");
RunProjectAndAssert (proj, builder);
Expand All @@ -983,12 +988,23 @@ public void FastDeployEnvironmentFiles ([Values (false, true)] bool isRelease)
StringAssert.Contains (
"Foo=Bar",
logcatOutput,
"The Environment variable \"Foo\" was not set."
"The Environment variable \"Foo\" was not set to expected value \"Bar\"."
);
StringAssert.Contains (
"Bar34=Foo55",
logcatOutput,
"The Environment variable \"Bar34\" was not set."
"The Environment variable \"Bar34\" was not set to expected value \"Foo55\"."
);
// NOTE: `Empty=` test case is to ensure a blank value doesn't cause a build error
StringAssert.Contains (
"Empty=",
logcatOutput,
"The Environment variable \"Empty\" was not set."
);
StringAssert.Contains (
"MONO_GC_PARAMS=bridge-implementation=new",
logcatOutput,
"The Environment variable \"MONO_GC_PARAMS\" was not set to expected value \"bridge-implementation=new\"."
);
// NOTE: set when $(UseInterpreter) is true, default for Debug mode
if (!isRelease) {
Expand Down
Loading