[Xamarin.Android.sln] Fix issues preventing parallel builds.

Author: jpobst

Directory.Build.props

@@ -22,6 +22,8 @@
     <ProduceReferenceAssemblyInOutDir>true</ProduceReferenceAssemblyInOutDir>
     <!-- Ensure command-line apps can use a newer .NET -->
     <RollForward>Major</RollForward>
+    <!-- We don't need to be warned that we are using a preview .NET -->
+    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
   </PropertyGroup>
 
   <PropertyGroup>

build-tools/automation/azure-pipelines.yaml

@@ -208,7 +208,7 @@ stages:
       parameters:
         project: Xamarin.Android.sln
         arguments: >-
-          -t:PackDotNet -c $(XA.Build.Configuration) -m:1 -v:n
+          -t:PackDotNet -c $(XA.Build.Configuration) -v:n
           -bl:$(System.DefaultWorkingDirectory)\bin\Build$(XA.Build.Configuration)\dotnet-build.binlog
         displayName: Build Solution
         continueOnError: false

build-tools/create-android-api/create-android-api.csproj

@@ -12,6 +12,7 @@
     <ProjectReference Include="..\..\external\Java.Interop\tools\class-parse\class-parse.csproj" ReferenceOutputAssembly="False" />
     <ProjectReference Include="..\api-xml-adjuster\api-xml-adjuster.csproj" ReferenceOutputAssembly="False" />
     <ProjectReference Include="..\api-merge\api-merge.csproj" ReferenceOutputAssembly="False" />
+    <ProjectReference Include="..\jnienv-gen\jnienv-gen.csproj" ReferenceOutputAssembly="False" SkipGetTargetFrameworkProperties="True" AdditionalProperties="TargetFramework=net472" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -117,6 +118,17 @@
         Command="$(ManagedRuntime) $(ManagedRuntimeArgs) $(ApiMerge) -config=$(_ConfigurationFile) -config-input-dir=$(_ConfigurationInputBaseDirectory) -config-output-dir=$(_ConfigurationOutputBaseDirectory)" />
 
   </Target>
+  
+  <!-- Generates 'JNIEnv.g.cs' file. We do this here because it should only run once, not per-TF.  -->
+  <Target Name="_BuildJNIEnv"
+      BeforeTargets="Build"
+      Inputs="..\..\bin\Build$(Configuration)\jnienv-gen.exe"
+      Outputs="../../src/Mono.Android/Android.Runtime/JNIEnv.g.cs">
+    <Exec
+        Command="$(ManagedRuntime) $(ManagedRuntimeArgs) &quot;../../bin/Build$(Configuration)/jnienv-gen.exe&quot; -o ../../src/Mono.Android/Android.Runtime/JNIEnv.g.cs --use-java-interop"
+    />
+    <Touch Files="../../src/Mono.Android/Android.Runtime/JNIEnv.g.cs" />
+  </Target>
 
   <!-- Clean up generated API files -->
   <Target Name="_CleanApiXml"

build-tools/scripts/BuildEverything.mk

@@ -27,5 +27,5 @@ endif
 leeroy: leeroy-all framework-assemblies
 
 leeroy-all:
-	$(call DOTNET_BINLOG,leeroy-all) $(SOLUTION) -m:1 $(_MSBUILD_ARGS)
+	$(call DOTNET_BINLOG,leeroy-all) $(SOLUTION) $(_MSBUILD_ARGS)
 	$(call MSBUILD_BINLOG,leeroy-all,$(_SLN_BUILD)) /restore tools/xabuild/xabuild.csproj /p:Configuration=$(CONFIGURATION) $(_MSBUILD_ARGS)

src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj

@@ -12,6 +12,7 @@
     <PackageReference Include="Microsoft.NET.ILLink" Version="$(MicrosoftNETILLinkTasksPackageVersion)" />
     <PackageReference Include="XliffTasks" Version="$(XliffTasksVersion)" PrivateAssets="all" />
     <ProjectReference Include="..\..\external\Java.Interop\src\Java.Interop.Export\Java.Interop.Export.csproj" />
+    <ProjectReference Include="..\Xamarin.Android.Build.Tasks\Xamarin.Android.Build.Tasks.csproj" ReferenceOutputAssembly="False" />
 
     <Compile Include="..\Xamarin.Android.Build.Tasks\obj\$(Configuration)\Profile.g.cs" Link="Profile.g.cs" />
 

src/Mono.Android/Mono.Android.csproj

@@ -375,7 +375,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\build-tools\create-android-api\create-android-api.csproj" ReferenceOutputAssembly="false" />
     <!-- Explicitly pass the target framework of the project so we don't have conflicts with the multiple targets in this file. -->
-    <ProjectReference Include="..\..\build-tools\jnienv-gen\jnienv-gen.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" AdditionalProperties="TargetFramework=net472" />
     <ProjectReference Include="..\..\external\Java.Interop\tools\generator\generator.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" AdditionalProperties="TargetFramework=net472"/>
     <ProjectReference Include="..\..\external\Java.Interop\tools\java-source-utils\java-source-utils.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" AdditionalProperties="TargetFramework=net472" />
     <ProjectReference Include="..\..\external\Java.Interop\tools\jcw-gen\jcw-gen.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" AdditionalProperties="TargetFramework=net472" />

src/Mono.Android/Mono.Android.targets

@@ -120,17 +120,6 @@
     <Touch Files="$(_AndroidJavadocXml)" />
   </Target>
 
-  <!-- Generates 'JNIEnv.g.cs' file -->
-  <Target Name="_BuildJNIEnv"
-      BeforeTargets="CoreCompile"
-      Inputs="..\..\bin\Build$(Configuration)\jnienv-gen.exe"
-      Outputs="Android.Runtime\JNIEnv.g.cs">
-    <Exec
-        Command="$(ManagedRuntime) $(ManagedRuntimeArgs) &quot;../../bin/Build$(Configuration)/jnienv-gen.exe&quot; -o Android.Runtime/JNIEnv.g.cs --use-java-interop"
-    />
-    <Touch Files="Android.Runtime\JNIEnv.g.cs" />
-  </Target>
-  
   <!-- Copies common 'api-X.xml' to the 'obj' directory.
        This is needed because 'generator' writes intermediate files like 'api-X.xml.fixed' next to the source
        'api-X.xml' and multiple profiles are using the source, so these files will clobber each other. -->

tools/javadoc2mdoc/javadoc2mdoc.csproj

@@ -5,6 +5,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>Xamarin.Android.Tools.JavadocToMDoc</RootNamespace>
     <AssemblyName>javadoc-to-mdoc</AssemblyName>
+    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\$(TargetFramework)\</IntermediateOutputPath>
   </PropertyGroup>
   <Import Project="..\..\Configuration.props" />
   <PropertyGroup Condition="'$(TargetFramework)' == 'net472'">