Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion Xamarin.Android.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -107,6 +107,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "javadoc2mdoc", "tools\javad
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xamarin.Android.Build.Tests.Shared", "src\Xamarin.Android.Build.Tasks\Tests\Xamarin.Android.Build.Tests\Xamarin.Android.Build.Tests.Shared.shproj", "{BD1D66BF-5AC7-4926-8EBE-B2198A112EB0}"
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
Expand Down Expand Up @@ -489,6 +491,14 @@ Global
{A87352E6-CE7F-4346-B6B1-586AE931C0A7}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU
{A87352E6-CE7F-4346-B6B1-586AE931C0A7}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU
{A87352E6-CE7F-4346-B6B1-586AE931C0A7}.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}
Expand Down Expand Up @@ -540,6 +550,7 @@ Global
{E0890301-F75F-40E7-B008-54C28B3BA542} = {864062D3-A415-4A6F-9324-5820237BA058}
{A87352E6-CE7F-4346-B6B1-586AE931C0A7} = {864062D3-A415-4A6F-9324-5820237BA058}
{BD1D66BF-5AC7-4926-8EBE-B2198A112EB0} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483}
{93614CB8-4564-43B9-93B0-4AF4B3B16AAE} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
Policies = $0
Expand Down
2 changes: 1 addition & 1 deletion build-tools/bundle/bundle-path.targets
Original file line number Diff line number Diff line change
Expand Up @@ -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>
10 changes: 0 additions & 10 deletions src/System.Drawing.Primitives/Properties/AssemblyInfo.cs

This file was deleted.

78 changes: 0 additions & 78 deletions src/System.Drawing.Primitives/System.Drawing.Primitives.csproj

This file was deleted.

29 changes: 29 additions & 0 deletions src/System.Drawing.Primitives/System.Drawing.Primitives.mdproj
Original file line number Diff line number Diff line change
@@ -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>
27 changes: 27 additions & 0 deletions src/System.Drawing.Primitives/System.Drawing.Primitives.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="_BuildSystemDrawingPrimitivesFacade">
<MSBuild Projects="..\Mono.Android\Mono.Android.csproj"
Targets="GetTargetPath"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indentation conventions for .csproj/.targets files:

  1. Spaces, not tabs. (Not that you have tabs...)
  2. 2-space "tab stops".
  3. If attributes are on a new line, then they should be indented an "extra" tab stop, so that they're indented more than child content.
  4. <Output/> should be on a single line.

Applying the above:

<MSBuild Projects="..\Mono.Android\Mono.Android.csproj"
    Targets="GetTargetPath"
    Properties="Configuration=$(Configuration)">
  <Output TaskParameter="TargetOutputs" ItemName="MonoAndroidAssembly" />
</MSBuild>

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;"
WorkingDirectory="$(MonoSourceFullPath)"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think that WorkingDirectory is required, as make -C will also change the working directory as well. Thus, this seems redundant.

/>
<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"
WorkingDirectory="$(MonoSourceFullPath)"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto.

/>
</Target>
</Project>

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using System.IO;
using System.Diagnostics;
using Microsoft.Build.Framework;
using Microsoft.Build.BuildEngine;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change shouldn't be necessary; it's in PR #567.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jonpryor that was against master, this one is against d15-2.


namespace Xamarin.ProjectTools
{
Expand Down
29 changes: 29 additions & 0 deletions src/netstandard/netstandard.mdproj
Original file line number Diff line number Diff line change
@@ -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>
27 changes: 27 additions & 0 deletions src/netstandard/netstandard.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="_BuildNetstandardFacade">
<MSBuild Projects="..\Mono.Android\Mono.Android.csproj"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please see the System.Drawing.Primitives.targets comments and apply here as well.

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;"
WorkingDirectory="$(MonoSourceFullPath)"
/>
<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"
WorkingDirectory="$(MonoSourceFullPath)"
/>
</Target>
</Project>