Skip to content

Commit 995f9aa

Browse files
committed
Merge pull request #6 from radical/fix-toplevel-build
Fix top level build
2 parents 8a25534 + ff1fc7c commit 995f9aa

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

Xamarin.Android.sln

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ Global
5959
Release|AnyCPU = Release|AnyCPU
6060
XAIntegrationDebug|Any CPU = XAIntegrationDebug|Any CPU
6161
XAIntegrationRelease|Any CPU = XAIntegrationRelease|Any CPU
62+
XAIntegrationDebug|AnyCPU = XAIntegrationDebug|AnyCPU
63+
XAIntegrationRelease|AnyCPU = XAIntegrationRelease|AnyCPU
6264
EndGlobalSection
6365
GlobalSection(ProjectConfigurationPlatforms) = postSolution
6466
{3F1F2F50-AF1A-4A5A-BEDB-193372F068D7}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
@@ -102,7 +104,6 @@ Global
102104
{91713046-C358-4647-B162-ED4E1442F3D8}.XAIntegrationRelease|Any CPU.ActiveCfg = Debug|Any CPU
103105
{91713046-C358-4647-B162-ED4E1442F3D8}.XAIntegrationRelease|Any CPU.Build.0 = Debug|Any CPU
104106
{94BD81F7-B06F-4295-9636-F8A3B6BDC762}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
105-
{94BD81F7-B06F-4295-9636-F8A3B6BDC762}.Debug|AnyCPU.Build.0 = Debug|Any CPU
106107
{94BD81F7-B06F-4295-9636-F8A3B6BDC762}.Release|AnyCPU.ActiveCfg = Release|Any CPU
107108
{94BD81F7-B06F-4295-9636-F8A3B6BDC762}.Release|AnyCPU.Build.0 = Release|Any CPU
108109
{94BD81F7-B06F-4295-9636-F8A3B6BDC762}.XAIntegrationDebug|Any CPU.ActiveCfg = XAIntegrationDebug|Any CPU
@@ -149,6 +150,18 @@ Global
149150
{8A6CB07C-E493-4A4F-AB94-038645A27118}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU
150151
{8A6CB07C-E493-4A4F-AB94-038645A27118}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU
151152
{8A6CB07C-E493-4A4F-AB94-038645A27118}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU
153+
{52C7D9B6-E8C8-47D0-9471-652D278D7D77}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
154+
{52C7D9B6-E8C8-47D0-9471-652D278D7D77}.Debug|AnyCPU.Build.0 = Debug|Any CPU
155+
{D18FCF91-8876-48A0-A693-2DC1E7D3D80A}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
156+
{D18FCF91-8876-48A0-A693-2DC1E7D3D80A}.Debug|AnyCPU.Build.0 = Debug|Any CPU
157+
{1268EADF-8344-431C-81F6-FCB7CBC99F49}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
158+
{1268EADF-8344-431C-81F6-FCB7CBC99F49}.Debug|AnyCPU.Build.0 = Debug|Any CPU
159+
{07BC4495-1267-4B78-9EA6-B76FEEA2A64A}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
160+
{07BC4495-1267-4B78-9EA6-B76FEEA2A64A}.Debug|AnyCPU.Build.0 = Debug|Any CPU
161+
{64CC4E44-CE3A-4319-BF3F-6CF8BD513870}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
162+
{64CC4E44-CE3A-4319-BF3F-6CF8BD513870}.Debug|AnyCPU.Build.0 = Debug|Any CPU
163+
{D48EE8D0-0A0A-4493-AEF5-DAF5F8CF86AD}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
164+
{D48EE8D0-0A0A-4493-AEF5-DAF5F8CF86AD}.Debug|AnyCPU.Build.0 = Debug|Any CPU
152165
{C03E6CF1-7460-4CDC-A4AB-292BBC0F61F2}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
153166
{C03E6CF1-7460-4CDC-A4AB-292BBC0F61F2}.Debug|AnyCPU.Build.0 = Debug|Any CPU
154167
{C03E6CF1-7460-4CDC-A4AB-292BBC0F61F2}.Release|AnyCPU.ActiveCfg = Release|Any CPU

src/Mono.Android/Mono.Android.csproj

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,5 +309,10 @@
309309
<Name>jcw-gen</Name>
310310
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
311311
</ProjectReference>
312+
<ProjectReference Include="..\..\build-tools\mono-runtimes\mono-runtimes.mdproj">
313+
<Project>{C03E6CF1-7460-4CDC-A4AB-292BBC0F61F2}</Project>
314+
<Name>mono-runtimes</Name>
315+
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
316+
</ProjectReference>
312317
</ItemGroup>
313-
</Project>
318+
</Project>

src/Mono.Android/Mono.Android.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Target Name="_BuildJavaInterop"
4-
BeforeTargets="ResolveReferences"
4+
BeforeTargets="BeforeResolveReferences"
55
Inputs="..\..\external\Java.Interop\src\Java.Interop\Java.Interop.csproj"
66
Outputs="$(OutputPath)\..\v1.0\Java.Interop.dll">
77
<MSBuild

0 commit comments

Comments
 (0)