Skip to content

fix multiple dotnet pack invocations with different Version property #3585

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 3 commits into from
May 28, 2019
Merged

fix multiple dotnet pack invocations with different Version property #3585

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e572da
add failing test
enricosada May 24, 2019
2472b59
fix mutiple dotnet pack invocations with different Version property
enricosada May 24, 2019
cece905
cleanup
enricosada May 24, 2019
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
30 changes: 30 additions & 0 deletions integrationtests/Paket.IntegrationTests/PackSpecs.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,36 @@ let ``#4003 dotnet pack of a global tool with p2p``() =
nuspec.Dependencies.Value.Length
|> shouldEqual 0


[<Test>]
let ``#4004 dotnet pack using different versions``() =
let project = "lib1"
let scenario = "i004004-pack-version"
prepareSdk scenario

let rootPath = scenarioTempPath scenario

directPaket ("restore") scenario

@teo-tsirpanis teo-tsirpanis May 24, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

You can remove the parentheses.

@enricosada enricosada May 24, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

done

|> ignore

let pack outDir additionalArgs expectedVersion =
let outPath = Path.Combine(rootPath, outDir)

directDotnet true (sprintf "pack -o \"%s\" %s" outPath additionalArgs) rootPath
|> ignore

let nupkgPath = Path.Combine(outPath, sprintf "%s.%s.nupkg" project expectedVersion)
if File.Exists nupkgPath |> not then Assert.Fail(sprintf "Expected '%s' to exist" nupkgPath)

@teo-tsirpanis teo-tsirpanis May 24, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

You could have used Assert.True here.

@enricosada enricosada May 24, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

done


pack "out1" "" "1.0.0"
pack "out1" "/p:Version=1.2.3" "1.2.3"
pack "out2" "/p:Version=2.3.4" "2.3.4"


@teo-tsirpanis teo-tsirpanis May 24, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

These lines seem a bit off.

@enricosada enricosada May 24, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

done





[<Test>]
let ``#4010-pack-template-only``() =
let scenario = "i004010-pack-template-only"
Expand Down
8 changes: 8 additions & 0 deletions integrationtests/scenarios/i004004-pack-version/before/Class1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using System;

namespace n1
{
public class Class1
{
}
}
7 changes: 7 additions & 0 deletions integrationtests/scenarios/i004004-pack-version/before/lib1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<Import Project=".paket\Paket.Restore.targets" />
</Project>
5 changes: 5 additions & 0 deletions integrationtests/scenarios/i004004-pack-version/before/paket.dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
source https://api.nuget.org/v3/index.json

framework: netstandard2.0

nuget Argu == 5.1.0
24 changes: 24 additions & 0 deletions integrationtests/scenarios/i004004-pack-version/before/paket.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
RESTRICTION: == netstandard2.0
NUGET
remote: https://api.nuget.org/v3/index.json
Argu (5.1)
FSharp.Core (>= 4.3.2)
System.Configuration.ConfigurationManager (>= 4.4)
FSharp.Core (4.6.2)
System.Buffers (4.5)
System.Configuration.ConfigurationManager (4.5)
System.Security.Cryptography.ProtectedData (>= 4.5)
System.Security.Permissions (>= 4.5)
System.Memory (4.5.3)
System.Buffers (>= 4.4)
System.Numerics.Vectors (>= 4.4)
System.Runtime.CompilerServices.Unsafe (>= 4.5.2)
System.Numerics.Vectors (4.5)
System.Runtime.CompilerServices.Unsafe (4.5.2)
System.Security.AccessControl (4.5)
System.Security.Principal.Windows (>= 4.5)
System.Security.Cryptography.ProtectedData (4.5)
System.Memory (>= 4.5)
System.Security.Permissions (4.5)
System.Security.AccessControl (>= 4.5)
System.Security.Principal.Windows (4.5.1)
1 change: 1 addition & 0 deletions integrationtests/scenarios/i004004-pack-version/before/paket.references
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Argu
2 changes: 1 addition & 1 deletion src/Paket.Core/embedded/Paket.Restore.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@
</PropertyGroup>

<ItemGroup>
<_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.nuspec"/>
<_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.$(PackageVersion).nuspec"/>
</ItemGroup>

<Exec Command='$(PaketCommand) fix-nuspecs files "@(_NuspecFiles)" project-file "$(PaketProjectFile)" ' Condition="@(_NuspecFiles) != ''" />
Expand Down