Skip to content

Commit

Permalink
Merge pull request #820 from nojaf/replace-paket
Browse files Browse the repository at this point in the history
Replace Paket with NuGet
  • Loading branch information
nojaf authored Apr 14, 2023
2 parents efe5b45 + 953e857 commit 09491d1
Show file tree
Hide file tree
Showing 78 changed files with 3,000 additions and 857 deletions.
6 changes: 0 additions & 6 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
"version": 1,
"isRoot": true,
"tools": {
"paket": {
"version": "7.1.5",
"commands": [
"paket"
]
},
"fantomas": {
"version": "6.0.0",
"commands": [
Expand Down
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
**/bin/
**/lib/
**/obj/
**/paket-files/
**/nuget/*.nupkg
**/docs/output/
**/literate/outputs/*
Expand Down
557 changes: 0 additions & 557 deletions .paket/Paket.Restore.targets

This file was deleted.

28 changes: 28 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
</PropertyGroup>
<ItemGroup>
<!-- locking the version of F# Core as FCS does this anyway and in practise all will be using the same version -->
<PackageVersion Include="FSharp.Core" Version="[7.0.200]" />
<PackageVersion Include="FSharp.Compiler.Service" Version="[43.7.200]" />
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
<PackageVersion Include="Microsoft.Build" Version="" PrivateAssets="all" />
<PackageVersion Include="Microsoft.Build.Framework" Version="" PrivateAssets="all" />
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="" PrivateAssets="all" />
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="" PrivateAssets="all" />
<PackageVersion Include="Ionide.ProjInfo" Version="0.61.2" />
<PackageVersion Include="Ionide.ProjInfo.Sln" Version="0.61.2" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
<PackageVersion Include="Suave" Version="2.6.2" />
<PackageVersion Include="System.Memory" Version="4.5.5" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="3.11.0-3.final" />
<PackageVersion Include="NUnit" Version="3.13.3" />
<PackageVersion Include="FsUnit" Version="5.2.0" />
<PackageVersion Include="FSharp.Data" Version="6.1.1-beta" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.4.2" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5" />
</ItemGroup>
</Project>
2 changes: 0 additions & 2 deletions FSharp.Formatting.sln
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{194B
Dockerfile = Dockerfile
.config\dotnet-tools.json = .config\dotnet-tools.json
global.json = global.json
paket.dependencies = paket.dependencies
paket.lock = paket.lock
README.md = README.md
RELEASE_NOTES.md = RELEASE_NOTES.md
EndProjectSection
Expand Down
2 changes: 0 additions & 2 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ pipeline "CI" {
}

stage "Build" {
envVars [ "PAKET_SKIP_RESTORE_TARGETS", "true" ]
run "dotnet paket restore"
run $"dotnet restore {solutionFile}"
run $"dotnet build {solutionFile} --configuration {configuration}"
}
Expand Down
33 changes: 0 additions & 33 deletions paket.dependencies

This file was deleted.

159 changes: 0 additions & 159 deletions paket.lock

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<TargetFramework>netstandard2.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<None Include="paket.references" />
<Compile Include="..\Common\AssemblyInfo.fs">
<Link>Common\AssemblyInfo.fs</Link>
</Compile>
Expand All @@ -28,5 +27,8 @@
<ProjectReference Include="..\FSharp.Formatting.CodeFormat\FSharp.Formatting.CodeFormat.fsproj" />
<ProjectReference Include="..\FSharp.Formatting.Markdown\FSharp.Formatting.Markdown.fsproj" />
</ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
<ItemGroup>
<PackageReference Include="FSharp.Core" />
<PackageReference Include="FSharp.Compiler.Service" />
</ItemGroup>
</Project>
Loading

0 comments on commit 09491d1

Please sign in to comment.