[10/13] ignite git commit: Merge branch 'master' into ignite-1786

[vozerov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/b7450ef4/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
----------------------------------------------------------------------
diff --cc modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index fff0296,8d56227..5a74af8
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@@ -483,11 -498,9 +492,14 @@@
      </None>
    </ItemGroup>
    <ItemGroup>
+     <Folder Include="Impl\Common\JavaObjects\" />
+   </ItemGroup>
 -  <ItemGroup />
++  <ItemGroup>
 +    <ProjectReference Include="..\..\cpp\jni\project\vs\jni.vcxproj">
 +      <Project>{d906be6e-9370-494e-b10b-f74994e68fb2}</Project>
 +      <Name>jni</Name>
 +    </ProjectReference>
 +  </ItemGroup>
    <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    <PropertyGroup Condition="'$(Platform)' == 'AnyCPU'">
      <PreBuildEvent>cd "$(ProjectDir)"