Unverified Commit 6b942b50 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #234235 from raphaelr/mknugetsource-support-subdirs

buildDotnetModule: fix `projectReferences = [ ... ]`
parents f45bee3f 0d298148
Loading
Loading
Loading
Loading
+4 −6
Original line number Diff line number Diff line
@@ -15,12 +15,10 @@ let
    buildCommand = ''
      mkdir -p $out/{lib,share}

      (
        shopt -s nullglob
        for nupkg in ${lib.concatMapStringsSep " " (dep: "\"${dep}\"/*.nupkg") deps}; do
          cp --no-clobber "$nupkg" $out/lib
        done
      )
      # use -L to follow symbolic links. When `projectReferences` is used in
      # buildDotnetModule, one of the deps will be a symlink farm.
      find -L ${lib.concatStringsSep " " deps} -type f -name '*.nupkg' -exec \
        cp --no-clobber '{}' $out/lib ';'

      # Generates a list of all licenses' spdx ids, if available.
      # Note that this currently ignores any license provided in plain text (e.g. "LICENSE.txt")
+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,8 @@ with pkgs;

  coq = callPackage ./coq {};

  dotnet = recurseIntoAttrs (callPackages ./dotnet { });

  makeHardcodeGsettingsPatch = callPackage ./make-hardcode-gsettings-patch { };

  makeWrapper = callPackage ./make-wrapper { };
+5 −0
Original line number Diff line number Diff line
{ callPackage }:

{
  project-references = callPackage ./project-references { };
}
+1 −0
Original line number Diff line number Diff line
ProjectReferencesTest.Library.Hello();
+10 −0
Original line number Diff line number Diff line
<Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
        <OutputType>exe</OutputType>
    </PropertyGroup>

    <ItemGroup>
        <ProjectReference Include="../library/Library.csproj" />
        <PackageReference Include="ProjectReferencesTest.Library" Version="*" Condition=" '$(ContinuousIntegrationBuild)'=='true' " />
    </ItemGroup>
</Project>
Loading