Repository: reef Updated Branches: refs/heads/master 561a336f2 -> 8c6a6535d
[REEF-1997] DotNet: Fix project dependencies with FatNuGet and Client This issue was fixed by the following: - Added PrivateAssets tag for the bridge references by the Client - Added PrivateAssets tag to all project references in the FatNuget project. JIRA: [REEF-1997](https://issues.apache.org/jira/browse/REEF-1997) Pull Request: This closes #1437 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/8c6a6535 Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/8c6a6535 Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/8c6a6535 Branch: refs/heads/master Commit: 8c6a6535d5da40fa94fe77dd4a3c81be8e09071b Parents: 561a336 Author: Scott Inglis <[email protected]> Authored: Mon Mar 26 12:32:25 2018 -0700 Committer: Markus Weimer <[email protected]> Committed: Wed Mar 28 15:29:34 2018 -0700 ---------------------------------------------------------------------- .../Org.Apache.REEF.Client.DotNet.csproj | 4 +-- .../Org.Apache.REEF.FatNuGet.DotNet.csproj | 30 ++++++++++++-------- .../Org.Apache.REEF.IMRU.Examples.DotNet.csproj | 2 +- 3 files changed, 21 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/8c6a6535/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.DotNet.csproj b/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.DotNet.csproj index 0fdbfd7..b568e1d 100644 --- a/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.DotNet.csproj +++ b/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.DotNet.csproj @@ -58,10 +58,10 @@ under the License. <!-- Project Reference conditionals allow for targeting specific projects based upon the target framework. --> <ItemGroup Condition="'$(TargetFramework)' == 'net452'"> - <ProjectReference Include="..\Org.Apache.REEF.Bridge\Org.Apache.REEF.Bridge.DotNet.vcxproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Bridge\Org.Apache.REEF.Bridge.DotNet.vcxproj" PrivateAssets="All" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> - <ProjectReference Include="..\Org.Apache.REEF.Bridge.CLR\Org.Apache.REEF.Bridge.CLR.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Bridge.CLR\Org.Apache.REEF.Bridge.CLR.DotNet.csproj" PrivateAssets="All"/> </ItemGroup> <ItemGroup> http://git-wip-us.apache.org/repos/asf/reef/blob/8c6a6535/lang/cs/Org.Apache.REEF.FatNuGet/Org.Apache.REEF.FatNuGet.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.FatNuGet/Org.Apache.REEF.FatNuGet.DotNet.csproj b/lang/cs/Org.Apache.REEF.FatNuGet/Org.Apache.REEF.FatNuGet.DotNet.csproj index 5b72421..dd72889 100644 --- a/lang/cs/Org.Apache.REEF.FatNuGet/Org.Apache.REEF.FatNuGet.DotNet.csproj +++ b/lang/cs/Org.Apache.REEF.FatNuGet/Org.Apache.REEF.FatNuGet.DotNet.csproj @@ -21,6 +21,7 @@ under the License. <AssemblyName>Org.Apache.REEF.FatNuGet</AssemblyName> <Description>Provide single package which contains all necessary REEF/WAKE/TANG projects.</Description> <PackageTags>Single package which contains all Reef/Wake/Tang projects</PackageTags> + <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput> </PropertyGroup> <Import Project="..\build.DotNetLibrary.props" /> <ItemGroup> @@ -36,20 +37,25 @@ under the License. <!-- Project Reference conditionals allow for targeting specific projects based upon the target framework. --> <ItemGroup Condition="'$(TargetFramework)' == 'net452'"> <!-- Evaluator as a .netcoreapp can not be linked by a .netstandard library, therefore this is only linked for net45 --> - <ProjectReference Include="..\Org.Apache.REEF.Evaluator\Org.Apache.REEF.Evaluator.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Evaluator\Org.Apache.REEF.Evaluator.DotNet.csproj" PrivateAssets="All"/> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\Org.Apache.REEF.Client\Org.Apache.REEF.Client.DotNet.csproj" /> - <ProjectReference Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" /> - <ProjectReference Include="..\Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.DotNet.csproj" /> - <ProjectReference Include="..\Org.Apache.REEF.Examples\Org.Apache.REEF.Examples.DotNet.csproj" /> - <ProjectReference Include="..\Org.Apache.REEF.IMRU\Org.Apache.REEF.IMRU.DotNet.csproj" /> - <ProjectReference Include="..\Org.Apache.REEF.IO\Org.Apache.REEF.IO.DotNet.csproj" /> - <ProjectReference Include="..\Org.Apache.REEF.Network\Org.Apache.REEF.Network.DotNet.csproj" /> - <ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" /> - <ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj" /> - <ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" /> - <ProjectReference Include="..\Org.Apache.REEF.IMRU.Examples\Org.Apache.REEF.IMRU.Examples.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Client\Org.Apache.REEF.Client.DotNet.csproj" PrivateAssets="All"/> + <ProjectReference Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" PrivateAssets="All"/> + <ProjectReference Include="..\Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.DotNet.csproj" PrivateAssets="All"/> + <ProjectReference Include="..\Org.Apache.REEF.Examples\Org.Apache.REEF.Examples.DotNet.csproj" PrivateAssets="All"/> + <ProjectReference Include="..\Org.Apache.REEF.IMRU\Org.Apache.REEF.IMRU.DotNet.csproj" PrivateAssets="All"/> + <ProjectReference Include="..\Org.Apache.REEF.IO\Org.Apache.REEF.IO.DotNet.csproj" PrivateAssets="All"/> + <ProjectReference Include="..\Org.Apache.REEF.Network\Org.Apache.REEF.Network.DotNet.csproj" PrivateAssets="All"/> + <ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" PrivateAssets="All"/> + <ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj" PrivateAssets="All"/> + <ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" PrivateAssets="All"/> + <ProjectReference Include="..\Org.Apache.REEF.IMRU.Examples\Org.Apache.REEF.IMRU.Examples.DotNet.csproj" PrivateAssets="All"/> </ItemGroup> <Import Project="..\build.DotNet.targets" /> + <Target Name="CopyProjectReferencesToPackage" DependsOnTargets="ResolveProjectReferences"> + <ItemGroup> + <BuildOutputInPackage Include="@(_ResolvedProjectReferencePaths)" /> + </ItemGroup> + </Target> </Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/8c6a6535/lang/cs/Org.Apache.REEF.IMRU.Examples/Org.Apache.REEF.IMRU.Examples.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU.Examples/Org.Apache.REEF.IMRU.Examples.DotNet.csproj b/lang/cs/Org.Apache.REEF.IMRU.Examples/Org.Apache.REEF.IMRU.Examples.DotNet.csproj index 4f55a6c..c615303 100644 --- a/lang/cs/Org.Apache.REEF.IMRU.Examples/Org.Apache.REEF.IMRU.Examples.DotNet.csproj +++ b/lang/cs/Org.Apache.REEF.IMRU.Examples/Org.Apache.REEF.IMRU.Examples.DotNet.csproj @@ -22,7 +22,7 @@ under the License. <Description>IMRU Examples for REEF.NET</Description> <PackageTags>REEF Examples IMRU</PackageTags> </PropertyGroup> - <Import Project="..\build.DotNetLibrary.props" /> + <Import Project="..\build.DotNetApp.props" /> <!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. --> <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'"> <Reference Include="System" />
