Skip to content
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.

Sign up for GitHub

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

[Xamarin.Android.Build.Tasks] Ensure class-parse is built first #66

Merged
merged 1 commit into from
Jun 9, 2016
Merged

[Xamarin.Android.Build.Tasks] Ensure class-parse is built first #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions Configuration.Java.Interop.Override.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<UtilityOutputFullPath>$(MSBuildThisFileDirectory)bin\$(Configuration)\lib\mandroid\</UtilityOutputFullPath>
</PropertyGroup>
</Project>
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ prepare:
git submodule update --init --recursive
nuget restore
(cd external/Java.Interop && nuget restore)
cp Configuration.Java.Interop.Override.props external/Java.Interop/Configuration.Override.props


run-all-tests: run-nunit-tests run-apk-tests
Expand Down
60 changes: 45 additions & 15 deletions Xamarin.Android.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Build.Tests
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Android-Tests", "src\Mono.Android\Test\Mono.Android-Tests.csproj", "{40EAD437-216B-4DF4-8258-3F47E1672C3A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Posix", "src\Mono.Posix\Mono.Posix.csproj", "{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.EnterpriseServices", "src\System.EnterpriseServices\System.EnterpriseServices.csproj", "{2868FC32-A4E7-4008-87C8-2C7879CACB58}"
EndProject
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "unix-distribution-setup", "build-tools\unix-distribution-setup\unix-distribution-setup.mdproj", "{2CF172E5-BDAE-4ABA-8BC8-08040ED3E77A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Posix", "src\Mono.Posix\Mono.Posix.csproj", "{1A4B041A-842F-40B3-A50D-49E01D30BD18}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "class-parse", "external\Java.Interop\tools\class-parse\class-parse.csproj", "{38C762AB-8FD1-44DE-9855-26AAE7129DC3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "logcat-parse", "external\Java.Interop\tools\logcat-parse\logcat-parse.csproj", "{7387E151-48E3-4885-B2CA-A74434A34045}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|AnyCPU = Debug|AnyCPU
Expand Down Expand Up @@ -258,18 +262,6 @@ Global
{40EAD437-216B-4DF4-8258-3F47E1672C3A}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU
{40EAD437-216B-4DF4-8258-3F47E1672C3A}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU
{40EAD437-216B-4DF4-8258-3F47E1672C3A}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.Debug|AnyCPU.Build.0 = Debug|Any CPU
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.Release|AnyCPU.ActiveCfg = Release|Any CPU
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.Release|AnyCPU.Build.0 = Release|Any CPU
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationRelease|Any CPU.ActiveCfg = Debug|Any CPU
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationRelease|Any CPU.Build.0 = Debug|Any CPU
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationDebug|AnyCPU.ActiveCfg = Debug|Any CPU
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU
{2868FC32-A4E7-4008-87C8-2C7879CACB58}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
{2868FC32-A4E7-4008-87C8-2C7879CACB58}.Debug|AnyCPU.Build.0 = Debug|Any CPU
{2868FC32-A4E7-4008-87C8-2C7879CACB58}.Release|AnyCPU.ActiveCfg = Release|Any CPU
Expand All @@ -294,6 +286,42 @@ Global
{2CF172E5-BDAE-4ABA-8BC8-08040ED3E77A}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU
{2CF172E5-BDAE-4ABA-8BC8-08040ED3E77A}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU
{2CF172E5-BDAE-4ABA-8BC8-08040ED3E77A}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU
{1A4B041A-842F-40B3-A50D-49E01D30BD18}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
{1A4B041A-842F-40B3-A50D-49E01D30BD18}.Debug|AnyCPU.Build.0 = Debug|Any CPU
{1A4B041A-842F-40B3-A50D-49E01D30BD18}.Release|AnyCPU.ActiveCfg = Release|Any CPU
{1A4B041A-842F-40B3-A50D-49E01D30BD18}.Release|AnyCPU.Build.0 = Release|Any CPU
{1A4B041A-842F-40B3-A50D-49E01D30BD18}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU
{1A4B041A-842F-40B3-A50D-49E01D30BD18}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU
{1A4B041A-842F-40B3-A50D-49E01D30BD18}.XAIntegrationRelease|Any CPU.ActiveCfg = Debug|Any CPU
{1A4B041A-842F-40B3-A50D-49E01D30BD18}.XAIntegrationRelease|Any CPU.Build.0 = Debug|Any CPU
{1A4B041A-842F-40B3-A50D-49E01D30BD18}.XAIntegrationDebug|AnyCPU.ActiveCfg = Debug|Any CPU
{1A4B041A-842F-40B3-A50D-49E01D30BD18}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU
{1A4B041A-842F-40B3-A50D-49E01D30BD18}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU
{1A4B041A-842F-40B3-A50D-49E01D30BD18}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU
{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.Debug|AnyCPU.Build.0 = Debug|Any CPU
{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.Release|AnyCPU.ActiveCfg = Release|Any CPU
{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.Release|AnyCPU.Build.0 = Release|Any CPU
{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU
{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU
{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationRelease|Any CPU.ActiveCfg = Debug|Any CPU
{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationRelease|Any CPU.Build.0 = Debug|Any CPU
{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationDebug|AnyCPU.ActiveCfg = Debug|Any CPU
{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU
{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU
{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU
{7387E151-48E3-4885-B2CA-A74434A34045}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
{7387E151-48E3-4885-B2CA-A74434A34045}.Debug|AnyCPU.Build.0 = Debug|Any CPU
{7387E151-48E3-4885-B2CA-A74434A34045}.Release|AnyCPU.ActiveCfg = Release|Any CPU
{7387E151-48E3-4885-B2CA-A74434A34045}.Release|AnyCPU.Build.0 = Release|Any CPU
{7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU
{7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU
{7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationRelease|Any CPU.ActiveCfg = Debug|Any CPU
{7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationRelease|Any CPU.Build.0 = Debug|Any CPU
{7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationDebug|AnyCPU.ActiveCfg = Debug|Any CPU
{7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU
{7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU
{7387E151-48E3-4885-B2CA-A74434A34045}.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 @@ -323,9 +351,11 @@ Global
{2DD1EE75-6D8D-4653-A800-0A24367F7F38} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483}
{53E4ABF0-1085-45F9-B964-DCAE4B819998} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483}
{40EAD437-216B-4DF4-8258-3F47E1672C3A} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483}
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
{2868FC32-A4E7-4008-87C8-2C7879CACB58} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
{2CF172E5-BDAE-4ABA-8BC8-08040ED3E77A} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
{1A4B041A-842F-40B3-A50D-49E01D30BD18} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
{38C762AB-8FD1-44DE-9855-26AAE7129DC3} = {864062D3-A415-4A6F-9324-5820237BA058}
{7387E151-48E3-4885-B2CA-A74434A34045} = {864062D3-A415-4A6F-9324-5820237BA058}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
Policies = $0
Expand Down
2 changes: 1 addition & 1 deletion external/Java.Interop
Open in desktop
Submodule Java.Interop updated from 4ace37 to b6431a
5 changes: 5 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,11 @@
<Name>Xamarin.Android.Tools.BootstrapTasks</Name>
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\external\Java.Interop\tools\class-parse\class-parse.csproj">
<Project>{38C762AB-8FD1-44DE-9855-26AAE7129DC3}</Project>
<Name>class-parse</Name>
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="pdb2mdb\" />
Expand Down