Skip to content

Commit ff0e62e

Browse files
committed
Remove paket.references files from various projects and tests to clean up unused dependencies
1 parent 87fb3e8 commit ff0e62e

File tree

22 files changed

+19
-1661
lines changed

22 files changed

+19
-1661
lines changed

.devcontainer/devcontainer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
"ms-dotnettools.csharp",
4747
"Ionide.Ionide-fsharp",
4848
"tintoy.msbuild-project-tools",
49-
"ionide.ionide-paket",
5049
"usernamehw.errorlens",
5150
"alefragnani.Bookmarks",
5251
"oderwat.indent-rainbow",

.editorconfig

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,6 @@ end_of_line = crlf
5454
[*.{ps1, psm1}]
5555
end_of_line = crlf
5656

57-
# Paket files
58-
[paket.*]
59-
trim_trailing_whitespace = true
60-
indent_size = 2
61-
62-
[*.paket.references]
63-
trim_trailing_whitespace = true
64-
indent_size = 2
65-
6657
# YAML Files
6758
[*.{yml,yaml}]
6859
indent_size = 2

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -371,9 +371,6 @@ FakesAssemblies/
371371
**/*.Server/ModelManifest.xml
372372
_Pvt_Extensions
373373

374-
# Paket dependency manager
375-
paket-files/
376-
377374
# FAKE - F# Make
378375
.fake/
379376

.paket/Paket.Restore.targets

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

.vscode/extensions.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"recommendations": [
3-
"ionide.ionide-paket",
43
"ionide.ionide-fsharp",
54
"ionide.ionide-fake",
65
"ms-dotnettools.csharp",

Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<LangVersion>8.0</LangVersion>
1414
<LangVersion Condition="'$(TargetFramework)' == 'net9.0'">9.0</LangVersion>
1515
<Nullable Condition="'$(TargetFramework)' == 'net9.0'">enable</Nullable>
16-
<PaketPropsVersion>6.0.0</PaketPropsVersion> <!-- Hack to prevent paket from restoring when it should not -->
1716
</PropertyGroup>
1817

1918

Directory.Solution.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<_DotnetToolRestoreOutputFile>$(_BuildProjBaseIntermediateOutputPath)/dotnet-tool-restore-$(NETCoreSdkVersion)-$(OS)</_DotnetToolRestoreOutputFile>
66
</PropertyGroup>
77

8-
<Target Name="ToolRestore" BeforeTargets="Restore;CollectPackageReferences;PaketRestore" Inputs="$(_DotnetToolManifestFile)" Outputs="$(_DotnetToolRestoreOutputFile)">
8+
<Target Name="ToolRestore" BeforeTargets="Restore;CollectPackageReferences" Inputs="$(_DotnetToolManifestFile)" Outputs="$(_DotnetToolRestoreOutputFile)">
99
<Exec Command="dotnet tool restore" WorkingDirectory="$(MSBuildThisFileDirectory)" StandardOutputImportance="High" StandardErrorImportance="High" />
1010
<MakeDir Directories="$(_BuildProjBaseIntermediateOutputPath)"/>
1111
<Touch Files="$(_DotnetToolRestoreOutputFile)" AlwaysCreate="True" ForceTouch="True" />

benchmarks/paket.references

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

build/build.fs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ let environVarAsBoolOrDefault varName defaultValue =
3232

3333
let project = "FsToolkit.ErrorHandling"
3434

35+
let publishUrl = "https://www.nuget.org"
36+
3537
let summary =
3638
"FsToolkit.ErrorHandling is a utility library to work with the Result type in F#, and allows you to do clear, simple and powerful error handling."
3739

@@ -201,9 +203,6 @@ let clean _ =
201203
++ "**/.python-tests"
202204
|> Shell.cleanDirs
203205

204-
[ "paket-files/paket.restore.cached" ]
205-
|> Seq.iter Shell.rm
206-
207206

208207
module BuildParameters =
209208
let common (defaults: MSBuild.CliArguments) = {
@@ -229,11 +228,6 @@ let build ctx =
229228

230229

231230
let restore _ =
232-
Fake.DotNet.Paket.restore (fun p -> {
233-
p with
234-
ToolType = ToolType.CreateLocalTool()
235-
})
236-
237231
let setParams (c: DotNet.RestoreOptions) = {
238232
c with
239233
MSBuildParams = BuildParameters.common c.MSBuildParams
@@ -393,16 +387,22 @@ let dotnetPack ctx =
393387

394388

395389
let publishNuget _ =
396-
Paket.push (fun p -> {
397-
p with
398-
ToolType = ToolType.CreateLocalTool()
399-
PublishUrl = "https://www.nuget.org"
400-
WorkingDir = distDir
401-
ApiKey =
402-
match nugetToken.Value with
403-
| Some s -> s
404-
| _ -> p.ApiKey // assume paket-config was set properly
405-
})
390+
391+
392+
DotNet.nugetPush
393+
(fun c -> {
394+
c with
395+
Common = {
396+
c.Common with
397+
WorkingDirectory = distDir
398+
}
399+
PushParams = {
400+
c.PushParams with
401+
Source = Some publishUrl
402+
ApiKey = nugetToken.Value
403+
}
404+
})
405+
"*.nupkg"
406406

407407

408408
let remote = Environment.environVarOrDefault "FSTK_GIT_REMOTE" "origin"

build/build.fsproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<PackageReference Include="Fake.DotNet.Cli" />
1515
<PackageReference Include="Fake.Core.ReleaseNotes" />
1616
<PackageReference Include="Fake.DotNet.AssemblyInfoFile" />
17-
<PackageReference Include="Fake.DotNet.Paket" />
1817
<PackageReference Include="Fake.DotNet.Testing.Expecto" />
1918
<PackageReference Include="Fake.Tools.Git" />
2019
<PackageReference Include="Fake.JavaScript.Npm" />

0 commit comments

Comments
 (0)