-
Notifications
You must be signed in to change notification settings - Fork 564
[15.2] Build netstandard.dll and System.Drawing.Primitives.dll facades #569
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
This file was deleted.
| 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> |
| 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" | ||
| 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="-r:%(MonoAndroidAssembly.Identity)"" | ||
| WorkingDirectory="$(MonoSourceFullPath)" | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't think that |
||
| /> | ||
| <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)" | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 |
|---|---|---|
|
|
@@ -3,7 +3,6 @@ | |
| using System.IO; | ||
| using System.Diagnostics; | ||
| using Microsoft.Build.Framework; | ||
| using Microsoft.Build.BuildEngine; | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This change shouldn't be necessary; it's in PR #567.
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||
| { | ||
|
|
||
| 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> |
| 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" | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please see the |
||
| 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="-r:%(MonoAndroidAssembly.Identity)"" | ||
| 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> | ||
|
|
||
There was a problem hiding this comment.
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:
<Output/>should be on a single line.Applying the above: