[WIP] More dotnet build support for unix

Author: pjcollins

Makefile

@@ -22,7 +22,7 @@ _PREPARE_CI_MODE_ARGS = $(_PREPARE_CI_MODE_PR_ARGS) -a
 _PREPARE_ARGS =
 
 all:
-	$(call MSBUILD_BINLOG,all,$(_SLN_BUILD)) /restore $(MSBUILD_FLAGS) $(SOLUTION)
+	$(call DOTNET_BINLOG,all) $(MSBUILD_FLAGS) $(SOLUTION) -m:1
 	$(call MSBUILD_BINLOG,all,$(_SLN_BUILD)) /restore $(MSBUILD_FLAGS) tools/xabuild/xabuild.csproj
 
 -include bin/Build$(CONFIGURATION)/rules.mk
@@ -97,7 +97,7 @@ all-tests::
 	MSBUILD="$(MSBUILD)" $(call MSBUILD_BINLOG,all-tests,tools/scripts/xabuild) /restore $(MSBUILD_FLAGS) Xamarin.Android-Tests.sln
 
 pack-dotnet::
-	$(call MSBUILD_BINLOG,pack-dotnet,$(_SLN_BUILD)) $(MSBUILD_FLAGS) Xamarin.Android.sln /t:PackDotNet
+	$(call DOTNET_BINLOG,pack-dotnet) $(MSBUILD_FLAGS) $(SOLUTION) -m:1 -t:PackDotNet
 
 install::
 	@if [ ! -d "bin/$(CONFIGURATION)" ]; then \
@@ -141,7 +141,7 @@ run-all-tests:
 	exit $$_r
 
 clean:
-	$(call MSBUILD_BINLOG,clean) /t:Clean Xamarin.Android.sln
+	$(call DOTNET_BINLOG,clean) -t:Clean $(SOLUTION) -m:1
 	tools/scripts/xabuild $(MSBUILD_FLAGS) /t:Clean Xamarin.Android-Tests.sln
 
 distclean:

build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj

@@ -19,4 +19,28 @@
     <ProjectReference Include="..\..\external\xamarin-android-tools\src\Xamarin.Android.Tools.AndroidSdk\Xamarin.Android.Tools.AndroidSdk.csproj" />
   </ItemGroup>
 
+ <!-- See https://github.com/xamarin/xamarin-android/commit/ceca993068c0401f664676db85edec1d772bf5ff -->
+  <ItemGroup>
+    <None Include="$(PkgMono_Unix)\runtimes\linux-x64\native\libMono.Unix.so" CopyToOutputDirectory="PreserveNewest" />
+    <_MonoUnixDylib Include="$(PkgMono_Unix)\runtimes\osx-arm64\native\libMono.Unix.dylib" Condition=" '$(HostOS)' == 'Darwin' " />
+    <_MonoUnixDylib Include="$(PkgMono_Unix)\runtimes\osx-x64\native\libMono.Unix.dylib" />
+  </ItemGroup>
+  <PropertyGroup>
+    <_MonoUnixOutputDylib>$(OutputPath)$(TargetFrameworkNETStandard)\libMono.Unix.dylib</_MonoUnixOutputDylib>
+  </PropertyGroup>
+  <Target Name="_MakeMonoUnixFatBinariesOSX"
+      AfterTargets="CopyFilesToOutputDirectory"
+      Inputs="@(_MonoUnixDylib)"
+      Outputs="$(_MonoUnixOutputDylib)">
+    <Exec
+        Command="lipo @(_MonoUnixDylib->'&quot;%(FullPath)&quot;', ' ') -create -output &quot;$(_MonoUnixOutputDylib)&quot;"
+        Condition=" '$(HostOS)' == 'Darwin' "
+    />
+    <Copy
+        SourceFiles="@(_MonoUnixDylib)"
+        DestinationFolder="$(OutputPath)"
+        Condition=" '$(HostOS)' != 'Darwin' "
+    />
+  </Target>
+
 </Project>

build-tools/scripts/BuildEverything.mk

@@ -22,10 +22,10 @@ ifneq ("$(wildcard $(topdir)/external/monodroid/Makefile)","")
 	cd $(topdir)/external/monodroid && ./configure --with-xamarin-android='$(topdir)'
 	cd $(topdir)/external/monodroid && $(MAKE) build-monodroid CONFIGURATION=$(CONFIGURATION) XAMARIN_ANDROID_PATH=$(topdir)
 endif
-	$(MAKE) leeroy $(ZIP_OUTPUT)
+	$(MAKE) leeroy
 
 leeroy: leeroy-all framework-assemblies
 
 leeroy-all:
-	$(call MSBUILD_BINLOG,leeroy-all,$(_SLN_BUILD)) /restore $(SOLUTION) /p:Configuration=$(CONFIGURATION) $(_MSBUILD_ARGS)
+	$(call DOTNET_BINLOG,leeroy-all) $(SOLUTION) -m:1 $(_MSBUILD_ARGS)
 	$(call MSBUILD_BINLOG,leeroy-all,$(_SLN_BUILD)) /restore tools/xabuild/xabuild.csproj /p:Configuration=$(CONFIGURATION) $(_MSBUILD_ARGS)

build-tools/scripts/Packaging.mk

@@ -11,7 +11,7 @@ create-nupkgs:
 	$(call DOTNET_BINLOG,create-all-packs) -t:CreateAllPacks $(topdir)/build-tools/create-packs/Microsoft.Android.Sdk.proj
 
 create-pkg:
-	MONO_IOMAP=all MONO_OPTIONS="$(MONO_OPTIONS)" $(call MSBUILD_BINLOG,create-pkg) /p:Configuration=$(CONFIGURATION) /t:CreatePkg \
+	$(call DOTNET_BINLOG,create-pkg) /t:CreatePkg \
 		build-tools/create-pkg/create-pkg.csproj \
 		$(if $(PACKAGE_VERSION),/p:ProductVersion="$(PACKAGE_VERSION)") \
 		$(if $(PACKAGE_VERSION_REV),/p:XAVersionCommitCount="$(PACKAGE_VERSION_REV)") \
@@ -21,10 +21,12 @@ create-pkg:
 		$(if $(_MSBUILD_ARGS),"$(_MSBUILD_ARGS)")
 
 create-workload-installers:
-	MONO_IOMAP=all MONO_OPTIONS="$(MONO_OPTIONS)" $(call MSBUILD_BINLOG,create-workload-installers) /p:Configuration=$(CONFIGURATION) /t:CreateWorkloadInstallers \
+	$(call DOTNET_BINLOG,create-workload-installers) /t:CreateWorkloadInstallers \
 		Xamarin.Android.sln \
 		$(if $(_MSBUILD_ARGS),"$(_MSBUILD_ARGS)")
 
+# create-vsix.csproj dependencies do not yet support `dotnet build`:
+#    .nuget/packages/microsoft.vssdk.buildtools/17.0.4207-preview4/build/Microsoft.VSSDK.BuildTools.targets(16,5): error MSB4801: The task factory "CodeTaskFactory" is not supported on the .NET Core version of MSBuild.
 create-vsix:
 	MONO_IOMAP=all MONO_OPTIONS="$(MONO_OPTIONS)" $(call MSBUILD_BINLOG,create-vsix) /p:Configuration=$(CONFIGURATION) /p:CreateVsixContainer=True \
 		build-tools/create-vsix/create-vsix.csproj \

build-tools/xaprepare/xaprepare/Application/GeneratedMakeRulesFile.cs

@@ -129,8 +129,8 @@ void Generate (Context context, StreamWriter sw)
 				WriteRuleLine ( "if [ $$? -ne 0 ] ; then \\");
 				WriteRuleLine ($"\trm -f {redistFile}; \\");
 				WriteRuleLine ( "fi; \\");
-				WriteRuleLine ( "$(call MSBUILD_BINLOG,Mono.Android,$(_SLN_BUILD)) src/Mono.Android/Mono.Android.csproj \\");
-				WriteRuleLine ( "\t/p:Configuration=$(CONFIGURATION) $(_MSBUILD_ARGS) \\");
+				WriteRuleLine ( "$(call DOTNET_BINLOG,Mono.Android) src/Mono.Android/Mono.Android.csproj \\");
+				WriteRuleLine ( "\t$(_MSBUILD_ARGS) \\");
 				WriteRuleLine ($"\t/p:AndroidApiLevel={apiLevel} /p:AndroidPlatformId={platformId} /p:AndroidFrameworkVersion={curVersion} \\");
 				WriteRuleLine ($"\t/p:AndroidPreviousFrameworkVersion={prevVersion} || exit 1;");
 
@@ -170,8 +170,8 @@ void Generate (Context context, StreamWriter sw)
 			void WriteMSBuildCall (string fileToRemovePath, string projectPath)
 			{
 				WriteRuleLine ($"rm -f {fileToRemovePath}");
-				WriteRuleLine ($"$(call MSBUILD_BINLOG,NUnitLite,$(_SLN_BUILD)) $(MSBUILD_FLAGS) {projectPath} \\");
-				WriteRuleLine ( "\t/p:Configuration=$(CONFIGURATION) $(_MSBUILD_ARGS) \\");
+				WriteRuleLine ($"$(call DOTNET_BINLOG,NUnitLite) $(MSBUILD_FLAGS) {projectPath} \\");
+				WriteRuleLine ( "\t$(_MSBUILD_ARGS) \\");
 				WriteRuleLine ($"\t/p:AndroidApiLevel={firstApiLevel} /p:AndroidPlatformId={firstPlatformId} \\");
 				WriteRuleLine ($"\t/p:AndroidFrameworkVersion={firstFramework} || exit 1;");
 			}

external/debugger-libs

@@ -316,8 +316,7 @@
   <Target Name="ILRepacker"
       BeforeTargets="CopyFilesToOutputDirectory"
       Inputs="$(MSBuildAllProjects);@(IntermediateAssembly);@(InputAssemblies)"
-      Outputs="$(IntermediateOutputPath)ILRepacker.stamp"
-      Condition=" '$(HostOS)' != 'Linux' ">
+      Outputs="$(IntermediateOutputPath)ILRepacker.stamp" >
     <ItemGroup>
       <_InputAssembliesThatExist Include="@(InputAssemblies)" Condition="Exists('%(Identity)')" />
       <_NetstandardPath Include="@(ReferencePath->'%(RootDir)%(Directory)')" Condition="'%(FileName)%(Extension)' == 'netstandard.dll'" />

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

@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Target Name="_RemapAssemblies"
       AfterTargets="Build"
-      Condition=" '$(TargetFramework)' != '' ">
+      Condition=" '$(TargetFramework)' == 'net472' ">
     <ItemGroup>
       <_Source Include="$(OutputPath)Mono.Debugging.Soft.dll">
         <From>Mono.Cecil</From>