Skip to content

Commit

Permalink
[tests] verify $DOTNET_MODIFIABLE_ASSEMBLIES is set (#9417)
Browse files Browse the repository at this point in the history
Bump to xamarin/monodroid@62976287

Changes: xamarin/monodroid@87e386c...6297628

* [Debugging.Tasks] Update System.Text.Json to 8.0.5

* [ci] Use latest macOS-14 image

* [Debugging.Tasks] Resolve build warnings

* Bump to xamarin/androidtools/main@24626, xamarin/android-sdk-installer/main@5ed12, dotnet/android/main@ac8bf

* [tools/msbuild] fix padding on longest fast deployed env var

---------

Co-authored-by: Dean Ellis <dellis1972@googlemail.com>
  • Loading branch information
jonathanpeppers and dellis1972 authored Oct 18, 2024
1 parent 2f82027 commit 16dfb1e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .external
Original file line number Diff line number Diff line change
@@ -1 +1 @@
xamarin/monodroid:main@87e386cba1210b95f432836da9cb964f385b6506
xamarin/monodroid:main@62976287a5392ccc17ffff10bcafdc3cecedc89b
11 changes: 10 additions & 1 deletion tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -966,7 +966,8 @@ public void FastDeployEnvironmentFiles ([Values (false, true)] bool isRelease)
};
proj.MainActivity = proj.DefaultMainActivity.Replace ("//${AFTER_ONCREATE}", @"
Console.WriteLine (""Foo="" + Environment.GetEnvironmentVariable(""Foo""));
Console.WriteLine (""Bar34="" + Environment.GetEnvironmentVariable(""Bar34""));");
Console.WriteLine (""Bar34="" + Environment.GetEnvironmentVariable(""Bar34""));
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 @@ -988,6 +989,14 @@ public void FastDeployEnvironmentFiles ([Values (false, true)] bool isRelease)
logcatOutput,
"The Environment variable \"Bar34\" was not set."
);
// NOTE: set when $(UseInterpreter) is true, default for Debug mode
if (!isRelease) {
StringAssert.Contains (
"DOTNET_MODIFIABLE_ASSEMBLIES=Debug",
logcatOutput,
"The Environment variable \"DOTNET_MODIFIABLE_ASSEMBLIES\" was not set."
);
}
}

[Test]
Expand Down

0 comments on commit 16dfb1e

Please sign in to comment.