Skip to content
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.

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

Convert away from Paket #1049

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 2 additions & 20 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,17 @@
"version": 1,
"isRoot": true,
"tools": {
"fake-cli": {
"version": "5.23.0",
"commands": [
"fake"
]
},
"paket": {
"version": "7.2.0-alpha001",
"commands": [
"paket"
]
},
"octonav": {
"version": "0.0.1",
"commands": [
"octonav"
]
},
"dotnet-reportgenerator-globaltool": {
"version": "5.0.2",
"commands": [
"reportgenerator"
]
},
"fantomas": {
"version": "5.0.0",
"version": "5.2.0",
"commands": [
"fantomas"
]
}
}
}
}
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Build and test

on:
on:
push:
branches:
- main
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ on:

jobs:
release:
env:
IsRelease: true

runs-on: ubuntu-latest

steps:
Expand Down
557 changes: 0 additions & 557 deletions .paket/Paket.Restore.targets

This file was deleted.

38 changes: 0 additions & 38 deletions .paket/paket.targets

This file was deleted.

9 changes: 8 additions & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,16 @@
<Title>FsAutoComplete</Title>
<Product>FsAutoComplete</Product>
<PackageLicenseExpression Condition=" '$(PackAsTool)' != 'true' ">Apache-2.0</PackageLicenseExpression>
<NoWarn>3186</NoWarn><!-- circumvent an error with the fake dependencymanager for paket: https://github.com/dotnet/fsharp/issues/8678 -->
<NoWarn>$(NoWarn);3186</NoWarn><!-- circumvent an error with the fake dependencymanager for paket: https://github.com/dotnet/fsharp/issues/8678 -->
<NoWarn>$(NoWarn);NU1608</NoWarn><!-- Ignore Nuget dependency match warnings -->
<NoWarn>$(NoWarn);NU1605</NoWarn><!-- Ignore Nuget downgrade for FSharp.Core - comes from FsToolkit.ErrorHandling bumping to 7.0 -->
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ChangelogFile>$(MSBuildThisFileDirectory)CHANGELOG.md</ChangelogFile>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Ionide.KeepAChangelog.Tasks" Version="0.1.8" />
<PackageReference Condition="'$(IsRelease)' == 'true'" Include="Dotnet.ReproducibleBuilds" Version="1.1.1" />
</ItemGroup>

</Project>
6 changes: 0 additions & 6 deletions FsAutoComplete.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28803.452
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{1BE8AF57-B314-4C92-82A9-64CD9B7A4990}"
ProjectSection(SolutionItems) = preProject
paket.dependencies = paket.dependencies
paket.lock = paket.lock
EndProjectSection
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FsAutoComplete", "src\FsAutoComplete\FsAutoComplete.fsproj", "{B6AB4EF3-8F60-41A1-AB0C-851A6DEB169E}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FsAutoComplete.Core", "src\FsAutoComplete.Core\FsAutoComplete.Core.fsproj", "{4E4786F3-4566-44E1-8787-91790007F0F6}"
Expand Down
17 changes: 2 additions & 15 deletions build/Program.fs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ open Fake.DotNet
open Fake.Core.TargetOperators
open Fake.Tools

System.Environment.CurrentDirectory <- (Path.combine __SOURCE_DIRECTORY__ "..")

let project = "FsAutoComplete"
let changeLogFile = "CHANGELOG.md"
let mutable changelogs = Changelog.load changeLogFile
Expand Down Expand Up @@ -101,16 +99,6 @@ let init args =
(fun p -> { p with Configuration = DotNet.BuildConfiguration.fromString configuration })
"FsAutoComplete.sln")

Target.create "ReplaceFsLibLogNamespaces"
<| fun _ ->
let replacements =
[ "FsLibLog\\n", "FsAutoComplete.Logging\n"
"FsLibLog\\.", "FsAutoComplete.Logging" ]

replacements
|> List.iter (fun (``match``, replace) ->
(!! "paket-files/TheAngryByrd/FsLibLog/**/FsLibLog*.fs")
|> Shell.regexReplaceInFilesWithEncoding ``match`` replace System.Text.Encoding.UTF8)

Target.create "Format" (fun _ ->
let result =
Expand Down Expand Up @@ -210,13 +198,12 @@ let init args =
"PromoteUnreleasedToVersion" ==> "CreateVersionTag" ==> "Promote"
|> ignore<string>

"Restore" ==> "ReplaceFsLibLogNamespaces" ==> "Build" |> ignore<string>
"Restore" ==> "Build" |> ignore<string>

"CheckFormat" ==> "Build" ==> "LspTest" ==> "Coverage" ==> "Test" ==> "All"
|> ignore<string>

"ReplaceFsLibLogNamespaces"
==> "LocalRelease"
"LocalRelease"
==> "ReleaseArchive"
==> "Release"
|> ignore<string>
Expand Down
13 changes: 11 additions & 2 deletions build/build.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,14 @@
<ItemGroup>
<Compile Include="Program.fs" />
</ItemGroup>
<Import Project="..\.paket\Paket.Restore.targets" />
</Project>
<ItemGroup>
<PackageReference Include="Fake.Core" Version="5.16.0" />
<PackageReference Include="Fake.Core.Process" Version="5.23.1" />
<PackageReference Include="Fake.Core.ReleaseNotes" Version="5.23.1" />
<PackageReference Include="Fake.Core.Target" Version="5.23.1" />
<PackageReference Include="Fake.DotNet" Version="2.0.0" />
<PackageReference Include="Fake.DotNet.Cli" Version="5.23.1" />
<PackageReference Include="Fake.Tools.Git" Version="5.23.1" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.768" />
</ItemGroup>
</Project>
17 changes: 0 additions & 17 deletions build/paket.references

This file was deleted.

73 changes: 0 additions & 73 deletions paket.dependencies

This file was deleted.

Loading