dotnet · jonpryor · Apr 21, 2017 · Apr 21, 2017 · Apr 21, 2017
diff --git a/Xamarin.Android.sln b/Xamarin.Android.sln
@@ -83,7 +83,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTK", "src\OpenTK-1.0\Op
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libZipSharp", "external\LibZipSharp\libZipSharp.csproj", "{E248B2CA-303B-4645-ADDC-9D4459D550FD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Drawing.Primitives", "src\System.Drawing.Primitives\System.Drawing.Primitives.csproj", "{C9FF2E4D-D927-479E-838B-647C16763F64}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Drawing.Primitives", "src\System.Drawing.Primitives\System.Drawing.Primitives.mdproj", "{C9FF2E4D-D927-479E-838B-647C16763F64}"
 EndProject
 Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "libzip-windows", "build-tools\libzip-windows\libzip-windows.mdproj", "{0DE278D6-000F-4001-BB98-187C0AF58A61}"
 EndProject
@@ -109,6 +109,8 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xamarin.Android.Build.Tests
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "create-vsix", "build-tools\create-vsix\create-vsix.csproj", "{94756FEB-1F64-411D-A18E-81B5158F776A}"
 EndProject
+Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "netstandard", "src\netstandard\netstandard.mdproj", "{93614CB8-4564-43B9-93B0-4AF4B3B16AAE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|AnyCPU = Debug|AnyCPU
@@ -499,6 +501,14 @@ Global
 		{94756FEB-1F64-411D-A18E-81B5158F776A}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU
 		{94756FEB-1F64-411D-A18E-81B5158F776A}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU
 		{94756FEB-1F64-411D-A18E-81B5158F776A}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU
+		{93614CB8-4564-43B9-93B0-4AF4B3B16AAE}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
+		{93614CB8-4564-43B9-93B0-4AF4B3B16AAE}.Debug|AnyCPU.Build.0 = Debug|Any CPU
+		{93614CB8-4564-43B9-93B0-4AF4B3B16AAE}.Release|AnyCPU.ActiveCfg = Release|Any CPU
+		{93614CB8-4564-43B9-93B0-4AF4B3B16AAE}.Release|AnyCPU.Build.0 = Release|Any CPU
+		{93614CB8-4564-43B9-93B0-4AF4B3B16AAE}.XAIntegrationDebug|AnyCPU.ActiveCfg = Debug|Any CPU
+		{93614CB8-4564-43B9-93B0-4AF4B3B16AAE}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU
+		{93614CB8-4564-43B9-93B0-4AF4B3B16AAE}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU
+		{93614CB8-4564-43B9-93B0-4AF4B3B16AAE}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{8FF78EB6-6FC8-46A7-8A15-EBBA9045C5FA} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
@@ -551,6 +561,7 @@ Global
 		{A87352E6-CE7F-4346-B6B1-586AE931C0A7} = {864062D3-A415-4A6F-9324-5820237BA058}
 		{BD1D66BF-5AC7-4926-8EBE-B2198A112EB0} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483}
 		{94756FEB-1F64-411D-A18E-81B5158F776A} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
+		{93614CB8-4564-43B9-93B0-4AF4B3B16AAE} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		Policies = $0

diff --git a/build-tools/bundle/bundle-path.targets b/build-tools/bundle/bundle-path.targets
@@ -24,7 +24,7 @@
   <Target Name="GetBundleFileName"
       DependsOnTargets="_GetHashes">
     <PropertyGroup>
-      <XABundleFileName>bundle-v17-$(Configuration)-$(HostOS)-libzip=$(_LibZipHash),llvm=$(_LlvmHash),mono=$(_MonoHash).zip</XABundleFileName>
+      <XABundleFileName>bundle-v18-$(Configuration)-$(HostOS)-libzip=$(_LibZipHash),llvm=$(_LlvmHash),mono=$(_MonoHash).zip</XABundleFileName>
     </PropertyGroup>
   </Target>
 </Project>
diff --git a/build-tools/bundle/bundle.mdproj b/build-tools/bundle/bundle.mdproj
@@ -49,5 +49,17 @@
       <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
+    <ProjectReference Include="..\..\src\System.Drawing.Primitives\System.Drawing.Primitives.mdproj">
+      <Project>{C9FF2E4D-D927-479E-838B-647C16763F64}</Project>
+      <Name>System.Drawing.Primitives</Name>
+      <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\netstandard\netstandard.mdproj">
+      <Project>{93614CB8-4564-43B9-93B0-4AF4B3B16AAE}</Project>
+      <Name>netstandard</Name>
+      <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </ProjectReference>
   </ItemGroup>
 </Project>
diff --git a/build-tools/mono-runtimes/ProfileAssemblies.projitems b/build-tools/mono-runtimes/ProfileAssemblies.projitems
@@ -132,6 +132,15 @@
     <MonoFacadeAssembly Include="System.Xml.XPath.dll" />
     <MonoFacadeAssembly Include="System.Xml.XPath.XDocument.dll" />
     <MonoFacadeAssembly Include="System.Xml.Xsl.Primitives.dll" />
+    <!--
+      System.Drawing.Primitives and netstandard need a reference to Mono.Android.dll so their
+      build is driven from the XA repo by invoking make in the Mono submodule and passing the path
+      to Mono.Android.dll. This doesn't work however if we just have a bundle because the Mono
+      submodule won't be built. We need to add the facades to the bundle and not rebuild them in
+      this case (which is fine since all they depend on is the Mono.Android.dll assembly identity).
+    -->
+    <MonoFacadeAssembly Include="System.Drawing.Primitives.dll" />
+    <MonoFacadeAssembly Include="netstandard.dll" />
   </ItemGroup>
   <ItemGroup>
     <MonoProfileAssembly Include="I18N.CJK.dll" />

diff --git a/src/System.Drawing.Primitives/Properties/AssemblyInfo.cs b/src/System.Drawing.Primitives/Properties/AssemblyInfo.cs
diff --git a/src/System.Drawing.Primitives/System.Drawing.Primitives.csproj b/src/System.Drawing.Primitives/System.Drawing.Primitives.csproj
diff --git a/src/System.Drawing.Primitives/System.Drawing.Primitives.mdproj b/src/System.Drawing.Primitives/System.Drawing.Primitives.mdproj
@@ -0,0 +1,29 @@
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ItemType>GenericProject</ItemType>
+    <ProjectGuid>{C9FF2E4D-D927-479E-838B-647C16763F64}</ProjectGuid>
+    <OutputPath>..\..\bin\$(Configuration)\lib\xbuild-frameworks\MonoAndroid\v1.0\Facades</OutputPath>
+  </PropertyGroup>
+  <Import Project="..\..\Configuration.props" />
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.Common.targets" />
+  <PropertyGroup>
+    <BuildDependsOn>
+      ResolveReferences;
+      _BuildSystemDrawingPrimitivesFacade
+    </BuildDependsOn>
+  </PropertyGroup>
+  <Import Project="System.Drawing.Primitives.targets" />
+  <ItemGroup>
+    <ProjectReference Include="..\Mono.Android\Mono.Android.csproj">
+      <Project>{66CF299A-CE95-4131-BCD8-DB66E30C4BF7}</Project>
+      <Name>Mono.Android</Name>
+      <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
diff --git a/src/System.Drawing.Primitives/System.Drawing.Primitives.targets b/src/System.Drawing.Primitives/System.Drawing.Primitives.targets
@@ -0,0 +1,22 @@
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="_BuildSystemDrawingPrimitivesFacade"
+      Inputs="$(MonoSourceFullPath)\autogen.sh"
+      Outputs="$(OutputPath)\System.Drawing.Primitives.dll">
+    <MSBuild Projects="..\Mono.Android\Mono.Android.csproj"
+        Targets="GetTargetPath"
+        Properties="Configuration=$(Configuration)">
+      <Output TaskParameter="TargetOutputs" ItemName="MonoAndroidAssembly" />
+    </MSBuild>
+    <Exec Command="make -C $(MonoSourceFullPath)\mcs\class\Facades\System.Drawing.Primitives PROFILE=monodroid EXTRA_LIB_MCS_FLAGS=&quot;-r:%(MonoAndroidAssembly.Identity)&quot;" />
+    <Copy
+        SourceFiles="$(MonoSourceFullPath)\mcs\class\lib\monodroid\Facades\System.Drawing.Primitives.dll"
+        DestinationFiles="$(OutputPath)\System.Drawing.Primitives.dll"
+    />
+  </Target>
+  <Target Name="_CleanSystemDrawingPrimitivesFacade"
+      AfterTargets="Clean">
+    <Delete Files="$(OutputPath)\System.Drawing.Primitives.dll" />
+    <Exec Command="make -C $(MonoSourceFullPath)\mcs\class\Facades\System.Drawing.Primitives PROFILE=monodroid clean" />
+  </Target>
+</Project>
+
diff --git a/src/Xamarin.Android.Build.Tasks/Linker/Mobile.Tuner/MobileProfile.cs b/src/Xamarin.Android.Build.Tasks/Linker/Mobile.Tuner/MobileProfile.cs
@@ -179,13 +179,15 @@ public abstract class MobileProfile : Profile {
 			"System.Threading.ThreadPool",
 			"System.Threading.Timer",
 			"System.Threading",
+			"System.ValueTuple",
 			"System.Xml.ReaderWriter",
 			"System.Xml.XDocument",
 			"System.Xml.XPath.XDocument",
 			"System.Xml.XPath",
 			"System.Xml.XmlDocument",
 			"System.Xml.XmlSerializer",
 			"System.Xml.Xsl.Primitives",
+			"netstandard",
 		};
 
 		protected override bool IsSdk (string assemblyName)

diff --git a/src/netstandard/netstandard.mdproj b/src/netstandard/netstandard.mdproj
@@ -0,0 +1,29 @@
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ItemType>GenericProject</ItemType>
+    <ProjectGuid>{93614CB8-4564-43B9-93B0-4AF4B3B16AAE}</ProjectGuid>
+    <OutputPath>..\..\bin\$(Configuration)\lib\xbuild-frameworks\MonoAndroid\v1.0\Facades</OutputPath>
+  </PropertyGroup>
+  <Import Project="..\..\Configuration.props" />
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.Common.targets" />
+  <PropertyGroup>
+    <BuildDependsOn>
+      ResolveReferences;
+      _BuildNetstandardFacade
+    </BuildDependsOn>
+  </PropertyGroup>
+  <Import Project="netstandard.targets" />
+  <ItemGroup>
+    <ProjectReference Include="..\Mono.Android\Mono.Android.csproj">
+      <Project>{66CF299A-CE95-4131-BCD8-DB66E30C4BF7}</Project>
+      <Name>Mono.Android</Name>
+      <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
diff --git a/src/netstandard/netstandard.targets b/src/netstandard/netstandard.targets
@@ -0,0 +1,22 @@
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="_BuildNetstandardFacade"
+      Inputs="$(MonoSourceFullPath)\autogen.sh"
+      Outputs="$(OutputPath)\netstandard.dll">
+    <MSBuild Projects="..\Mono.Android\Mono.Android.csproj"
+        Targets="GetTargetPath"
+        Properties="Configuration=$(Configuration)">
+      <Output TaskParameter="TargetOutputs" ItemName="MonoAndroidAssembly" />
+    </MSBuild>
+    <Exec Command="make -C $(MonoSourceFullPath)\mcs\class\Facades\netstandard PROFILE=monodroid EXTRA_LIB_MCS_FLAGS=&quot;-r:%(MonoAndroidAssembly.Identity)&quot;" />
+    <Copy
+        SourceFiles="$(MonoSourceFullPath)\mcs\class\lib\monodroid\Facades\netstandard.dll"
+        DestinationFiles="$(OutputPath)\netstandard.dll"
+    />
+  </Target>
+  <Target Name="_CleanNetstandardFacade"
+      AfterTargets="Clean">
+    <Delete Files="$(OutputPath)\netstandard.dll" />
+    <Exec Command="make -C $(MonoSourceFullPath)\mcs\class\Facades\netstandard PROFILE=monodroid clean" />
+  </Target>
+</Project>
+