Skip to content

Conversation

@russcam
Copy link
Contributor

@russcam russcam commented Aug 19, 2019

This commit updates the internalize-dependencies target to only run when

Not Mono AND either running on CI OR building release

Closes #3674

This commit updates the internalize-dependencies target to only run when

Not Mono AND either running on CI OR building release

Closes #3674
Copy link
Member

@Mpdreamz Mpdreamz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

        member this.MergeDependencies=
            match this with 
            | Project Nest -> [Project Project.Nest; ]
            | _ -> []

Projects.fs lists the following still for Nest, should probably return empty array for everything.

This commit updates the Elastic Abstractions dependencies to pick up the change
elastic/elasticsearch-net-abstractions@09c10a7
This commit removes build code that was used to IL merge Json.NET as it is no longer relevant
@russcam
Copy link
Contributor Author

russcam commented Aug 21, 2019

I've added some additional changes to remove references to IL merging Json.NET. @Mpdreamz, would you be able to take another look please?

@Mpdreamz
Copy link
Member

LGTM, sorry for leaving this lingering 👍

@russcam russcam merged commit 9b61a35 into master Sep 27, 2019
russcam added a commit that referenced this pull request Sep 27, 2019
This commit updates

1. the internalize-dependencies target to only run when

    Not Mono AND either running on CI OR building release

2. removes build code that was used to IL merge Json.NET as it is no longer relevant

Closes #3674

(cherry picked from commit 9b61a35)
@russcam
Copy link
Contributor Author

russcam commented Sep 27, 2019

ported to 7.x

russcam added a commit that referenced this pull request Oct 1, 2019
This commit updates

1. the internalize-dependencies target to only run when

    Not Mono AND either running on CI OR building release

2. removes build code that was used to IL merge Json.NET as it is no longer relevant

Closes #3674

(cherry picked from commit 9b61a35)
@Mpdreamz Mpdreamz deleted the fix/3674 branch November 6, 2019 19:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Changes to build scripts

3 participants