Repository: reef Updated Branches: refs/heads/master ebf9a6600 -> 915d7d33b
[REEF-1332] Resolve dependency versions in REEF.NET This adds a reference to `lang/cs/App.config` to the following project files: * `Org.Apache.REEF.Examples.AllHandlers.csproj` * `Org.Apache.REEF.Tang.Tools.csproj` Also, this enables [automatic binding redirects][msdn] in `Org.Apache.REEF.Bridge.vcxproj` [msdn]: https://msdn.microsoft.com/en-us/library/2fc472t2%28v=vs.110%29.aspx JIRA: [REEF-1332](https://issues.apache.org/jira/browse/REEF-1332) Pull Request: This closes #943 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/915d7d33 Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/915d7d33 Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/915d7d33 Branch: refs/heads/master Commit: 915d7d33b46f3b20ca02f0abbaf6cfc5ee780e02 Parents: ebf9a66 Author: Markus Weimer <[email protected]> Authored: Mon Apr 11 14:00:11 2016 -0700 Committer: Mariia Mykhailova <[email protected]> Committed: Mon Apr 11 18:03:05 2016 -0700 ---------------------------------------------------------------------- lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.vcxproj | 6 +++++- .../Org.Apache.REEF.Examples.AllHandlers.csproj | 3 +++ .../Org.Apache.REEF.Tang.Tools.csproj | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/915d7d33/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.vcxproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.vcxproj b/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.vcxproj index bae0bdd..60e8f59 100644 --- a/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.vcxproj +++ b/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.vcxproj @@ -60,7 +60,11 @@ under the License. </PropertyGroup> <!-- End of: Switch the PlatformToolset based on the Visual Studio Version - --> + --> + <PropertyGroup> + <!-- Auto generate binding redirects to make sure the latest Newtonsoft JSON is picked up --> + <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <UseDebugLibraries>true</UseDebugLibraries> <CLRSupport>true</CLRSupport> http://git-wip-us.apache.org/repos/asf/reef/blob/915d7d33/lang/cs/Org.Apache.REEF.Examples.AllHandlers/Org.Apache.REEF.Examples.AllHandlers.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Examples.AllHandlers/Org.Apache.REEF.Examples.AllHandlers.csproj b/lang/cs/Org.Apache.REEF.Examples.AllHandlers/Org.Apache.REEF.Examples.AllHandlers.csproj index 3456a8e..f5cca72 100644 --- a/lang/cs/Org.Apache.REEF.Examples.AllHandlers/Org.Apache.REEF.Examples.AllHandlers.csproj +++ b/lang/cs/Org.Apache.REEF.Examples.AllHandlers/Org.Apache.REEF.Examples.AllHandlers.csproj @@ -111,6 +111,9 @@ under the License. <ItemGroup> <None Include="packages.config" /> <None Include="Readme.md" /> + <None Include="..\App.config"> + <Link>App.config</Link> + </None> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> http://git-wip-us.apache.org/repos/asf/reef/blob/915d7d33/lang/cs/Org.Apache.REEF.Tang.Tools/Org.Apache.REEF.Tang.Tools.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tools/Org.Apache.REEF.Tang.Tools.csproj b/lang/cs/Org.Apache.REEF.Tang.Tools/Org.Apache.REEF.Tang.Tools.csproj index 72cf54c..7ca755d 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tools/Org.Apache.REEF.Tang.Tools.csproj +++ b/lang/cs/Org.Apache.REEF.Tang.Tools/Org.Apache.REEF.Tang.Tools.csproj @@ -54,6 +54,11 @@ under the License. <Name>Org.Apache.REEF.Examples</Name> </ProjectReference> </ItemGroup> + <ItemGroup> + <None Include="..\App.config"> + <Link>App.config</Link> + </None> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> <Import Project="$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets" Condition="Exists('$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets')" />
