Skip to content

Commit b25149c

Browse files
committed
move dotnet-mergenupkg in a single group and upgrade version
1 parent a67d58c commit b25149c

File tree

13 files changed

+1546
-1032
lines changed

13 files changed

+1546
-1032
lines changed

integrationtests/Paket.IntegrationTests/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<dependentAssembly>
88
<Paket>True</Paket>
99
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
10-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.3.0" />
10+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.5.0.0" />
1111
</dependentAssembly>
1212
<dependentAssembly>
1313
<Paket>True</Paket>

integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj

Lines changed: 43 additions & 205 deletions
Large diffs are not rendered by default.

paket.dependencies

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ nuget System.Security.Cryptography.ProtectedData
1111

1212
nuget FSharp.Compiler.Tools
1313

14-
nuget NETStandard.Library >= 2.0 prerelease
15-
nuget Microsoft.NETCore.App >= 2.0 prerelease
14+
nuget NETStandard.Library ~> 2.0
15+
nuget Microsoft.NETCore.App ~> 2.1
1616
nuget System.Net.Http.WinHttpHandler
1717

1818
nuget Moq
@@ -22,12 +22,17 @@ nuget NUnit redirects: force
2222
nuget NUnit.Console
2323
// current workaround for https://github.com/nunit/nunit3-vs-adapter/issues/366
2424
nuget NUnit3TestAdapter version_in_path: true
25-
clitool dotnet-mergenupkg
2625

2726
github fsharp/FAKE:0341a2e614eb2a7f34607cec914eb0ed83ce9add src/app/FakeLib/Globbing/Globbing.fs
2827
github fsprojects/FSharp.TypeProviders.SDK:dc5ac01a1ac288eceb1fd6f12a5d388236f4f8e5 src/AssemblyReader.fs
2928
github forki/FsUnit FsUnit.fs
3029

30+
group NetCoreCliTools
31+
storage: none
32+
source https://nuget.org/api/v2
33+
34+
clitool dotnet-mergenupkg ~> 2.3
35+
3136
group NetCoreTools
3237
storage: none
3338
source https://nuget.org/api/v2

paket.lock

Lines changed: 1253 additions & 237 deletions
Large diffs are not rendered by default.

src/Paket.Core.preview3/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<dependentAssembly>
55
<Paket>True</Paket>
66
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.3.0" />
7+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.5.0.0" />
88
</dependentAssembly>
99
<dependentAssembly>
1010
<Paket>True</Paket>

src/Paket.Core/Paket.Core.fsproj

Lines changed: 43 additions & 89 deletions
Large diffs are not rendered by default.

src/Paket.Core/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<dependentAssembly>
55
<Paket>True</Paket>
66
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.3.0" />
7+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.5.0.0" />
88
</dependentAssembly>
99
<dependentAssembly>
1010
<Paket>True</Paket>

src/Paket/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<dependentAssembly>
99
<Paket>True</Paket>
1010
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.3.0" />
11+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.5.0.0" />
1212
</dependentAssembly>
1313
<dependentAssembly>
1414
<Paket>True</Paket>

src/Paket/Paket.fsproj

Lines changed: 41 additions & 87 deletions
Large diffs are not rendered by default.

tests/Paket.Bootstrapper.Tests/Paket.Bootstrapper.Tests.csproj

Lines changed: 69 additions & 196 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)