Skip to content

don't not add duplicated references #3107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
forki merged 4 commits into from
Mar 14, 2018
Merged

don't not add duplicated references #3107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f5d04df
don't not add duplicated references
0x53A Mar 10, 2018
aa9ef77
fix one test
0x53A Mar 10, 2018
7cda0a6
fix another test
0x53A Mar 11, 2018
3c24d3f
codereview
0x53A Mar 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...ts/scenarios/i001578-transitive-ref/before/TestPaketDotNet/TestPaketDotNet.csprojtemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'">
<ItemGroup>
<Reference Include="System.Net.Http">
<HintPath>..\packages\Microsoft.Net.Http\lib\net40\System.Net.Http.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="System.Net.Http.Extensions">
<HintPath>..\packages\Microsoft.Net.Http\lib\net40\System.Net.Http.Extensions.dll</HintPath>
<Private>True</Private>
Expand Down
11 changes: 8 additions & 3 deletions src/Paket.Core/PaketConfigFiles/InstallModel.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,10 +781,13 @@ module InstallModel =
{ this with TargetsFileFolders = targetsFileFolders }
|> addItem targetsFiles getMsbuildFile (addTargetsFile) (fun i -> i.TargetsFileFolders)


let filterReferences (references:string Set) (this:InstallModel) =
let filterNonFrameworkReferences (references:string Set) (this:InstallModel) =
this
|> mapCompileLibReferences (Set.filter (fun reference -> Set.contains reference.Name references |> not))

let filterFrameworkReferences (references:string Set) (this:InstallModel) =
this
|> mapCompileLibFrameworkReferences (Set.filter (fun reference -> Set.contains reference.Name references |> not))

let addLicense url (model: InstallModel) =
Expand Down Expand Up @@ -920,7 +923,9 @@ type InstallModel with

member this.FilterExcludes excludes = InstallModel.filterExcludes excludes this

member this.FilterReferences(references) = InstallModel.filterReferences references this
member this.FilterNonFrameworkReferences(references) = InstallModel.filterNonFrameworkReferences references this

member this.FilterFrameworkReferences(references) = InstallModel.filterFrameworkReferences references this

member this.ApplyFrameworkRestrictions restrictions = InstallModel.applyFrameworkRestrictions restrictions this

Expand Down
8 changes: 7 additions & 1 deletion src/Paket.Core/PaketConfigFiles/ProjectFile.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,8 +728,14 @@ module ProjectFile =
getCustomReferenceAndFrameworkNodes project
|> List.map (fun node -> node.Attributes.["Include"].InnerText.Split(',').[0])
|> Set.ofList

// workaround for https://github.com/fsprojects/Paket/issues/2811
// * DO remove FW-References which are already referenced by the user
// * DO NOT remove package references, where the user already has a reference

//let model = model.FilterNonFrameworkReferences references
let model = model.FilterFrameworkReferences references

let model = model.FilterReferences references
let createItemGroup (targets:TargetProfile Set) (frameworkReferences:FrameworkReference list) (libraries:Library list) =
let itemGroup = createNode "ItemGroup" project

Expand Down
5 changes: 5 additions & 0 deletions tests/Paket.Tests/InstallModel/Xml/SystemNetHttpWithExistingFrameworkReferences.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ let expected = """
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="System.Net.Http.WebRequest">
<HintPath>..\..\..\Microsoft.Net.Http\lib\net40\System.Net.Http.WebRequest.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')">
Expand Down