[One .NET] set env var automatically for $(UseInterpreter) (#6027)

jonathanpeppers · web-flow · commit ee4924956a3f · 2021-06-18T08:13:01.000-05:00
Fixes: #6016 Context: https://github.com/dotnet/maui/blob/main/src/Templates/src/templates/maui-mobile/MauiApp1/Android/AndroidEnvironment.txt Currently, the the .NET MAUI project template includes a `@(AndroidEnvironment)` file for "Hot Reload" scenarios. Let's setup this value by default so it will not be needed.
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
@@ -3929,17 +3929,21 @@ public void AbiNameInIntermediateOutputPath ()
 		public void PackageNamingPolicy ([Values ("LowercaseMD5", "LowercaseCrc64")] string packageNamingPolicy)
 		{
 			var proj = new XamarinAndroidApplicationProject ();
+			proj.SetProperty ("UseInterpreter", "true");
 			proj.SetProperty ("AndroidPackageNamingPolicy", packageNamingPolicy);
 			proj.SetAndroidSupportedAbis ("armeabi-v7a", "x86");
 			using (var b = CreateApkBuilder ()) {
 				Assert.IsTrue (b.Build (proj), "build should have succeeded.");
 				var environment = b.Output.GetIntermediaryPath (Path.Combine ("__environment__.txt"));
 				FileAssert.Exists (environment);
+				var values = new List<string> {
+					$"__XA_PACKAGE_NAMING_POLICY__={packageNamingPolicy}"
+				};
 				if (Builder.UseDotNet) {
-					Assert.AreEqual ($"__XA_PACKAGE_NAMING_POLICY__={packageNamingPolicy}{Environment.NewLine}mono.enable_assembly_preload=0", File.ReadAllText (environment).Trim ());
-				} else {
-					Assert.AreEqual ($"__XA_PACKAGE_NAMING_POLICY__={packageNamingPolicy}", File.ReadAllText (environment).Trim ());
+					values.Add ("mono.enable_assembly_preload=0");
+					values.Add ("DOTNET_MODIFIABLE_ASSEMBLIES=Debug");
 				}
+				Assert.AreEqual (string.Join (Environment.NewLine, values), File.ReadAllText (environment).Trim ());
 			}
 		}
 
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -1513,6 +1513,7 @@ because xbuild doesn't support framework reference assemblies.
   <ItemGroup>
     <_GeneratedAndroidEnvironment Include="__XA_PACKAGE_NAMING_POLICY__=$(AndroidPackageNamingPolicy)" />
     <_GeneratedAndroidEnvironment Include="mono.enable_assembly_preload=0" Condition=" '$(AndroidEnablePreloadAssemblies)' != 'True' " />
+    <_GeneratedAndroidEnvironment Include="DOTNET_MODIFIABLE_ASSEMBLIES=Debug" Condition=" '$(UsingAndroidNETSdk)' == 'true' and '$(AndroidIncludeDebugSymbols)' == 'true' and '$(AndroidUseInterpreter)' == 'true' " />
   </ItemGroup>
   <WriteLinesToFile
       File="$(IntermediateOutputPath)__environment__.txt"

Original file line number	Diff line number	Diff line change
`@@ -3929,17 +3929,21 @@ public void AbiNameInIntermediateOutputPath ()`
`3929`	`3929`	`public void PackageNamingPolicy ([Values ("LowercaseMD5", "LowercaseCrc64")] string packageNamingPolicy)`
`3930`	`3930`	`{`
`3931`	`3931`	`var proj = new XamarinAndroidApplicationProject ();`
	`3932`	`+ proj.SetProperty ("UseInterpreter", "true");`
`3932`	`3933`	`proj.SetProperty ("AndroidPackageNamingPolicy", packageNamingPolicy);`
`3933`	`3934`	`proj.SetAndroidSupportedAbis ("armeabi-v7a", "x86");`
`3934`	`3935`	`using (var b = CreateApkBuilder ()) {`
`3935`	`3936`	`Assert.IsTrue (b.Build (proj), "build should have succeeded.");`
`3936`	`3937`	`var environment = b.Output.GetIntermediaryPath (Path.Combine ("__environment__.txt"));`
`3937`	`3938`	`FileAssert.Exists (environment);`
	`3939`	`+ var values = new List<string> {`
	`3940`	`+ $"__XA_PACKAGE_NAMING_POLICY__={packageNamingPolicy}"`
	`3941`	`+ };`
`3938`	`3942`	`if (Builder.UseDotNet) {`
`3939`		`- Assert.AreEqual ($"__XA_PACKAGE_NAMING_POLICY__={packageNamingPolicy}{Environment.NewLine}mono.enable_assembly_preload=0", File.ReadAllText (environment).Trim ());`
`3940`		`- } else {`
`3941`		`- Assert.AreEqual ($"__XA_PACKAGE_NAMING_POLICY__={packageNamingPolicy}", File.ReadAllText (environment).Trim ());`
	`3943`	`+ values.Add ("mono.enable_assembly_preload=0");`
	`3944`	`+ values.Add ("DOTNET_MODIFIABLE_ASSEMBLIES=Debug");`
`3942`	`3945`	`}`
	`3946`	`+ Assert.AreEqual (string.Join (Environment.NewLine, values), File.ReadAllText (environment).Trim ());`
`3943`	`3947`	`}`
`3944`	`3948`	`}`
`3945`	`3949`