Skip to content

Commit ba8ac40

Browse files
[build] $(JavaInteropProfile) now outputs to $(Configuration)Net45 folder
This allows us to have two sets of outputs: - bin/Debug/Java.Interop.dll - referenced by MSBuild tasks - bin/DebugNet45/Java.Interop.dll - referenced by Mono.Android.dll and apps Other changes: - Fixed warning where file was getting imported twice - Updated `.gitignore` for `*.binlog` files
1 parent bc1a818 commit ba8ac40

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ packages
1111
.nuget/
1212
*.userprefs
1313
*.user
14-
Resource.designer.cs
14+
Resource.designer.cs
15+
*.binlog

src/Java.Interop/Java.Interop.Net45.props

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<Project>
2-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
32
<PropertyGroup>
4-
<NoStdLib>true</NoStdLib>
3+
<NoStdLib Condition=" '$(XAInstallPrefix)' != '' ">true</NoStdLib>
4+
<OutputPath>..\..\bin\$(Configuration)Net45</OutputPath>
55
</PropertyGroup>
6+
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
67
<ItemGroup Condition=" '$(XAInstallPrefix)' != '' ">
78
<Reference Include="mscorlib">
89
<HintPath>$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\v1.0\mscorlib.dll</HintPath>
@@ -17,4 +18,9 @@
1718
<Private>False</Private>
1819
</Reference>
1920
</ItemGroup>
21+
<ItemGroup Condition=" '$(XAInstallPrefix)' == '' ">
22+
<Reference Include="mscorlib" />
23+
<Reference Include="System" />
24+
<Reference Include="System.Core" />
25+
</ItemGroup>
2026
</Project>

src/Java.Interop/Java.Interop.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@
129129
<CompileJavaInteropJar Include="java\com\xamarin\java_interop\ManagedPeer.java" />
130130
</ItemGroup>
131131
<Import Project="..\..\Configuration.props" />
132-
<Import Project="$(JNIEnvGenPath)\JdkInfo.props" />
133132
<Import Project="Java.Interop.PCL.props" Condition=" '$(JavaInteropProfile)' != 'net45' " />
134133
<Import Project="Java.Interop.Net45.props" Condition=" '$(JavaInteropProfile)' == 'net45' " />
135134
<Import Project="Java.Interop.targets" />

0 commit comments

Comments
 (0)