Merge remote-tracking branch 'origin/master' into jonp-mono.android-x…

…ml-docs

Bump to jonpryor/java.interop@a65b8ab

.gitmodules

@@ -17,10 +17,10 @@
 [submodule "external/lz4"]
     path = external/lz4
     url = https://github.com/lz4/lz4.git
-    branch = master
+    branch = release
 [submodule "external/mman-win32"]
     path = external/mman-win32
-    url = https://github.com/witwall/mman-win32.git
+    url = https://github.com/alitrack/mman-win32.git
     branch = master
 [submodule "external/nrefactory"]
     path = external/nrefactory

Configuration.props

@@ -116,8 +116,7 @@
     <XAPlatformToolsPackagePrefix Condition=" '$(HostOS)' == 'Darwin' ">b2be9c80582174e645d3736daa0d44d8610b38a8.</XAPlatformToolsPackagePrefix>
     <XAPlatformToolsVersion>30.0.2</XAPlatformToolsVersion>
     <XAIncludeProprietaryBits Condition="'$(XAIncludeProprietaryBits)' == ''">False</XAIncludeProprietaryBits>
-    <XABundleToolVersion Condition="'$(XABundleToolVersion)' == ''">1.2.0</XABundleToolVersion>
-    <XAManifestMergerToolVersion Condition="'$(XAManifestMergerToolVersion)' == ''">26.5.0</XAManifestMergerToolVersion>
+    <XABundleToolVersion Condition="'$(XABundleToolVersion)' == ''">1.4.0</XABundleToolVersion>
     <XAPackagesDir Condition=" '$(XAPackagesDir)' == '' And '$(NUGET_PACKAGES)' != '' ">$(NUGET_PACKAGES)</XAPackagesDir>
     <XAPackagesDir Condition=" '$(XAPackagesDir)' == '' ">$(XamarinAndroidSourcePath)\packages</XAPackagesDir>
     <PathSeparator>$([System.IO.Path]::PathSeparator)</PathSeparator>

Documentation/release-notes/aapt2-4.1.1.md

@@ -0,0 +1,4 @@
+### aapt2 update to 4.1.1
+
+The version of the [aapt2](https://developer.android.com/studio/command-line/aapt2)
+command-line tool has been updated from 4.0.0 to 4.1.1.

Documentation/release-notes/bundletool-1.4.0.md

@@ -0,0 +1,8 @@
+### bundletool version update to 1.4.0
+
+The version of the [`bundletool`][bundletool] executable included in
+Xamarin.Android has been updated from 1.2.0 to [1.4.0][bundletool-1.4.0],
+bringing in several improvements and bug fixes.
+
+[bundletool]: https://developer.android.com/studio/command-line/bundletool
+[bundletool-1.4.0]: https://github.com/google/bundletool/releases/tag/1.4.0

Documentation/release-notes/manifestmerger-27.1.1.md

@@ -0,0 +1,6 @@
+### manifestmerger.jar version update to 27.1.1
+
+The version of the [manifest merger][0] included in Xamarin.Android
+has been updated from 27.0.0 to 27.1.1.
+
+[0]: https://developer.android.com/studio/build/manifest-merge.html

Documentation/release-notes/r8-2.1.75.md

@@ -0,0 +1,4 @@
+### D8/R8 version update to 2.1.75
+
+The version of the [D8 dexer and R8 shrinker](https://r8.googlesource.com/r8)
+included in Xamarin.Android has been updated from 2.1.67 to 2.1.75.

build-tools/installers/create-installers.targets

@@ -146,8 +146,8 @@
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.Cecil.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.Diagnostics.dll" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.Diagnostics.pdb" />
-    <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.Generator.dll"  ExcludeFromAndroidNETSdk="true" />
-    <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.Generator.pdb"  ExcludeFromAndroidNETSdk="true" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.Generator.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.Generator.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.JavaCallableWrappers.dll" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.JavaCallableWrappers.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.JavaSource.dll" />
@@ -260,8 +260,8 @@
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.EmbeddedResource.targets" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.FSharp.targets" ExcludeFromAndroidNETSdk="true" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Legacy.targets" ExcludeFromAndroidNETSdk="true" />
-    <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.PCLSupport.props" />
-    <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.PCLSupport.targets" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.PCLSupport.props"                                    ExcludeFromAndroidNETSdk="true" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.PCLSupport.targets"                                  ExcludeFromAndroidNETSdk="true" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.SkipCases.projitems" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tooling.targets" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.Aidl.dll" />

build-tools/xaprepare/xaprepare/Steps/Step_DetermineAzurePipelinesTestJobs.cs

@@ -48,7 +48,7 @@ protected override async Task<bool> Execute (Context context)
 				// BCL: Runs BCL tests on emulator
 				// TimeZone: Runs timezone unit tests on emulator
 				// Designer: Runs designer integration tests
-				if (file == ".external") {
+				if (file == ".external" || file == "Configuration.props") {
 					testAreas.Add ("MSBuild");
 					testAreas.Add ("MSBuildDevice");
 					testAreas.Add ("BCL");
@@ -68,6 +68,11 @@ protected override async Task<bool> Execute (Context context)
 					testAreas.Add ("Designer");
 				}
 
+				if (file.Contains ("external/proguard")) {
+					testAreas.Add ("MSBuild");
+					testAreas.Add ("MSBuildDevice");
+				}
+
 				if (file.Contains ("src/aapt2")) {
 					testAreas.Add ("MSBuild");
 				}

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs

@@ -183,6 +183,7 @@ public void DotNetNew ([Values ("android", "androidlib", "android-bindinglib")]
 		{
 			var dotnet = CreateDotNetBuilder ();
 			Assert.IsTrue (dotnet.New (template), $"`dotnet new {template}` should succeed");
+			File.WriteAllBytes (Path.Combine (dotnet.ProjectDirectory, "foo.jar"), Convert.FromBase64String (InlineData.JavaClassesJarBase64));
 			Assert.IsTrue (dotnet.New ("android-activity"), "`dotnet new android-activity` should succeed");
 			Assert.IsTrue (dotnet.New ("android-layout", Path.Combine (dotnet.ProjectDirectory, "Resources", "layout")), "`dotnet new android-layout` should succeed");
 			Assert.IsTrue (dotnet.Build (), "`dotnet build` should succeed");
@@ -247,6 +248,7 @@ public void DotNetLibraryAarChanges ()
 			}
 
 			// Change res/raw/bar.txt contents
+			WaitFor (1000);
 			var bar_txt = Path.Combine (FullProjectDirectory, "Resources", "raw", "bar.txt");
 			File.WriteAllText (bar_txt, contents: "baz");
 			Assert.IsTrue (dotnet.Build (), "second build should succeed");

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs

@@ -399,12 +399,17 @@ protected bool BuildInternal (string projectOrSolution, string target, string []
 					if (psi.RedirectStandardError)
 						err.WaitOne ();
 					result = ranToCompletion && p.ExitCode == 0;
+					if (processLog != null) {
+						if (ranToCompletion) {
+							File.AppendAllText (processLog, $"ExitCode: {p.ExitCode}{Environment.NewLine}");
+						} else {
+							File.AppendAllText (processLog, $"Build Timed Out!{Environment.ExitCode}");
+						}
+					}
 				}
 
 				LastBuildTime = DateTime.UtcNow - start;
 
-				if (processLog != null && !ranToCompletion)
-					File.AppendAllText (processLog, "Build Timed Out!");
 				if (buildLogFullPath != null && File.Exists (buildLogFullPath)) {
 					foreach (var line in LastBuildOutput) {
 						if (line.StartsWith ("Time Elapsed", StringComparison.OrdinalIgnoreCase)) {

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets

@@ -2615,7 +2615,8 @@ because xbuild doesn't support framework reference assemblies.
 
 <Import Project="$(MSBuildThisFileDirectory)Xamarin.Android.Application.targets"
         Condition=" '$(AndroidApplication)' == 'True' "/>
-<Import Project="$(MSBuildThisFileDirectory)Xamarin.Android.PCLSupport.targets" />
+<Import Project="$(MSBuildThisFileDirectory)Xamarin.Android.PCLSupport.targets"
+        Condition=" '$(UsingAndroidNETSdk)' != 'true' " />
 <Import Project="$(MSBuildThisFileDirectory)Xamarin.Android.Designer.targets" />
 
 <Import Project="$(MSBuildThisFileDirectory)Xamarin.Installer.Common.targets"

src/aapt2/aapt2.targets

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.DownloadUri" />
   <PropertyGroup>
-    <Aapt2Version>4.0.0-6051327</Aapt2Version>
+    <Aapt2Version>4.1.1-6503028</Aapt2Version>
     <_Destination>$(XAInstallPrefix)xbuild\Xamarin\Android\</_Destination>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
   </PropertyGroup>

src/manifestmerger/build.gradle

@@ -19,7 +19,7 @@ repositories {
 
 dependencies {
     // https://mvnrepository.com/artifact/com.android.tools.build/manifest-merger
-    compile group: 'com.android.tools.build', name: 'manifest-merger', version: '27.0.0'
+    compile group: 'com.android.tools.build', name: 'manifest-merger', version: '27.1.1'
 }
 
 sourceSets {

src/manifestmerger/manifestmerger.csproj

@@ -8,9 +8,5 @@
 
   <Import Project="..\..\Configuration.props" />
 
-  <ItemGroup>
-    <ProjectReference Include="..\r8\r8.csproj" ReferenceOutputAssembly="False" />
-  </ItemGroup>
-
   <Import Project="manifestmerger.targets" />
 </Project>

src/r8/build.gradle

@@ -15,7 +15,7 @@ repositories {
 }
 
 dependencies {
-    compile group: 'com.android.tools', name: 'r8', version: '2.1.67'
+    compile group: 'com.android.tools', name: 'r8', version: '2.1.75'
 }
 
 jar {