Skip to content

[build] option for Java.Interop to be built as non-PCL #360

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

Merged
merged 3 commits into from
Aug 25, 2018
Merged

[build] option for Java.Interop to be built as non-PCL #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc1a818
[build] option for Java.Interop to be built as non-PCL
jonathanpeppers Aug 20, 2018
ba8ac40
[build] $(JavaInteropProfile) now outputs to $(Configuration)Net45 fo…
jonathanpeppers Aug 24, 2018
399a58c
Whoops doc XML file was missing
jonathanpeppers Aug 24, 2018
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
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ packages
.nuget/
*.userprefs
*.user
Resource.designer.cs
Resource.designer.cs
*.binlog
27 changes: 27 additions & 0 deletions src/Java.Interop/Java.Interop.Net45.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<Project>
<PropertyGroup>
<NoStdLib Condition=" '$(XAInstallPrefix)' != '' ">true</NoStdLib>
<OutputPath>..\..\bin\$(Configuration)Net45</OutputPath>
<DocumentationFile>$(OutputPath)\Java.Interop.xml</DocumentationFile>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup Condition=" '$(XAInstallPrefix)' != '' ">
<Reference Include="mscorlib">
<HintPath>$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\v1.0\mscorlib.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System">
<HintPath>$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\v1.0\System.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Core">
<HintPath>$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\v1.0\System.Core.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup Condition=" '$(XAInstallPrefix)' == '' ">
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
</ItemGroup>
</Project>
6 changes: 6 additions & 0 deletions src/Java.Interop/Java.Interop.PCL.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<Project>
<PropertyGroup>
<TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
</Project>
5 changes: 3 additions & 2 deletions src/Java.Interop/Java.Interop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<OutputType>Library</OutputType>
<RootNamespace>Java.Interop</RootNamespace>
<AssemblyName>Java.Interop</AssemblyName>
<TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<NoWarn>1591</NoWarn>
<SignAssembly>true</SignAssembly>
Expand Down Expand Up @@ -129,7 +128,9 @@
<CompileJavaInteropJar Include="java\com\xamarin\java_interop\GCUserPeerable.java" />
<CompileJavaInteropJar Include="java\com\xamarin\java_interop\ManagedPeer.java" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<Import Project="..\..\Configuration.props" />
<Import Project="Java.Interop.PCL.props" Condition=" '$(JavaInteropProfile)' != 'net45' " />
<Import Project="Java.Interop.Net45.props" Condition=" '$(JavaInteropProfile)' == 'net45' " />
<Import Project="Java.Interop.targets" />
<PropertyGroup>
<BuildDependsOn>
Expand Down
1 change: 0 additions & 1 deletion src/Java.Interop/Java.Interop.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<PropertyGroup>
<Runtime Condition="'$(OS)' != 'Windows_NT'">mono</Runtime>
</PropertyGroup>
<Import Project="$(JNIEnvGenPath)\JdkInfo.props" />
<Target Name="BuildJnienvGen"
Inputs="..\..\build-tools\jnienv-gen\jnienv-gen.csproj"
Outputs="$(JNIEnvGenPath)\jnienv-gen.exe">
Expand Down