Skip to content

Commit 5eec1a5

Browse files
TheAngryByrdTheAngryByrd
authored
Paket to nuget (#289)
* Convert to nuget top and library * Console paket to nuget * More paket cleanups * CentralPackageTransitivePinningEnabled * fixup rebase * Don't include package.lock.json * Fixup references * Remove unused paket.references and paket.dependencies files * Fix formatting of Microsoft.NET.Test.Sdk version in Directory.Packages.props
1 parent cbef1f3 commit 5eec1a5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1505
-2978
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@
22
"version": 1,
33
"isRoot": true,
44
"tools": {
5-
"paket": {
6-
"version": "8.0.3",
7-
"commands": [
8-
"paket"
9-
]
10-
},
115
"fantomas": {
126
"version": "6.0.1",
137
"commands": [
@@ -21,4 +15,4 @@
2115
]
2216
}
2317
}
24-
}
18+
}

‎.gitignore‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,11 +267,10 @@ coverage.*.xml
267267
.paket/.store
268268
.paket/paket
269269

270-
# Content docs
270+
# Content specific
271271
Content/Library/docs/
272272
Content/Console/docs/
273-
Content/Library/.paket/paket
274-
Content/Console/.paket/paket
273+
Content/**/package.lock.json
275274

276275
# fsdocs generated
277276
tmp/

‎.paket/Paket.Restore.targets‎

Lines changed: 0 additions & 560 deletions
This file was deleted.

‎Content/Console/.config/dotnet-tools.json‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@
88
"reportgenerator"
99
]
1010
},
11-
"paket": {
12-
"version": "8.0.3",
13-
"commands": [
14-
"paket"
15-
]
16-
},
1711
"fsharp-analyzers": {
1812
"version": " 0.10.1",
1913
"commands": [
@@ -27,4 +21,4 @@
2721
]
2822
}
2923
}
30-
}
24+
}

‎Content/Console/.paket/Paket.Restore.targets‎

Lines changed: 0 additions & 560 deletions
This file was deleted.

‎Content/Console/Directory.Packages.props‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<!-- https://learn.microsoft.com/en-us/nuget/consume-packages/Central-Package-Management -->
2+
<Project>
3+
<PropertyGroup>
4+
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
5+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
6+
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
7+
</PropertyGroup>
8+
<PropertyGroup>
9+
<FakeVersion>6.1.3</FakeVersion>
10+
</PropertyGroup>
11+
<ItemGroup>
12+
13+
<PackageVersion Include="FSharp.Core" Version="8.0.403" />
14+
<PackageVersion Include="Expecto" Version="10.2.2" />
15+
<PackageVersion Include="YoloDev.Expecto.TestSdk" Version="0.15.3" />
16+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
17+
<PackageVersion Include="Packaging.Targets" Version="0.1.208" PrivateAssets="All" />
18+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.0" PrivateAssets="All" />
19+
<PackageVersion Include="altcover" Version="8.2.825" />
20+
21+
<PackageVersion Include="Fake.IO.FileSystem" Version="$(FakeVersion)" />
22+
<PackageVersion Include="Fake.Core.Target" Version="$(FakeVersion)" />
23+
<PackageVersion Include="Fake.Core.ReleaseNotes" Version="$(FakeVersion)" />
24+
<PackageVersion Include="FAKE.Core.Environment" Version="$(FakeVersion)" />
25+
<PackageVersion Include="Fake.DotNet.Cli" Version="$(FakeVersion)" />
26+
<PackageVersion Include="FAKE.Core.Process" Version="$(FakeVersion)" />
27+
<PackageVersion Include="Fake.DotNet.AssemblyInfoFile" Version="$(FakeVersion)" />
28+
<PackageVersion Include="Fake.Tools.Git" Version="$(FakeVersion)" />
29+
<PackageVersion Include="Fake.Api.GitHub" Version="$(FakeVersion)" />
30+
<PackageVersion Include="Fake.BuildServer.GitHubActions" Version="$(FakeVersion)" />
31+
<PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.441" />
32+
<PackageVersion Include="Argu" Version="6.0" />
33+
</ItemGroup>
34+
</Project>

‎Content/Console/NuGet.config‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<!-- `clear` ensures no additional sources are inherited from another config file. -->
4+
<packageSources>
5+
<clear />
6+
<!-- `key` can be any identifier for your source. -->
7+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
8+
<!-- <add key="contoso.com" value="https://contoso.com/packages/" /> -->
9+
</packageSources>
10+
11+
<!-- https://learn.microsoft.com/en-us/nuget/consume-packages/package-source-mapping -->
12+
<!-- Define mappings by adding package patterns beneath the target source. -->
13+
<packageSourceMapping>
14+
<!-- key value for <packageSource> should match key values from <packageSources> element -->
15+
<packageSource key="nuget.org">
16+
<package pattern="*" />
17+
</packageSource>
18+
<!-- <packageSource key="contoso.com">
19+
<package pattern="Contoso.*" />
20+
<package pattern="NuGet.Common" />
21+
</packageSource> -->
22+
</packageSourceMapping>
23+
</configuration>

‎Content/Console/build/build.fs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,9 +256,6 @@ let clean _ =
256256
)
257257
|> Shell.cleanDirs
258258

259-
[ "paket-files/paket.restore.cached" ]
260-
|> Seq.iter Shell.rm
261-
262259
let dotnetRestore _ =
263260
[ sln ]
264261
|> Seq.map (fun dir ->

‎Content/Console/build/build.fsproj‎

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,29 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
6-
<WarnOn>3390;$(WarnOn)</WarnOn>
7-
<IsPackable>false</IsPackable>
8-
</PropertyGroup>
9-
<ItemGroup>
10-
<Compile Include="Changelog.fs" />
11-
<Compile Include="build.fs" />
12-
</ItemGroup>
13-
<Import Project="..\.paket\Paket.Restore.targets" />
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net8.0</TargetFramework>
6+
<WarnOn>3390;$(WarnOn)</WarnOn>
7+
<IsPackable>false</IsPackable>
8+
</PropertyGroup>
9+
<ItemGroup>
10+
<Compile Include="Changelog.fs" />
11+
<Compile Include="build.fs" />
12+
</ItemGroup>
13+
14+
<ItemGroup>
15+
<PackageReference Include="Fake.IO.FileSystem" />
16+
<PackageReference Include="Fake.Core.Target" />
17+
<PackageReference Include="Fake.Core.ReleaseNotes" />
18+
<PackageReference Include="FAKE.Core.Environment" />
19+
<PackageReference Include="Fake.DotNet.Cli" />
20+
<PackageReference Include="FAKE.Core.Process" />
21+
<PackageReference Include="Fake.DotNet.AssemblyInfoFile" />
22+
<PackageReference Include="Fake.Tools.Git" />
23+
<PackageReference Include="Fake.Api.GitHub" />
24+
<PackageReference Include="Fake.BuildServer.GitHubActions" />
25+
<PackageReference Include="MSBuild.StructuredLogger" />
26+
<PackageReference Include="Argu" />
27+
</ItemGroup>
28+
1429
</Project>

‎Content/Console/build/paket.references‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)